[Restricted-changes] r157 - in dists/trunk/faac/debian: . patches

fabian-guest at alioth.debian.org fabian-guest at alioth.debian.org
Wed Oct 17 13:40:47 UTC 2007


Author: fabian-guest
Date: 2007-10-17 13:40:47 +0000 (Wed, 17 Oct 2007)
New Revision: 157

Added:
   dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch
Removed:
   dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch
   dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
Modified:
   dists/trunk/faac/debian/changelog
   dists/trunk/faac/debian/patches/00list
   dists/trunk/faac/debian/rules
Log:
* debian/patches/02-external-libmp4v2.dpatch:
  + Removed. We link statically against the internal libmp4v2 anyway.
* debian/patches/03-static-libmp4v2.dpatch:
  + Renamed, rediffed.
* debian/patches/00list:
  + Adopted.
* debian/changelog, debian/rules:
  + Cosmetic changes.


Modified: dists/trunk/faac/debian/changelog
===================================================================
--- dists/trunk/faac/debian/changelog	2007-10-16 08:29:02 UTC (rev 156)
+++ dists/trunk/faac/debian/changelog	2007-10-17 13:40:47 UTC (rev 157)
@@ -8,6 +8,6 @@
 faac (1.25-1) unstable; urgency=low
 
   * Initial release.
-  * Statically linked 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/patches/00list
===================================================================
--- dists/trunk/faac/debian/patches/00list	2007-10-16 08:29:02 UTC (rev 156)
+++ dists/trunk/faac/debian/patches/00list	2007-10-17 13:40:47 UTC (rev 157)
@@ -1,3 +1,2 @@
-01-configure_in-syntax.dpatch
-02-external-libmp4v2.dpatch
-03-static-libmp4v2.dpatch
+01-configure_in-syntax
+02-static-libmp4v2

Deleted: dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch	2007-10-16 08:29:02 UTC (rev 156)
+++ dists/trunk/faac/debian/patches/02-external-libmp4v2.dpatch	2007-10-17 13:40:47 UTC (rev 157)
@@ -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-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

Copied: dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch (from rev 156, dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch)
===================================================================
--- dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch	                        (rev 0)
+++ dists/trunk/faac/debian/patches/02-static-libmp4v2.dpatch	2007-10-17 13:40:47 UTC (rev 157)
@@ -0,0 +1,36 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-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-17 16:37:11.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-10-17 16:37:33.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

Deleted: dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch	2007-10-16 08:29:02 UTC (rev 156)
+++ dists/trunk/faac/debian/patches/03-static-libmp4v2.dpatch	2007-10-17 13:40:47 UTC (rev 157)
@@ -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 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

Modified: dists/trunk/faac/debian/rules
===================================================================
--- dists/trunk/faac/debian/rules	2007-10-16 08:29:02 UTC (rev 156)
+++ dists/trunk/faac/debian/rules	2007-10-17 13:40:47 UTC (rev 157)
@@ -5,6 +5,9 @@
 
 include /usr/share/dpatch/dpatch.make
 
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -21,11 +24,16 @@
 	sh ./bootstrap
 
 	# Configuring package
-	CFLAGS="$(CFLAGS) -fPIC" ./configure --prefix=/usr \
+	CFLAGS="$(CFLAGS) -fPIC" \
+	CXXFLAGS="$(CFLAGS) -fPIC" \
+	./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
 		--enable-drm \
 		--with-mp4v2
 
-	touch configure-stamp
+	touch $@
 
 build: build-stamp
 build-stamp: configure-stamp
@@ -34,7 +42,7 @@
 	# Building package
 	$(MAKE)
 
-	touch build-stamp
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:




More information about the Restricted-changes mailing list