- updated to 2.7

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

diff --git a/faad2-mp4ff.patch b/faad2-mp4ff.patch
index 08ecfdec7c94cfc431f991fb0b772434a1d3aa7e..615d58b2a5971f5d72914be666e8895136f30753 100644 (file)
--- a/faad2-mp4ff.patch
+++ b/faad2-mp4ff.patch
@@ -1,15 +1,36 @@
---- faad2/common/mp4ff/Makefile.am.wiget       2009-10-28 18:54:29.000000000 +0100
-+++ faad2/common/mp4ff/Makefile.am     2009-10-28 18:56:28.000000000 +0100
-@@ -1,8 +1,9 @@
--noinst_LTLIBRARIES = libmp4ff.la
+--- faad2-2.7/common/mp4ff/Makefile.am.orig    2009-02-06 15:24:21.000000000 +0100
++++ faad2-2.7/common/mp4ff/Makefile.am 2010-10-25 19:57:49.095738529 +0200
+@@ -1,7 +1,7 @@
+-lib_LIBRARIES = libmp4ff.a
+-include_HEADERS = mp4ff.h mp4ffint.h

 +lib_LTLIBRARIES = libmp4ff.la
 +lib_LTLIBRARIES = libmp4ff.la

-+
-+include_HEADERS = mp4ff.h mp4ff_int_types.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h

  
  

- libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+                    mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- faad2-2.7/frontend/Makefile.am.orig        2009-02-06 17:03:37.000000000 +0100
++++ faad2-2.7/frontend/Makefile.am     2010-10-25 20:08:54.015739367 +0200
+@@ -5,7 +5,7 @@
+          -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-           $(top_builddir)/common/mp4ff/libmp4ff.a
++           $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+              audio.c audio.h \
+--- faad2-2.7/plugins/xmms/src/Makefile.am.orig        2010-10-25 20:09:20.343741882 +0200
++++ faad2-2.7/plugins/xmms/src/Makefile.am     2010-10-25 20:32:37.203740205 +0200
+@@ -7,7 +7,7 @@
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ 
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+-       $(top_builddir)/common/mp4ff/libmp4ff.a
++       $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread

  
  

- libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
--   mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
-+   mp4tagupdate.c mp4ffint.h \
-    drms.h drms.c drmstables.h
--