From a80b35621dd7300642b71002ce5492a143f23521 Mon Sep 17 00:00:00 2001 From: ben Date: Sun, 9 Oct 2005 03:23:11 +0000 Subject: This change addresses PR#31443 Copy config.h to faad2-config.h. Modify systems.h to refer to faad2-config.h, and install faad2-config.h. This situation is discussed here: http://lists.gnu.org/archive/html/automake/2000-10/msg00114.html Remove the undef of PACKAGE and VERSION, and add a 3rd non-empty argument to AM_INIT_AUTOMAKE. This situation is discussed here: http://lists.gnu.org/archive/html/automake/2000-10/msg00108.html Modify the condition from HAVE_GLIB_H to __G_LIB_H__, which was easier because faad2 doesn't depend on glib. Bump pkgrevision. --- audio/faad2/Makefile | 4 ++-- audio/faad2/PLIST | 4 ++-- audio/faad2/buildlink3.mk | 4 ++-- audio/faad2/distinfo | 7 ++++--- audio/faad2/patches/patch-ac | 8 ++++---- audio/faad2/patches/patch-ak | 16 ++++++++++++++-- audio/faad2/patches/patch-al | 25 +++++++++++++++++++++++++ 7 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 audio/faad2/patches/patch-al (limited to 'audio') diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index 58191db5736..e1eea9762b5 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2005/10/06 13:13:28 ben Exp $ +# $NetBSD: Makefile,v 1.28 2005/10/09 03:23:11 ben Exp $ # DISTNAME= faad2-2.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/} diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST index b453fea9740..f9ba17eb932 100644 --- a/audio/faad2/PLIST +++ b/audio/faad2/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.4 2005/10/06 13:13:28 ben Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/10/09 03:23:11 ben Exp $ bin/faad -include/faad2/config.h +include/faad2/faad2-config.h include/faad2/faad.h include/faad2/mp4.h include/faad2/mp4ff.h diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk index b6df7385d60..26c28462ce8 100644 --- a/audio/faad2/buildlink3.mk +++ b/audio/faad2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2005/10/06 13:13:28 ben Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2005/10/09 03:23:11 ben Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaad2} BUILDLINK_PACKAGES+= faad2 .if !empty(FAAD2_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.faad2+= faad2>=2.0nb2 +BUILDLINK_DEPENDS.faad2+= faad2>=2.0nb3 BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2 BUILDLINK_INCDIRS.faad2?= include/faad2 .endif # FAAD2_BUILDLINK3_MK diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo index b74bc162378..1a726918a32 100644 --- a/audio/faad2/distinfo +++ b/audio/faad2/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2005/10/06 13:13:28 ben Exp $ +$NetBSD: distinfo,v 1.9 2005/10/09 03:23:11 ben Exp $ SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8 RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 Size (faad2-2.0.tar.gz) = 766660 bytes SHA1 (patch-aa) = 60f8ee14a3da38405eeab29047670b6878114244 SHA1 (patch-ab) = 33c8c741f3b3870d84c66b6eb8bf95d4b768f39e -SHA1 (patch-ac) = 6bc2c97d5c5022637d63c0194a6545d55720f82e +SHA1 (patch-ac) = 159195389b64ff2f86f7bde34b8c7840fcb9abb4 SHA1 (patch-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186 SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc SHA1 (patch-af) = c6da419d2ac6b120b2e70c72f240c6f6b83ca39a @@ -13,4 +13,5 @@ SHA1 (patch-ag) = a2527f6ddfcf65ba6077bc6145c87bb354c740db SHA1 (patch-ah) = d062e23144932994c4193189efc6dfc47520f139 SHA1 (patch-ai) = 0f09c422d764467fdb5d4bce846bc80e653d4aac SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77 -SHA1 (patch-ak) = a83c7805ec58ee124fbb0e3c2327731aeaeb9a79 +SHA1 (patch-ak) = baed39b230c085cb67710f95e2b11a801547d366 +SHA1 (patch-al) = e3dcbf3a0f19a4aca58bcad4ba079b2fee7415e2 diff --git a/audio/faad2/patches/patch-ac b/audio/faad2/patches/patch-ac index e43c8cc7bda..4b8d932665f 100644 --- a/audio/faad2/patches/patch-ac +++ b/audio/faad2/patches/patch-ac @@ -1,14 +1,14 @@ -$NetBSD: patch-ac,v 1.3 2005/10/06 13:13:28 ben Exp $ +$NetBSD: patch-ac,v 1.4 2005/10/09 03:23:11 ben Exp $ ---- Makefile.am.orig 2004-02-06 16:04:39.000000000 +0000 -+++ Makefile.am 2004-03-27 22:36:00.000000000 +0000 +--- Makefile.am.orig 2004-02-06 08:04:39.000000000 -0800 ++++ Makefile.am @@ -1,8 +1,10 @@ -SUBDIRS = libfaad common frontend plugins +SUBDIRS = libfaad common frontend plugins include EXTRA_DIST = faad2.spec -+include_HEADERS = config.h ++include_HEADERS = faad2-config.h + rpm: Makefile - make dist diff --git a/audio/faad2/patches/patch-ak b/audio/faad2/patches/patch-ak index 888c24c834f..19e1df24ab2 100644 --- a/audio/faad2/patches/patch-ak +++ b/audio/faad2/patches/patch-ak @@ -1,7 +1,14 @@ -$NetBSD: patch-ak,v 1.1 2005/10/06 13:13:28 ben Exp $ +$NetBSD: patch-ak,v 1.2 2005/10/09 03:23:11 ben Exp $ ---- configure.in.orig 2005-10-05 21:16:43.000000000 -0700 +--- configure.in.orig 2004-02-06 08:04:39.000000000 -0800 +++ configure.in +@@ -1,5 +1,5 @@ + AC_INIT +-AM_INIT_AUTOMAKE(faad2, 2.0) ++AM_INIT_AUTOMAKE(faad2, 2.0, do-not-define-PACKAGE-or-VERSION) + + AC_PROG_LIBTOOL + AC_SUBST(LIBTOOL_DEPS) @@ -114,7 +114,7 @@ if test x$WITHDRM = xyes; then AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)]) fi @@ -11,3 +18,8 @@ $NetBSD: patch-ak,v 1.1 2005/10/06 13:13:28 ben Exp $ AC_CONFIG_FILES(plugins/mpeg4ip/Makefile) +@@ -122,3 +122,4 @@ AC_CONFIG_FILES(common/mp4ff/Makefile co + + AC_CONFIG_FILES(faad2.spec) + AC_OUTPUT ++cp config.h faad2-config.h diff --git a/audio/faad2/patches/patch-al b/audio/faad2/patches/patch-al new file mode 100644 index 00000000000..8defc7dcbf4 --- /dev/null +++ b/audio/faad2/patches/patch-al @@ -0,0 +1,25 @@ +$NetBSD: patch-al,v 1.1 2005/10/09 03:23:11 ben Exp $ + +--- common/mp4v2/systems.h.orig 2003-06-29 14:41:00.000000000 -0700 ++++ common/mp4v2/systems.h +@@ -29,9 +29,7 @@ + #include + #define NEED_SDL_VIDEO_IN_MAIN_THREAD + #else +-#undef PACKAGE +-#undef VERSION +-#include ++#include + #endif + + +@@ -269,7 +267,8 @@ char *strsep(char **strp, const char *de + + #define NUM_ELEMENTS_IN_ARRAY(name) ((sizeof((name))) / (sizeof(*(name)))) + +-#ifndef HAVE_GLIB_H ++#ifndef __G_LIB_H__ ++/* #ifndef HAVE_GLIB_H */ + typedef char gchar; + typedef unsigned char guchar; + -- cgit v1.2.3