[Restricted-changes] r128 - dists/trunk/faac/debian/patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Mon Jun 18 13:33:45 UTC 2007
Author: fabian-guest
Date: 2007-06-18 13:33:44 +0000 (Mon, 18 Jun 2007)
New Revision: 128
Added:
dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch
dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch
Removed:
dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
Modified:
dists/trunk/faac/debian/patches/00list
Log:
Add support for external libmp4v2.
Modified: dists/trunk/faac/debian/patches/00list
===================================================================
--- dists/trunk/faac/debian/patches/00list 2007-06-13 08:34:30 UTC (rev 127)
+++ dists/trunk/faac/debian/patches/00list 2007-06-18 13:33:44 UTC (rev 128)
@@ -1,3 +1,4 @@
01-dos2unix
02-configure_in-syntax
-03-static-libmp4v2
+03-external-libmp4v2
+04-static-libmp4v2
Added: dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch 2007-06-18 13:33:44 UTC (rev 128)
@@ -0,0 +1,59 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 03-external-libmp4v2.dpatch from Gentoo (modified).
+##
+## DP: Add support for external libmp4v2.
+
+ at DPATCH@
+
+diff -Naru faac.orig/common/Makefile.am faac/common/Makefile.am
+--- faac.orig/common/Makefile.am 2004-07-28 10:18:21.000000000 +0200
++++ faac/common/Makefile.am 2007-06-18 15:16:12.000000000 +0200
+@@ -1,4 +1,4 @@
+-if WITH_MP4V2
++if WITH_INTERNAL_MP4V2
+ SUBDIRS = mp4v2
+ else
+ SUBDIRS =
+diff -Naru faac.orig/configure.in faac/configure.in
+--- faac.orig/configure.in 2007-06-18 15:16:57.000000000 +0200
++++ faac/configure.in 2007-06-18 15:16:35.000000000 +0200
+@@ -27,6 +27,7 @@
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+
+ AM_CONDITIONAL(WITH_MP4V2, false)
++AM_CONDITIONAL(WITH_INTERNAL_MP4V2, false)
+
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+ AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+@@ -35,10 +36,13 @@
+
+ if test x$external_mp4v2 = xyes; then
+ AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++ MY_DEFINE(HAVE_LIBMP4V2)
++ AM_CONDITIONAL(WITH_MP4V2, true)
+ else
+ if test x$WITHMP4V2 = xyes; then
+ AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
+ AM_CONDITIONAL(WITH_MP4V2, true)
++ AM_CONDITIONAL(WITH_INTERNAL_MP4V2, true)
+ AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)
+ MY_DEFINE(HAVE_LIBMP4V2)
+ else
+diff -Naru faac.orig/frontend/Makefile.am faac/frontend/Makefile.am
+--- faac.orig/frontend/Makefile.am 2004-07-28 10:18:21.000000000 +0200
++++ faac/frontend/Makefile.am 2007-06-18 15:16:12.000000000 +0200
+@@ -3,9 +3,14 @@
+ faac_SOURCES = main.c input.c
+
+ if WITH_MP4V2
++if WITH_INTERNAL_MP4V2
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include
++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
++endif
++else
++INCLUDES = -I$(top_srcdir)/include
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
Deleted: dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch 2007-06-13 08:34:30 UTC (rev 127)
+++ dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch 2007-06-18 13:33:44 UTC (rev 128)
@@ -1,36 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-static-libmp4v2.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: Statically link `faac' binary against libmp4v2.
-
- at DPATCH@
-
-diff -Naru faac.orig/common/mp4v2/Makefile.am faac/common/mp4v2/Makefile.am
---- faac.orig/common/mp4v2/Makefile.am 2004-08-02 22:40:30.000000000 +0200
-+++ faac/common/mp4v2/Makefile.am 2007-04-23 11:19:13.000000000 +0200
-@@ -2,11 +2,11 @@
-
- AM_CXXFLAGS = -Wall
-
--lib_LTLIBRARIES = libmp4v2.la
-+lib_LIBRARIES = libmp4v2.a
-
- include_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
-
--libmp4v2_la_SOURCES = \
-+libmp4v2_a_SOURCES = \
- 3gp.cpp \
- atom_bitr.cpp \
- atom_co64.cpp \
-diff -Naru faac.orig/frontend/Makefile.am faac/frontend/Makefile.am
---- faac.orig/frontend/Makefile.am 2004-07-28 10:18:21.000000000 +0200
-+++ faac/frontend/Makefile.am 2007-04-23 11:19:10.000000000 +0200
-@@ -4,7 +4,7 @@
-
- if WITH_MP4V2
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
--LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
-+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
- else
- INCLUDES = -I$(top_srcdir)/include
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
Copied: dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch (from rev 127, dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch)
===================================================================
--- dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch 2007-06-18 13:33:44 UTC (rev 128)
@@ -0,0 +1,36 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 04-static-libmp4v2.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
+##
+## DP: Statically link against (internal) libmp4v2.
+
+ at DPATCH@
+
+diff -Naru faac.orig/common/mp4v2/Makefile.am faac/common/mp4v2/Makefile.am
+--- faac.orig/common/mp4v2/Makefile.am 2004-08-02 22:40:30.000000000 +0200
++++ faac/common/mp4v2/Makefile.am 2007-04-23 11:19:13.000000000 +0200
+@@ -2,11 +2,11 @@
+
+ AM_CXXFLAGS = -Wall
+
+-lib_LTLIBRARIES = libmp4v2.la
++lib_LIBRARIES = libmp4v2.a
+
+ include_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
+
+-libmp4v2_la_SOURCES = \
++libmp4v2_a_SOURCES = \
+ 3gp.cpp \
+ atom_bitr.cpp \
+ atom_co64.cpp \
+diff -Naru faac.orig/frontend/Makefile.am faac/frontend/Makefile.am
+--- faac.orig/frontend/Makefile.am 2004-07-28 10:18:21.000000000 +0200
++++ faac/frontend/Makefile.am 2007-04-23 11:19:10.000000000 +0200
+@@ -5,7 +5,7 @@
+ if WITH_MP4V2
+ if WITH_INTERNAL_MP4V2
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+-LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
++LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
More information about the Restricted-changes
mailing list