[Restricted-changes] r127 - dists/trunk/faac/debian/patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Wed Jun 13 08:34:30 UTC 2007
Author: fabian-guest
Date: 2007-06-13 08:34:30 +0000 (Wed, 13 Jun 2007)
New Revision: 127
Added:
dists/trunk/faac/debian/patches/00list
dists/trunk/faac/debian/patches/01-dos2unix.dpatch
dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
Removed:
dists/trunk/faac/debian/patches/00list
dists/trunk/faac/debian/patches/01-pre-bootstrap.dpatch
dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch
Log:
Split and re-organize patches.
Deleted: dists/trunk/faac/debian/patches/00list
===================================================================
--- dists/trunk/faac/debian/patches/00list 2007-06-12 13:48:31 UTC (rev 126)
+++ dists/trunk/faac/debian/patches/00list 2007-06-13 08:34:30 UTC (rev 127)
@@ -1,2 +0,0 @@
-01-pre-bootstrap
-02-static-libmp4v2
Added: dists/trunk/faac/debian/patches/00list
===================================================================
--- dists/trunk/faac/debian/patches/00list (rev 0)
+++ dists/trunk/faac/debian/patches/00list 2007-06-13 08:34:30 UTC (rev 127)
@@ -0,0 +1,3 @@
+01-dos2unix
+02-configure_in-syntax
+03-static-libmp4v2
Added: dists/trunk/faac/debian/patches/01-dos2unix.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/01-dos2unix.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/01-dos2unix.dpatch 2007-06-13 08:34:30 UTC (rev 127)
@@ -0,0 +1,185 @@
+#!/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
Property changes on: dists/trunk/faac/debian/patches/01-dos2unix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: dists/trunk/faac/debian/patches/01-pre-bootstrap.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/01-pre-bootstrap.dpatch 2007-06-12 13:48:31 UTC (rev 126)
+++ dists/trunk/faac/debian/patches/01-pre-bootstrap.dpatch 2007-06-13 08:34:30 UTC (rev 127)
@@ -1,190 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-pre-bootstrap.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: Do a `dos2unix bootstrap; dos2unix Makefile.am; dos2unix configure.in'
-## DP: and fix broken syntax in `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-04-20 12:33:38.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-04-20 12:35:28.000000000 +0200
-@@ -1,71 +1,75 @@
--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-04-20 12:33:38.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = include libfaac common frontend
-+SUBDIRS = include libfaac common frontend
Added: dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch 2007-06-13 08:34:30 UTC (rev 127)
@@ -0,0 +1,30 @@
+#!/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])
Property changes on: dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch 2007-06-12 13:48:31 UTC (rev 126)
+++ dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch 2007-06-13 08:34:30 UTC (rev 127)
@@ -1,36 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-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
Added: dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch (rev 0)
+++ dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch 2007-06-13 08:34:30 UTC (rev 127)
@@ -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 `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
Property changes on: dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Restricted-changes
mailing list