- updated to 2.9.2

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

diff --git a/faad2-mp4ff.patch b/faad2-mp4ff.patch
index da948ab416a1a8f44e5270dd12a58508797af3fc..4d9d4c1b0d638a66ad87340458e7a304e80de4a3 100644 (file)
--- a/faad2-mp4ff.patch
+++ b/faad2-mp4ff.patch
@@ -1,25 +1,15 @@
---- faad2-2.8.6/common/mp4ff/Makefile.am.orig  2017-12-11 17:43:53.975769960 +0100
-+++ faad2-2.8.6/common/mp4ff/Makefile.am       2017-12-11 17:54:59.092429032 +0100
-@@ -1,7 +1,7 @@
--noinst_LIBRARIES = libmp4ff.a
--noinst_HEADERS = mp4ff.h mp4ffint.h
-+lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h
+--- faad2-2_9_2/plugins/xmms/src/Makefile.am.orig      2020-05-19 18:03:13.548664034 +0200
++++ faad2-2_9_2/plugins/xmms/src/Makefile.am   2020-05-19 18:05:21.617970223 +0200
+@@ -4,10 +4,9 @@
+ plugin_LTLIBRARIES = libmp4.la
  
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
+-       -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
++       -I$(top_srcdir)/include
  
--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
---- 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 \
+-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
 -       $(top_builddir)/common/mp4ff/libmp4ff.a
-+       $(top_builddir)/common/mp4ff/libmp4ff.la
++libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la -lmp4ff
  
  libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread