summaryrefslogtreecommitdiff
path: root/graphics/clutter08
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2010-05-25 07:25:44 +0000
committerobache <obache@pkgsrc.org>2010-05-25 07:25:44 +0000
commit298b809608b823bd393f2ee12ee8fb10d123bf90 (patch)
tree4e92af0435be88712768850429794ef72796fe32 /graphics/clutter08
parent527d7db2c99c0506d93bc64f549ea78310bedf25 (diff)
downloadpkgsrc-298b809608b823bd393f2ee12ee8fb10d123bf90.tar.gz
In cogl_get_proc_address(), falls back to gmmodule, same as clutter-1.x.
It will fix ruby-clutter. Bump PKGREVISION.
Diffstat (limited to 'graphics/clutter08')
-rw-r--r--graphics/clutter08/Makefile3
-rw-r--r--graphics/clutter08/distinfo3
-rw-r--r--graphics/clutter08/patches/patch-ab36
3 files changed, 40 insertions, 2 deletions
diff --git a/graphics/clutter08/Makefile b/graphics/clutter08/Makefile
index 9dd0f2df6ae..6488909c8b6 100644
--- a/graphics/clutter08/Makefile
+++ b/graphics/clutter08/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 08:30:16 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/25 07:25:44 obache Exp $
#
DISTNAME= clutter-0.8.8
PKGNAME= ${DISTNAME:S/clutter/clutter08/}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter/0.8/
diff --git a/graphics/clutter08/distinfo b/graphics/clutter08/distinfo
index 1236e58e36f..17765f2b517 100644
--- a/graphics/clutter08/distinfo
+++ b/graphics/clutter08/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/26 08:30:16 obache Exp $
+$NetBSD: distinfo,v 1.2 2010/05/25 07:25:44 obache Exp $
SHA1 (clutter-0.8.8.tar.gz) = 560e127b99494131ec3b901f53bd93d6809d79ea
RMD160 (clutter-0.8.8.tar.gz) = 400c97617cd26ae9e338cedddce8b67bc3fe4293
Size (clutter-0.8.8.tar.gz) = 2153665 bytes
SHA1 (patch-aa) = 639cd5709b8423ccd5c42b77231fefaaa9af072d
+SHA1 (patch-ab) = 4aa8988640df604f727a45229d2f9b0326df069d
diff --git a/graphics/clutter08/patches/patch-ab b/graphics/clutter08/patches/patch-ab
new file mode 100644
index 00000000000..2c90380b8e3
--- /dev/null
+++ b/graphics/clutter08/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2010/05/25 07:25:44 obache Exp $
+
+falls back to gmodule, same as clutter-1.x.
+
+--- clutter/cogl/gl/cogl.c.orig 2009-02-20 15:41:39.000000000 +0000
++++ clutter/cogl/gl/cogl.c
+@@ -82,6 +82,7 @@ _cogl_error_string(GLenum errorCode)
+ CoglFuncPtr
+ cogl_get_proc_address (const gchar* name)
+ {
++ static GModule *module = NULL;
+ /* Sucks to ifdef here but not other option..? would be nice to
+ * split the code up for more reuse (once more backends use this
+ */
+@@ -122,11 +123,10 @@ cogl_get_proc_address (const gchar* name
+
+ return (CoglFuncPtr) wglGetProcAddress ((LPCSTR) name);
+
+-#else /* HAVE_CLUTTER_WIN32 */
++#endif /* HAVE_CLUTTER_WIN32 */
+
+ /* this should find the right function if the program is linked against a
+ * library providing it */
+- static GModule *module = NULL;
+ if (module == NULL)
+ module = g_module_open (NULL, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+
+@@ -138,8 +138,6 @@ cogl_get_proc_address (const gchar* name
+ return symbol;
+ }
+
+-#endif /* HAVE_CLUTTER_WIN32 */
+-
+ return NULL;
+ }
+