diff options
| author | hira <hira@pkgsrc.org> | 2006-06-08 09:17:01 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2006-06-08 09:17:01 +0000 |
| commit | 1858ec591754d7a21b5fa7d9c208c5e7d195fbef (patch) | |
| tree | 27e1a42bfd649fbedc94ab3f466d06d8a68bdbe7 /multimedia | |
| parent | f83ede0fbd09673295306453e797c2cf95930249 (diff) | |
| download | pkgsrc-1858ec591754d7a21b5fa7d9c208c5e7d195fbef.tar.gz | |
Don't define glib's types (gchar, guchar, etc.) if glib.h is already
included. This fixes build of audio/gtkpod with `mpeg4ip' option.
Idea from audio/faad2. Bump PKGREVISION.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/patches/patch-ae | 14 |
3 files changed, 18 insertions, 2 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 65e0aa8c2ee..35fbef57521 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2006/05/30 20:20:53 tron Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/08 09:17:01 hira Exp $ DISTNAME= mpeg4ip-1.5 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/} diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo index 0311416554b..0007ba2399e 100644 --- a/multimedia/mpeg4ip/distinfo +++ b/multimedia/mpeg4ip/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2006/05/30 20:20:53 tron Exp $ +$NetBSD: distinfo,v 1.5 2006/06/08 09:17:02 hira Exp $ SHA1 (mpeg4ip-1.5.tar.gz) = 32b5c1220fffa386da3efb50bde936990e0a472b RMD160 (mpeg4ip-1.5.tar.gz) = 98823860a4c3f2d49299f920661f1bd2b08a0673 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = c35f7bfd5f8fe229fd022def69a7030ffa837c07 SHA1 (patch-ab) = 93875dfe86b50c399113915fbac523becae3e2aa SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 +SHA1 (patch-ae) = 0418c4fa0fd966b3d5303d4f95a300d94fc48111 diff --git a/multimedia/mpeg4ip/patches/patch-ae b/multimedia/mpeg4ip/patches/patch-ae new file mode 100644 index 00000000000..82c504165c9 --- /dev/null +++ b/multimedia/mpeg4ip/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2006/06/08 09:17:02 hira Exp $ + +--- include/mpeg4ip.h.orig 2006-06-08 12:22:14.000000000 +0900 ++++ include/mpeg4ip.h 2006-06-08 12:23:04.000000000 +0900 +@@ -233,7 +233,8 @@ + + #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} + +-#ifndef HAVE_GTK ++#ifndef __G_LIB_H__ ++/* #ifndef HAVE_GTK */ + typedef char gchar; + typedef unsigned char guchar; + |