[Restricted-changes] r156 - in dists/trunk/faac/debian: . manpage patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Tue Oct 16 08:29:03 UTC 2007
Author: fabian-guest
Date: 2007-10-16 08:29:02 +0000 (Tue, 16 Oct 2007)
New Revision: 156
Added:
dists/trunk/faac/debian/patches/01-configure_in-syntax.dpatch
dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch
dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
Removed:
dists/trunk/faac/debian/patches/01-dos2unix.dpatch
dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch
dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch
Modified:
dists/trunk/faac/debian/changelog
dists/trunk/faac/debian/control
dists/trunk/faac/debian/copyright
dists/trunk/faac/debian/libfaac0.shlibs
dists/trunk/faac/debian/manpage/faac.1
dists/trunk/faac/debian/patches/00list
dists/trunk/faac/debian/rules
Log:
faac: New upstream release 1.26
* debian/control:
+ Wrapped Build-Depends and Depends.
+ Added ${misc:Depends} to all Depends.
* debian/libfaac0.shlibs:
+ Bumped to (>= 1.26).
* debian/changelog:
+ New entry.
+ Fixed previous entry.
* debian/patches/01-dos2unix.dpatch:
+ Removed. Fixed upstream.
* debian/patches/01-external-libmp4v2.dpatch:
+ Renamed, rediffed. Half-fixed upstream.
* debian/patches/02-external-libmp4v2.dpatch,
debian/patches/03-external-libmp4v2.dpatch:
+ Renamed, rediffed.
* debian/patches/00list:
+ Adopted.
* debian/rules:
+ Wrapped 'configure' line.
+ Added '--enable-drm'.
+ Added test for 'make distclean'.
+ Removed trailing whitespaces.
* debian/manpage/faac.1,
debian/copyright:
+ Removed trailing whitespaces.
Modified: dists/trunk/faac/debian/changelog
===================================================================
--- dists/trunk/faac/debian/changelog 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/changelog 2007-10-16 08:29:02 UTC (rev 156)
@@ -1,6 +1,13 @@
+faac (1.26-1) unstable; urgency=low
+
+ * New upstream release.
+ * Enabled Digital Radio Mondiale support.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 15 Oct 2007 00:00:00 +0100
+
faac (1.25-1) unstable; urgency=low
* Initial release.
- * Statically link against (internal) libmp4v2.
+ * Statically linked against (internal) libmp4v2.
-- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 1 Jan 2007 00:00:00 +0100
Modified: dists/trunk/faac/debian/control
===================================================================
--- dists/trunk/faac/debian/control 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/control 2007-10-16 08:29:02 UTC (rev 156)
@@ -3,14 +3,20 @@
Priority: optional
Maintainer: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, autoconf, automake, autotools-dev, libtool
+Build-Depends: debhelper (>= 5),
+ dpatch,
+ autoconf,
+ automake,
+ autotools-dev,
+ libtool
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/faac/
Package: faac
Section: restricted/sound
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: Free Advanced Audio Coder
The FAAC project includes the AAC encoder FAAC and decoder FAAD2. It supports
several MPEG-4 object types and file formats, multichannel and gapless
@@ -24,7 +30,10 @@
Section: restricted/devel
Priority: extra
Architecture: any
-Depends: faac (= ${binary:Version}), libfaac0 (= ${binary:Version}), libfaac-dev (= ${binary:Version})
+Depends: faac (= ${binary:Version}),
+ libfaac0 (= ${binary:Version}),
+ libfaac-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: Free Advanced Audio Coder (debug)
The FAAC project includes the AAC encoder FAAC and decoder FAAD2. It supports
several MPEG-4 object types and file formats, multichannel and gapless
@@ -39,7 +48,8 @@
Package: libfaac0
Section: restricted/libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: Free Advanced Audio Coder (library)
The FAAC project includes the AAC encoder FAAC and decoder FAAD2. It supports
several MPEG-4 object types and file formats, multichannel and gapless
@@ -54,7 +64,8 @@
Package: libfaac-dev
Section: restricted/libdevel
Architecture: any
-Depends: libfaac0 (= ${binary:Version})
+Depends: libfaac0 (= ${binary:Version}),
+ ${misc:Depends}
Description: Free Advanced Audio Coder (development)
The FAAC project includes the AAC encoder FAAC and decoder FAAD2. It supports
several MPEG-4 object types and file formats, multichannel and gapless
Modified: dists/trunk/faac/debian/copyright
===================================================================
--- dists/trunk/faac/debian/copyright 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/copyright 2007-10-16 08:29:02 UTC (rev 156)
@@ -62,7 +62,7 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
+ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
Please note that the use of this software may require the payment of
Modified: dists/trunk/faac/debian/libfaac0.shlibs
===================================================================
--- dists/trunk/faac/debian/libfaac0.shlibs 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/libfaac0.shlibs 2007-10-16 08:29:02 UTC (rev 156)
@@ -1 +1 @@
-libfaac 0 libfaac0 (>= 1.25)
+libfaac 0 libfaac0 (>= 1.26)
Modified: dists/trunk/faac/debian/manpage/faac.1
===================================================================
--- dists/trunk/faac/debian/manpage/faac.1 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/manpage/faac.1 2007-10-16 08:29:02 UTC (rev 156)
@@ -4,70 +4,70 @@
faac \- Free Advanced Audio Coder
.SH SYNOPSIS
-.B faac
-.RI [ options ]
+.B faac
+.RI [ options ]
.RI [\-o\ outfile ]
-.I infiles
+.I infiles
.RI ...
.PP
-.RI < infiles >
-and/or
+.RI < infiles >
+and/or
.RI < outfile >
can be "\-", which means stdin/stdout.
.SH DESCRIPTION
-.B FAAC
-is an Advanced Audio Coder (MPEG2\-AAC, MPEG4\-AAC). The goal of
-.B FAAC
+.B FAAC
+is an Advanced Audio Coder (MPEG2\-AAC, MPEG4\-AAC). The goal of
+.B FAAC
is to explore the possibilities of AAC and exceed the quality of the currently best MP3 encoders.
.SH OPTIONS
.TP
-.BR \-q\ <\fIquality\fP>
+.BR \-q\ <\fIquality\fP>
Set default variable bitrate (VBR) quantizer quality in percent (default: 100).
.TP
-.BR \-b\ <\fIbitrate\fP>
+.BR \-b\ <\fIbitrate\fP>
Set average bitrate (ABR, lower quality mode) to approximately \fIbitrate\fP kbps.
.TP
-.BR \-c\ <\fIfreq\fP>
+.BR \-c\ <\fIfreq\fP>
Set the bandwidth in Hz (default: automatic).
.TP
-.BR \-o\ \fIX\fP
+.BR \-o\ \fIX\fP
Set output file to \fIX\fP (only for one input file).
.TP
-.BR \-r
+.BR \-r
Use RAW AAC output file.
.TP
-.BR \-P
+.BR \-P
Raw PCM input mode (default: 44100Hz 16bit stereo).
.TP
-.BR \-R
+.BR \-R
Raw PCM input rate.
.TP
-.BR \-B
+.BR \-B
Raw PCM input sample size (8, 16 (default), 24 or 32bits).
.TP
-.BR \-C
+.BR \-C
Raw PCM input channels.
.TP
-.BR \-X
+.BR \-X
Raw PCM swap input bytes
.TP
-.BR \-I\ <\fIC\fP,\fILF\fP>
+.BR \-I\ <\fIC\fP,\fILF\fP>
Input channel config (default: 3,4 [which means Center is third and LFE is fourth]).
.SH MP4 SPECIFIC OPTIONS
.TP
-.BR \-w
+.BR \-w
Wrap AAC data in MP4 container (default for *.mp4 and *.m4a).
.TP
-.BR \-\-artist\ \fIX\fP
+.BR \-\-artist\ \fIX\fP
Set artist to \fIX\fP
.TP
-.BR \-\-writer\ \fIX\fP
+.BR \-\-writer\ \fIX\fP
Set writer to \fIX\fP
.TP
-.BR \-\-title\ \fIX\fP
+.BR \-\-title\ \fIX\fP
Set title to \fIX\fP
.TP
.BR \-\-genre\ \fIX\fP
@@ -96,13 +96,13 @@
.SH DOCUMENTATION
.TP
-.BR \-\-help
+.BR \-\-help
for short help on using FAAC.
.TP
-.BR \-\-long-help
+.BR \-\-long-help
for a description of all options for FAAC.
.TP
-.BR \-\-license
+.BR \-\-license
for the license terms for FAAC.
.SH AUTHOR
Modified: dists/trunk/faac/debian/patches/00list
===================================================================
--- dists/trunk/faac/debian/patches/00list 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/patches/00list 2007-10-16 08:29:02 UTC (rev 156)
@@ -1,4 +1,3 @@
-01-dos2unix
-02-configure_in-syntax
-03-external-libmp4v2
-04-static-libmp4v2
+01-configure_in-syntax.dpatch
+02-external-libmp4v2.dpatch
+03-static-libmp4v2.dpatch
Copied: dists/trunk/faac/debian/patches/01-configure_in-syntax.dpatch (from rev 155, dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch)
===================================================================
--- dists/trunk/faac/debian/patches/01-configure_in-syntax.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/01-configure_in-syntax.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-configure_in-syntax.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
+##
+## DP: Fix syntax error in configure.in.
+
+ at DPATCH@
+
+diff -Naru faac.orig/configure.in faac/configure.in
+--- faac.orig/configure.in 2007-08-20 20:03:22.000000000 +0200
++++ faac/configure.in 2007-10-16 11:15:30.000000000 +0200
+@@ -8,7 +8,7 @@
+ AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
+ AC_ARG_ENABLE( drm, [ --enable-drm Digital Radio Mondiale support], enable_drm=$enableval, enable_drm=no)
+
+-AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
++AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])
+
+ CFLAGS=${CFLAGS:-"-O2 -Wall"}
+
Deleted: dists/trunk/faac/debian/patches/01-dos2unix.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/01-dos2unix.dpatch 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/patches/01-dos2unix.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -1,185 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-dos2unix.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: dos2unix bootstrap; dos2unix Makefile.am; dos2unix configure.in
-
- at DPATCH@
-
-diff -Naru faac.orig/bootstrap faac/bootstrap
---- faac.orig/bootstrap 2004-07-28 10:18:20.000000000 +0200
-+++ faac/bootstrap 2007-06-13 10:17:47.000000000 +0200
-@@ -1,11 +1,11 @@
--#! /bin/sh
--
--aclocal -I .
--autoheader
--if test "`uname -s`" = Darwin; then
-- glibtoolize --automake
--else
-- libtoolize --automake
--fi
--automake --add-missing
--autoconf
-+#! /bin/sh
-+
-+aclocal -I .
-+autoheader
-+if test "`uname -s`" = Darwin; then
-+ glibtoolize --automake
-+else
-+ libtoolize --automake
-+fi
-+automake --add-missing
-+autoconf
-diff -Naru faac.orig/configure.in faac/configure.in
---- faac.orig/configure.in 2006-08-13 16:17:26.000000000 +0200
-+++ faac/configure.in 2007-06-13 10:17:47.000000000 +0200
-@@ -1,71 +1,71 @@
--AC_PREREQ(2.50)
--AC_INIT(FAAC, 1.25, faac-dev at lists.sourceforge.net)
--AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE
--
--AM_CONFIG_HEADER(config.h)
--
--AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
--
--AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
--
--CFLAGS=${CFLAGS:-"-O2 -Wall"}
--
--AC_PROG_CC
--AC_PROG_CXX
--AM_PROG_LIBTOOL
--
--AC_CHECK_HEADERS(getopt.h)
--
--AC_CHECK_TYPES(u_int32_t)
--AC_CHECK_TYPES(u_int16_t)
--AC_CHECK_TYPES(int32_t)
--AC_CHECK_TYPES(int16_t)
--
--AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP))
--
--AC_CHECK_LIB(gnugetopt, getopt_long)
--
--AM_CONDITIONAL(WITH_MP4V2, false)
--
--AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-- external_mp4v2=no, -lstdc++),
-- external_mp4v2=no, [#include <mp4.h>])
--
--if test x$external_mp4v2 = xyes; then
-- AC_MSG_NOTICE([*** Building with external mp4v2 ***])
--else
-- if test x$WITHMP4V2 = xyes; then
-- AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-- AM_CONDITIONAL(WITH_MP4V2, true)
-- AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)
-- MY_DEFINE(HAVE_LIBMP4V2)
-- else
-- AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***])
-- fi
--fi
--
--AC_C_BIGENDIAN
--
--dnl Checks for header files required for mp4.h
--AC_HEADER_STDC
--AC_SYS_LARGEFILE
--AC_CHECK_HEADERS(stdint.h inttypes.h)
--AC_CHECK_HEADERS(mathf.h)
--AC_CHECK_HEADERS(float.h)
--AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR))
--AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY))
--AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP))
--AC_CHECK_HEADERS(sys/time.h)
--AC_HEADER_TIME
--AC_TYPE_OFF_T
--AC_CHECK_TYPES([in_port_t, socklen_t], , ,
-- [#include <sys/types.h>
-- #include <sys/socket.h>
-- #include <netinet/in.h>])
--AC_CHECK_MEMBERS(fpos_t.__pos,,, [#include <stdio.h>])
--
--AC_OUTPUT(common/Makefile common/mp4v2/Makefile \
-- libfaac/Makefile frontend/Makefile \
-- include/Makefile Makefile)
-+AC_PREREQ(2.50)
-+AC_INIT(FAAC, 1.25, faac-dev at lists.sourceforge.net)
-+AC_CONFIG_AUX_DIR(.)
-+AM_INIT_AUTOMAKE
-+
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
-+
-+AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
-+
-+CFLAGS=${CFLAGS:-"-O2 -Wall"}
-+
-+AC_PROG_CC
-+AC_PROG_CXX
-+AM_PROG_LIBTOOL
-+
-+AC_CHECK_HEADERS(getopt.h)
-+
-+AC_CHECK_TYPES(u_int32_t)
-+AC_CHECK_TYPES(u_int16_t)
-+AC_CHECK_TYPES(int32_t)
-+AC_CHECK_TYPES(int16_t)
-+
-+AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP))
-+
-+AC_CHECK_LIB(gnugetopt, getopt_long)
-+
-+AM_CONDITIONAL(WITH_MP4V2, false)
-+
-+AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-+ AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-+ external_mp4v2=no, -lstdc++),
-+ external_mp4v2=no, [#include <mp4.h>])
-+
-+if test x$external_mp4v2 = xyes; then
-+ AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+else
-+ if test x$WITHMP4V2 = xyes; then
-+ AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-+ AM_CONDITIONAL(WITH_MP4V2, true)
-+ AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h)
-+ MY_DEFINE(HAVE_LIBMP4V2)
-+ else
-+ AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***])
-+ fi
-+fi
-+
-+AC_C_BIGENDIAN
-+
-+dnl Checks for header files required for mp4.h
-+AC_HEADER_STDC
-+AC_SYS_LARGEFILE
-+AC_CHECK_HEADERS(stdint.h inttypes.h)
-+AC_CHECK_HEADERS(mathf.h)
-+AC_CHECK_HEADERS(float.h)
-+AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR))
-+AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY))
-+AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP))
-+AC_CHECK_HEADERS(sys/time.h)
-+AC_HEADER_TIME
-+AC_TYPE_OFF_T
-+AC_CHECK_TYPES([in_port_t, socklen_t], , ,
-+ [#include <sys/types.h>
-+ #include <sys/socket.h>
-+ #include <netinet/in.h>])
-+AC_CHECK_MEMBERS(fpos_t.__pos,,, [#include <stdio.h>])
-+
-+AC_OUTPUT(common/Makefile common/mp4v2/Makefile \
-+ libfaac/Makefile frontend/Makefile \
-+ include/Makefile Makefile)
-diff -Naru faac.orig/Makefile.am faac/Makefile.am
---- faac.orig/Makefile.am 2004-07-28 10:18:20.000000000 +0200
-+++ faac/Makefile.am 2007-06-13 10:17:47.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = include libfaac common frontend
-+SUBDIRS = include libfaac common frontend
Deleted: dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-configure_in-syntax.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: Fix broken syntax in configure.in.
-
- at DPATCH@
-
-diff -u faac.orig/configure.in faac/configure.in
---- faac.orig/configure.in 2007-06-13 10:17:47.000000000 +0200
-+++ faac/configure.in 2007-04-20 12:35:28.000000000 +0200
-@@ -7,7 +7,7 @@
-
- AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
-
--AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
-+AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])
-
- CFLAGS=${CFLAGS:-"-O2 -Wall"}
-
-@@ -69,3 +69,7 @@
--AC_OUTPUT(common/Makefile common/mp4v2/Makefile \
-- libfaac/Makefile frontend/Makefile \
-- include/Makefile Makefile)
-+AC_OUTPUT([
-+ common/Makefile
-+ common/mp4v2/Makefile
-+ libfaac/Makefile
-+ frontend/Makefile
-+ include/Makefile
-+ Makefile])
Copied: dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch (from rev 155, dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch)
===================================================================
--- dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -0,0 +1,59 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## faac-1.25-external-libmp4v2.patch 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-10-16 11:19:58.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-08-20 20:03:22.000000000 +0200
++++ faac/configure.in 2007-10-16 11:19:58.000000000 +0200
+@@ -28,6 +28,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,
+@@ -36,10 +37,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-10-16 11:19:58.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-external-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -1,59 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## faac-1.25-external-libmp4v2.patch 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
Copied: dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch (from rev 155, dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch)
===================================================================
--- dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -0,0 +1,36 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 03-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-10-16 11:46:28.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 2007-10-16 11:37:25.000000000 +0200
++++ faac/frontend/Makefile.am 2007-10-16 11:37:57.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
Deleted: dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/patches/04-static-libmp4v2.dpatch 2007-10-16 08:29:02 UTC (rev 156)
@@ -1,36 +0,0 @@
-#!/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
Modified: dists/trunk/faac/debian/rules
===================================================================
--- dists/trunk/faac/debian/rules 2007-08-19 12:57:11 UTC (rev 155)
+++ dists/trunk/faac/debian/rules 2007-10-16 08:29:02 UTC (rev 156)
@@ -21,12 +21,14 @@
sh ./bootstrap
# Configuring package
- CFLAGS="$(CFLAGS) -fPIC" ./configure --prefix=/usr --with-mp4v2
+ CFLAGS="$(CFLAGS) -fPIC" ./configure --prefix=/usr \
+ --enable-drm \
+ --with-mp4v2
touch configure-stamp
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: configure-stamp
dh_testdir
# Building package
@@ -41,7 +43,9 @@
rm -f build-stamp configure-stamp
# Cleaning package
- -$(MAKE) --ignore-errors distclean
+ifneq "$(wildcard Makefile)" ""
+ $(MAKE) distclean
+endif
# Reverting bootstrapping
rm -rf aclocal.m4 \
@@ -71,7 +75,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean -k
dh_installdirs
# Installing package
More information about the Restricted-changes
mailing list