[pkgsrc/trunk]: pkgsrc/multimedia/mpeg4ip Don't define glib's types (gchar, g...

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cea177523358
branches:  trunk
changeset: 514140:cea177523358
user:      hira <hira%pkgsrc.org@localhost>
date:      Thu Jun 08 09:17:01 2006 +0000

description:
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:

 multimedia/mpeg4ip/Makefile         |   3 ++-
 multimedia/mpeg4ip/distinfo         |   3 ++-
 multimedia/mpeg4ip/patches/patch-ae |  14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r bb8f8c36f991 -r cea177523358 multimedia/mpeg4ip/Makefile
--- a/multimedia/mpeg4ip/Makefile       Thu Jun 08 09:09:21 2006 +0000
+++ b/multimedia/mpeg4ip/Makefile       Thu Jun 08 09:17:01 2006 +0000
@@ -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 -r bb8f8c36f991 -r cea177523358 multimedia/mpeg4ip/distinfo
--- a/multimedia/mpeg4ip/distinfo       Thu Jun 08 09:09:21 2006 +0000
+++ b/multimedia/mpeg4ip/distinfo       Thu Jun 08 09:17:01 2006 +0000
@@ -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-ab) = 93875dfe86b50c399113915fbac523becae3e2aa
 SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9
 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56
+SHA1 (patch-ae) = 0418c4fa0fd966b3d5303d4f95a300d94fc48111
diff -r bb8f8c36f991 -r cea177523358 multimedia/mpeg4ip/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mpeg4ip/patches/patch-ae       Thu Jun 08 09:17:01 2006 +0000
@@ -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;
+