tag 550679 patch thanks Hi again.
Please find attached a patch that: * Adds back libmp4ff * Fix the header mp4ff.h Instead of removing the package, those two patches could be submited upstream, probably with a bit more work on mp4ff.h. If you really want to remove libmp4ff, please at lease explain the rational for that. Romain
diff --git a/debian/changelog b/debian/changelog index 31f5793..02ecc3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ faad2 (2.7-5) unstable; urgency=low + [ Reinhard Tartler ] * prepare new upload - -- Reinhard Tartler <siret...@tauware.de> Wed, 28 Oct 2009 16:25:25 +0100 + [ Romain Beauxis ] + * Added back mp4ff.h header. + * Patch mp4ff.h to force stdlib.h + inclusion. + Closes: #550679 + + -- Romain Beauxis <to...@rastageeks.org> Fri, 30 Oct 2009 11:22:11 -0500 faad2 (2.7-4) unstable; urgency=low diff --git a/debian/control b/debian/control index df53117..a918d5c 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,19 @@ Homepage: http://www.audiocoding.com/ Vcs-Git: git://git.debian.org/git/pkg-multimedia/faad2.git Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/faad2.git;a=summary +Package: libmp4ff-dev +Section: libdevel +Architecture: any +Depends: libmp4ff0 (= ${binary:Version}), ${misc:Depends} +Conflicts: libfaad-dev (<< 2.7) +Description: faad2 MP4 file format library - development files + FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly + decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC + files. + . + This package contains development files for the mp4ff library built from the + faad2 source package. + Package: libfaad-dev Section: libdevel Architecture: any @@ -26,6 +39,17 @@ Description: freeware Advanced Audio Decoder - development files . This package contains development files. +Package: libmp4ff0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: faad2 MP4 file format library - shared library + FAAD2 is the fastest ISO AAC audio decoder available. FAAD2 correctly + decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC + files. + . + This package contains the shared library for the mp4ff library built from the + faad2 source package. + Package: libfaad2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libmp4ff-dev.install b/debian/libmp4ff-dev.install new file mode 100644 index 0000000..a87d9b0 --- /dev/null +++ b/debian/libmp4ff-dev.install @@ -0,0 +1,4 @@ +usr/include/mp4ff.h +usr/include/mp4ffint.h +usr/lib/libmp4ff.a +usr/lib/libmp4ff.so diff --git a/debian/libmp4ff0.install b/debian/libmp4ff0.install new file mode 100644 index 0000000..7d373ef --- /dev/null +++ b/debian/libmp4ff0.install @@ -0,0 +1 @@ +usr/lib/libmp4ff.so.* diff --git a/debian/patches/fix_stdlib_include_mp4ff.patch b/debian/patches/fix_stdlib_include_mp4ff.patch new file mode 100644 index 0000000..95f3f68 --- /dev/null +++ b/debian/patches/fix_stdlib_include_mp4ff.patch @@ -0,0 +1,16 @@ +Index: faad2/common/mp4ff/mp4ff.h +=================================================================== +--- faad2.orig/common/mp4ff/mp4ff.h 2009-10-30 11:33:08.000000000 -0500 ++++ faad2/common/mp4ff/mp4ff.h 2009-10-30 11:33:13.000000000 -0500 +@@ -35,11 +35,7 @@ + extern "C" { + #endif /* __cplusplus */ + +-#ifdef HAVE_STDINT_H + #include <stdint.h> +-#else +-#include "mp4ff_int_types.h" +-#endif + + /* file callback structure */ + typedef struct diff --git a/debian/patches/libmp4ff-shared-lib.patch b/debian/patches/libmp4ff-shared-lib.patch new file mode 100644 index 0000000..1fcabf2 --- /dev/null +++ b/debian/patches/libmp4ff-shared-lib.patch @@ -0,0 +1,31 @@ +Patch to create a shared lib for libmp4ff. +========================================================================== +Index: faad2/common/mp4ff/Makefile.am +=================================================================== +--- faad2.orig/common/mp4ff/Makefile.am 2009-10-30 11:18:45.000000000 -0500 ++++ faad2/common/mp4ff/Makefile.am 2009-10-30 11:41:41.000000000 -0500 +@@ -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 +Index: faad2/frontend/Makefile.am +=================================================================== +--- faad2.orig/frontend/Makefile.am 2009-10-30 11:18:45.000000000 -0500 ++++ faad2/frontend/Makefile.am 2009-10-30 11:41:41.000000000 -0500 +@@ -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/manpage.patch b/debian/patches/manpage.patch index eeb1f57..22aea44 100644 --- a/debian/patches/manpage.patch +++ b/debian/patches/manpage.patch @@ -1,7 +1,9 @@ Fix hyphen in manpage. ========================================================================== ---- a/frontend/faad.man -+++ b/frontend/faad.man +Index: faad2/frontend/faad.man +=================================================================== +--- faad2.orig/frontend/faad.man 2009-10-30 11:33:08.000000000 -0500 ++++ faad2/frontend/faad.man 2009-10-30 11:33:13.000000000 -0500 @@ -24,9 +24,9 @@ .br 3: 32\(hybit PCM data. diff --git a/debian/patches/series b/debian/patches/series index 973b94b..81484aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +fix_stdlib_include_mp4ff.patch manpage.patch +libmp4ff-shared-lib.patch
