Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/libfaad2/patches/first_add_the_dirs_to_the_source_till_then_kill_die.patch

    Annotation of /trunk/libfaad2/patches/first_add_the_dirs_to_the_source_till_then_kill_die.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (hide annotations) (download)
    Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
    File size: 1983 byte(s) 
    -import
    1 niro 144 diff -Naur faad2/configure.in faad2-p/configure.in
    2     --- faad2/configure.in 2006-08-13 16:13:31.000000000 +0200
    3     +++ faad2-p/configure.in 2006-11-18 03:00:56.000000000 +0100
    4     @@ -29,8 +29,6 @@
    5     AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin],
    6     WITHXMMS=$withval, WITHXMMS=no)
    7    
    8     -AC_ARG_WITH(bmp,[ --with-bmp compile beep media player plugin],
    9     - [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
    10    
    11     AC_ARG_WITH(drm,[ --with-drm compile libfaad with DRM support],
    12     WITHDRM=$withval, WITHDRM=no)
    13     @@ -114,11 +112,6 @@
    14     AM_CONDITIONAL(HAVE_XMMS, false)
    15     fi
    16    
    17     -if test x$WITHBMP = xyes; then
    18     - AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
    19     - AM_CONDITIONAL([HAVE_XMMS], true)
    20     - AM_CONDITIONAL([HAVE_BMP], true)
    21     -fi
    22    
    23     if test x$WITHDRM = xyes; then
    24     AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
    25     diff -Naur faad2/plugins/Makefile.am faad2-p/plugins/Makefile.am
    26     --- faad2/plugins/Makefile.am 2006-08-07 20:47:45.000000000 +0200
    27     +++ faad2-p/plugins/Makefile.am 2006-11-18 03:00:56.000000000 +0100
    28     @@ -8,10 +8,6 @@
    29     if HAVE_XMMS
    30     SUBDIRS = xmms
    31     else
    32     -if HAVE_BMP
    33     -SUBDIRS = bmp
    34     -else
    35     SUBDIRS =
    36     -endif #HAVE_BMP
    37     endif #HAVE_XMMS
    38     endif #HAVE_MPEG4IP_PLUG
    39     diff -Naur faad2/plugins/xmms/src/Makefile.am faad2-p/plugins/xmms/src/Makefile.am
    40     --- faad2/plugins/xmms/src/Makefile.am 2006-08-07 20:47:45.000000000 +0200
    41     +++ faad2-p/plugins/xmms/src/Makefile.am 2006-11-18 03:02:11.000000000 +0100
    42     @@ -1,12 +1,7 @@
    43     -if HAVE_BMP
    44     -libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
    45     -local_CFLAGS=$(shell pkg-config --cflags bmp)
    46     -local_LDFLAGS=$(shell pkg-config --libs bmp)
    47     -else
    48     +
    49     local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
    50     local_LDFLAGS=`$(XMMS_CONFIG) --libs`
    51     libdir = `$(XMMS_CONFIG) --input-plugin-dir`
    52     -endif #HAVE_BMP
    53     lib_LTLIBRARIES = libmp4.la
    54    
    55     libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \