- updated for 2.6.1

[packages/faad2.git] / faad2-make.patch

diff --git a/faad2-make.patch b/faad2-make.patch
index cc5a7489f2cca406d222d0a41dc1e2dcfa5c7e7b..fbd3cb351eecf1e4055b12111da6af17def3c40a 100644 (file)
--- a/faad2-make.patch
+++ b/faad2-make.patch
@@ -1,54 +1,23 @@
 --- faad2/libfaad/Makefile.am.orig     2004-11-08 09:06:09.000000000 +0100
-+++ faad2/libfaad/Makefile.am  2006-08-23 23:39:14.753322500 +0200
-@@ -3,7 +3,7 @@
- include_HEADERS = $(top_srcdir)/include/faad.h \\r
-                   $(top_srcdir)/include/neaacdec.h\r
- \r
--libfaad_la_LDFLAGS = -lm\r
-+libfaad_la_LIBADD = -lm\r
- \r
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \\r
- drm_dec.c error.c filtbank.c \\r
---- faad2/plugins/Makefile.am.orig     2006-08-07 20:47:45.000000000 +0200
-+++ faad2/plugins/Makefile.am  2006-08-24 00:00:04.739441750 +0200
-@@ -8,10 +8,6 @@
- if HAVE_XMMS\r
- SUBDIRS = xmms\r
- else\r
--if HAVE_BMP\r
--SUBDIRS = bmp\r
--else\r
- SUBDIRS =\r
--endif #HAVE_BMP\r
- endif #HAVE_XMMS\r
- endif #HAVE_MPEG4IP_PLUG\r
---- faad2/plugins/xmms/src/Makefile.am.orig    2006-08-07 20:47:45.000000000 +0200
-+++ faad2/plugins/xmms/src/Makefile.am 2006-08-24 00:01:12.775693750 +0200
-@@ -1,13 +1,13 @@
- if HAVE_BMP\r
--libdir=$(shell pkg-config --variable=input-plugin-dir bmp)\r
-+plugindir=$(shell pkg-config --variable=input-plugin-dir bmp)\r
- local_CFLAGS=$(shell pkg-config --cflags bmp)\r
- local_LDFLAGS=$(shell pkg-config --libs bmp)\r
- else\r
- local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall\r
- local_LDFLAGS=`$(XMMS_CONFIG) --libs`\r
--libdir = `$(XMMS_CONFIG) --input-plugin-dir`\r
-+plugindir = `$(XMMS_CONFIG) --input-plugin-dir`\r
- endif #HAVE_BMP\r
--lib_LTLIBRARIES = libmp4.la\r
-+plugin_LTLIBRARIES = libmp4.la\r
- \r
- libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \\r
-        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff\r
---- faad2/configure.in.orig    2006-08-13 16:13:31.000000000 +0200
-+++ faad2/configure.in 2006-08-24 00:04:16.259160750 +0200
-@@ -118,6 +118,8 @@
-   AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])\r
-   AM_CONDITIONAL([HAVE_XMMS], true)\r
-   AM_CONDITIONAL([HAVE_BMP], true)\r
-+else\r
-+  AM_CONDITIONAL([HAVE_BMP], false)\r
- fi\r
- \r
- if test x$WITHDRM = xyes; then\r
++++ faad2/libfaad/Makefile.am  2007-11-04 11:44:26.132686561 +0100
+@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libfaad.la
+ include_HEADERS = $(top_srcdir)/include/faad.h \
+                   $(top_srcdir)/include/neaacdec.h
+ 
+-libfaad_la_LDFLAGS = -lm
++libfaad_la_LIBADD = -lm
+ 
+ libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
+ drm_dec.c error.c filtbank.c \
+--- faad2/plugins/xmms/src/Makefile.am.orig    2006-09-25 21:52:53.000000000 +0200
++++ faad2/plugins/xmms/src/Makefile.am 2007-11-04 11:45:59.870028348 +0100
+@@ -1,7 +1,7 @@
+ local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
+ local_LDFLAGS=`$(XMMS_CONFIG) --libs`
+-libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+-lib_LTLIBRARIES = libmp4.la
++plugindir = `$(XMMS_CONFIG) --input-plugin-dir`
++plugin_LTLIBRARIES = libmp4.la
+ 
+ libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff