[pkgsrc/trunk]: pkgsrc/graphics/babl Fix build problems under Mac OS X:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96c70f233c76
branches:  trunk
changeset: 553710:96c70f233c76
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jan 28 13:02:49 2009 +0000

description:
Fix build problems under Mac OS X:
1.) Pull in patch from GNOME SVN to get definition of "gzize" in the
    Mac OS X specific part o "babl-cpuaccel.c".
2.) Fix broken build of extensions which need to be built as bundles
    and not shared libraries.

This fixes PR pkg/40473.

diffstat:

 graphics/babl/Makefile         |  15 +++++++++++++--
 graphics/babl/distinfo         |   3 ++-
 graphics/babl/patches/patch-ac |  15 +++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r 1b32da7398e0 -r 96c70f233c76 graphics/babl/Makefile
--- a/graphics/babl/Makefile    Wed Jan 28 12:56:42 2009 +0000
+++ b/graphics/babl/Makefile    Wed Jan 28 13:02:49 2009 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/19 17:51:14 bjs Exp $
-#
+# $NetBSD: Makefile,v 1.2 2009/01/28 13:02:49 tron Exp $
 
 DISTNAME=      babl-${BABL_VERSION}
 CATEGORIES=    graphics
@@ -23,5 +22,17 @@
 
 .include "Makefile.version"
 
+# Work around broken makefile, please see here:
+# http://bugzilla.gnome.org/show_bug.cgi?id=569085
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+SUBST_CLASSES+=                plugin
+SUBST_STAGE.plugin=    post-configure
+SUBST_FILES.plugin=    extensions/Makefile
+SUBST_SED.plugin=      -e "s/SHREXT = .dylib/SHREXT = .so/"
+SUBST_SED.plugin+=     -e "s/DYNAMICLIB = -dynamiclib/DYNAMICLIB = -bundle/"
+SUBST_SED.plugin+=     -e "s/BABL_API_VERSION...SHREXT./BABL_API_VERSION).dylib/"
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1b32da7398e0 -r 96c70f233c76 graphics/babl/distinfo
--- a/graphics/babl/distinfo    Wed Jan 28 12:56:42 2009 +0000
+++ b/graphics/babl/distinfo    Wed Jan 28 13:02:49 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/19 17:51:14 bjs Exp $
+$NetBSD: distinfo,v 1.2 2009/01/28 13:02:49 tron Exp $
 
 SHA1 (babl-0.0.22.tar.bz2) = 9de50fb5833f41691f50f6e735d6422aad52ea94
 RMD160 (babl-0.0.22.tar.bz2) = a10c07e70f1fe8944a969bba46484acf410c2583
 Size (babl-0.0.22.tar.bz2) = 396413 bytes
 SHA1 (patch-aa) = f9f29ca359160ca37193cab85c5ab794208e84b1
 SHA1 (patch-ab) = 1fc18c1767277f92c0c65a1e27a72e4636eb406b
+SHA1 (patch-ac) = ab520d63cc602790a818aa9b5d8d3c1995d444ac
diff -r 1b32da7398e0 -r 96c70f233c76 graphics/babl/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/babl/patches/patch-ac    Wed Jan 28 13:02:49 2009 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2009/01/28 13:02:49 tron Exp $
+
+Mac OS X build fix, taken from:
+http://svn.gnome.org/viewvc/babl/trunk/babl/babl-cpuaccel.c?r1=316&r2=347
+
+--- babl/babl-cpuaccel.c.orig  2008-05-23 15:37:21.000000000 +0100
++++ babl/babl-cpuaccel.c       2009-01-25 15:13:14.000000000 +0000
+@@ -39,6 +39,7 @@
+ typedef unsigned int guint32;
+ typedef int gint;
+ typedef char gchar;
++typedef size_t gsize;
+ #define TRUE  1
+ #define FALSE 0
+ #define G_GNUC_CONST