kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make the installed include files more consistent: don't rely

Browse source 
on HAVE_STDINT_H defined by the client app, don't install
mp4ffint.h which is purely internal,
fix build of the xmms plugin,
bump PKGREVISION
This commit is contained in:
drochner 2009-08-11 11:16:37 +00:00
parent e38241cd56
commit 03ba320e21
9 changed files with 36 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
audio/faad2/Makefile
View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.44 2009/08/10 00:05:35 tnn Exp $ # $NetBSD: Makefile,v 1.45 2009/08/11 11:16:37 drochner Exp $
DISTNAME= faad2-2.7 DISTNAME= faad2-2.7
PKGREVISION= 1
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}

4
audio/faad2/PLIST
View file

@ -1,9 +1,9 @@
@comment $NetBSD: PLIST,v 1.13 2009/08/10 00:01:55 tnn Exp $ @comment $NetBSD: PLIST,v 1.14 2009/08/11 11:16:37 drochner Exp $
bin/faad bin/faad
include/faad2/faad.h include/faad2/faad.h
include/faad2/faad2-config.h include/faad2/faad2-config.h
include/faad2/mp4ff_int_types.h
include/faad2/mp4ff.h include/faad2/mp4ff.h
include/faad2/mp4ffint.h
include/faad2/neaacdec.h include/faad2/neaacdec.h
lib/libfaad.la lib/libfaad.la
lib/libmp4ff.la lib/libmp4ff.la

13
audio/faad2/distinfo
View file

@ -1,17 +1,16 @@
$NetBSD: distinfo,v 1.20 2009/08/10 00:01:56 tnn Exp $ $NetBSD: distinfo,v 1.21 2009/08/11 11:16:37 drochner Exp $
SHA1 (faad2-2.7.tar.gz) = 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA1 (faad2-2.7.tar.gz) = 80eaaa5cc576c35dd28863767b795c50cbcc0511
RMD160 (faad2-2.7.tar.gz) = 3f0ca461e2953014d5b17edccb3337767d478b8d RMD160 (faad2-2.7.tar.gz) = 3f0ca461e2953014d5b17edccb3337767d478b8d
Size (faad2-2.7.tar.gz) = 1137407 bytes Size (faad2-2.7.tar.gz) = 1137407 bytes
SHA1 (patch-aa) = e3bf0fc44569b05295bc6b682bb14a4ca36681dd SHA1 (patch-aa) = e3bf0fc44569b05295bc6b682bb14a4ca36681dd
SHA1 (patch-ab) = 460466628f164f2f11674f7977c851006492a9a0 SHA1 (patch-ab) = e443484f19dfcc58d424401842d4747762d631e4
SHA1 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435 SHA1 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435
SHA1 (patch-ad) = 949336b6963c1d01f35a8447c988ee21c4905104 SHA1 (patch-ad) = 949336b6963c1d01f35a8447c988ee21c4905104
SHA1 (patch-af) = 36b2979d871e70bf6a29e3a9c17ee4c5bb2b1aa6 SHA1 (patch-af) = 388921b81fc710ccbe64d55cb915e2332e0d7e51
SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77 SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
SHA1 (patch-ak) = 2a1a3a8071f7a0dc32024dfbdd68bf98b9138145 SHA1 (patch-ak) = 2a1a3a8071f7a0dc32024dfbdd68bf98b9138145
SHA1 (patch-ar) = 6a5e3d4316d223aaf7a983fb0caa02f8e38ebde9 SHA1 (patch-ar) = 6b65f8fb3970df3ba292e58f201fa941a1458f40
SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845 SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845
SHA1 (patch-at) = 09abcd42e79dce382d47f9634204352d1249a4c7 SHA1 (patch-au) = a56ec5238179f0ba59e64a8b516b2bbc6dcd4efb
SHA1 (patch-au) = 47eaf645111c448405a0cf31c67f73333c7159c3 SHA1 (patch-av) = c393ec95e17a2f702792c2e673df1422732ea0f6
SHA1 (patch-av) = 507c68137f5146b609c644186a06ea55a372d468

4
audio/faad2/patches/patch-ab
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.4 2009/08/10 00:01:56 tnn Exp $ $NetBSD: patch-ab,v 1.5 2009/08/11 11:16:38 drochner Exp $
--- frontend/Makefile.am.orig 2009-02-06 17:03:37.000000000 +0100 --- frontend/Makefile.am.orig 2009-02-06 17:03:37.000000000 +0100
+++ frontend/Makefile.am +++ frontend/Makefile.am
@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.4 2009/08/10 00:01:56 tnn Exp $
faad_LDADD = $(top_builddir)/libfaad/libfaad.la \ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
- $(top_builddir)/common/mp4ff/libmp4ff.a - $(top_builddir)/common/mp4ff/libmp4ff.a
+ $(top_builddir)/common/mp4ff/.libs/libmp4ff.a + $(top_builddir)/common/mp4ff/libmp4ff.la
faad_SOURCES = main.c \ faad_SOURCES = main.c \
- audio.c audio.h \ - audio.c audio.h \

14
audio/faad2/patches/patch-af
View file

@ -1,17 +1,13 @@
$NetBSD: patch-af,v 1.3 2007/12/09 10:55:32 drochner Exp $ $NetBSD: patch-af,v 1.4 2009/08/11 11:16:38 drochner Exp $
--- common/mp4ff/mp4ff_int_types.h.orig 2005-02-01 14:15:55.000000000 +0100 --- common/mp4ff/mp4ff_int_types.h.orig 2008-11-24 22:52:45.000000000 +0100
+++ common/mp4ff/mp4ff_int_types.h +++ common/mp4ff/mp4ff_int_types.h
@@ -1,3 +1,5 @@ @@ -19,7 +19,18 @@ typedef unsigned __int64 uint64_t;
+#include "config.h"
+
#ifndef _MP4FF_INT_TYPES_H_
#define _MP4FF_INT_TYPES_H_
@@ -15,7 +17,16 @@ typedef unsigned __int64 uint64_t;
#else #else
+#include "faad2-config.h"
+
+#if HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H
+#include <sys/types.h> +#include <sys/types.h>
+#endif +#endif

4
audio/faad2/patches/patch-ar
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ar,v 1.4 2009/08/10 00:01:56 tnn Exp $ $NetBSD: patch-ar,v 1.5 2009/08/11 11:16:38 drochner Exp $
--- plugins/xmms/src/Makefile.am.orig 2009-01-26 23:51:44.000000000 +0100 --- plugins/xmms/src/Makefile.am.orig 2009-01-26 23:51:44.000000000 +0100
+++ plugins/xmms/src/Makefile.am +++ plugins/xmms/src/Makefile.am
@ -8,7 +8,7 @@ $NetBSD: patch-ar,v 1.4 2009/08/10 00:01:56 tnn Exp $
-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \ -libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
- $(top_builddir)/common/mp4ff/libmp4ff.a - $(top_builddir)/common/mp4ff/libmp4ff.a
+libmp4_la_LIBADD = $(top_builddir)/common/mp4ff/libmp4ff.a +libmp4_la_LIBADD = -L$(prefix)/lib -lmp4ff -lfaad
-libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread -libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
+libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} +libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}

12
audio/faad2/patches/patch-at
View file

@ -1,12 +0,0 @@
$NetBSD: patch-at,v 1.4 2009/08/10 00:01:56 tnn Exp $
--- frontend/main.c.orig 2008-09-22 19:55:09.000000000 +0200
+++ frontend/main.c
@@ -44,6 +44,7 @@
#include <getopt.h>
#include <neaacdec.h>
+#include <mp4ff_int_types.h> /* for uint32_t */
#include <mp4ff.h>
#include "audio.h"

7
audio/faad2/patches/patch-au
View file

@ -1,11 +1,12 @@
$NetBSD: patch-au,v 1.2 2009/08/10 00:01:56 tnn Exp $ $NetBSD: patch-au,v 1.3 2009/08/11 11:16:38 drochner Exp $
--- common/mp4ff/Makefile.am.orig 2009-02-06 15:24:21.000000000 +0100 --- common/mp4ff/Makefile.am.orig 2009-02-06 15:24:21.000000000 +0100
+++ common/mp4ff/Makefile.am +++ common/mp4ff/Makefile.am
@@ -1,7 +1,8 @@ @@ -1,7 +1,7 @@
-lib_LIBRARIES = libmp4ff.a -lib_LIBRARIES = libmp4ff.a
-include_HEADERS = mp4ff.h mp4ffint.h
+lib_LTLIBRARIES = libmp4ff.la +lib_LTLIBRARIES = libmp4ff.la
include_HEADERS = mp4ff.h mp4ffint.h +include_HEADERS = mp4ff.h mp4ff_int_types.h
-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 -libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 +libmp4ff_la_CFLAGS = -DUSE_TAGGING=1

23
audio/faad2/patches/patch-av
View file

@ -1,13 +1,16 @@
$NetBSD: patch-av,v 1.2 2009/08/10 00:01:56 tnn Exp $ $NetBSD: patch-av,v 1.3 2009/08/11 11:16:38 drochner Exp $
--- common/mp4ff/mp4ff.h.orig 2009-01-29 01:41:08.000000000 +0100 --- ./common/mp4ff/mp4ff.h.orig 2009-01-29 01:41:08.000000000 +0100
+++ common/mp4ff/mp4ff.h +++ ./common/mp4ff/mp4ff.h
@@ -37,6 +37,8 @@ extern "C" { @@ -35,11 +35,7 @@
extern "C" {
#endif /* __cplusplus */
#ifdef HAVE_STDINT_H -#ifdef HAVE_STDINT_H
#include <stdint.h> -#include <stdint.h>
+#elif defined(HAVE_INTTYPES_H) -#else
+#include <inttypes.h>
#else
#include "mp4ff_int_types.h" #include "mp4ff_int_types.h"
#endif -#endif
/* file callback structure */
typedef struct