[SCM] faad2 packaging branch, master, updated. debian/2.7-3-8-gc6f890b

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Mon Oct 26 10:58:56 UTC 2009


The following commit has been merged in the master branch:
commit 18c04dc539b1b85569128995e0854b47272f429d
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Oct 26 11:50:45 2009 +0100

    Removed debian/patches/libmp4ff-shared-lib.patch.

diff --git a/debian/patches/libmp4ff-shared-lib.patch b/debian/patches/libmp4ff-shared-lib.patch
deleted file mode 100644
index 5670c00..0000000
--- a/debian/patches/libmp4ff-shared-lib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to create a shared lib for libmp4ff.
-==========================================================================
---- a/common/mp4ff/Makefile.am
-+++ b/common/mp4ff/Makefile.am
-@@ -1,7 +1,8 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+AM_CFLAGS = -DUSE_TAGGING=1
- 
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_LDFLAGS = -version-info 0:0:0
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
---- a/frontend/Makefile.am
-+++ b/frontend/Makefile.am
-@@ -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 \
diff --git a/debian/patches/series b/debian/patches/series
index 6f54935..13784f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 manpage.patch
-libmp4ff-shared-lib.patch
 70_automake-1.9.patch

-- 
faad2 packaging



More information about the pkg-multimedia-commits mailing list