* fixes build with clutter-1.2 (patch-ab).

* fixes dependency (some bindings had been dropped when updated to 1.0.0).
Bump PKGREVISION.

3 files changed, 42 insertions, 8 deletions

diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index f97d5f296fd..b69f7b8caac 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/10/26 19:57:23 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2010/03/11 05:41:24 obache Exp $
 #
 
 DISTNAME=	pyclutter-1.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.clutter-project.org/sources/pyclutter/1.0/
 
@@ -25,14 +26,8 @@ PKGCONFIG_OVERRIDE+=	pyclutter.pc.in
 
 PY_PATCHPLIST=	yes
 
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.clutter+=	clutter>=0.8.4
 .include "../../graphics/clutter/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
-.include "../../devel/py-gobject/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-clutter/distinfo b/graphics/py-clutter/distinfo
index ec77e3fc401..8048d9da05b 100644
--- a/graphics/py-clutter/distinfo
+++ b/graphics/py-clutter/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/10/26 08:59:22 obache Exp $
+$NetBSD: distinfo,v 1.3 2010/03/11 05:41:24 obache Exp $
 
 SHA1 (pyclutter-1.0.0.tar.gz) = db45bd969a5db54116aa37a20ac4b6fa2fd3c908
 RMD160 (pyclutter-1.0.0.tar.gz) = e0d10618efed5491ccb4622508554423fcd33818
 Size (pyclutter-1.0.0.tar.gz) = 526655 bytes
 SHA1 (patch-aa) = cf2c042f8932b9a78cd8d4b7b35eed7d96db588a
+SHA1 (patch-ab) = ff1987ad8415c5052a1e2474bf1e7d74566eaa6b
diff --git a/graphics/py-clutter/patches/patch-ab b/graphics/py-clutter/patches/patch-ab
new file mode 100644
index 00000000000..3127212b25e
--- /dev/null
+++ b/graphics/py-clutter/patches/patch-ab
@@ -0,0 +1,38 @@
+$NetBSD: patch-ab,v 1.1 2010/03/11 05:41:24 obache Exp $
+
+Change CGL_* constants to GL_*
+http://git.clutter-project.org/cgit.cgi?url=bindings/pyclutter/commit/&id=e249844f1dbeb9abb64f4a1245042a0756233330
+
+--- clutter/cluttermodule.c.orig	2009-08-28 11:36:36.000000000 +0000
++++ clutter/cluttermodule.c
+@@ -148,19 +148,19 @@ pycogl_add_gl_constants (PyObject *modul
+    * should also be loading PyOpenGL, which exposes all the
+    * enumeration values
+    */
+-  PyModule_AddObject (module, "NEVER", Py_BuildValue ("i", CGL_NEVER));
+-  PyModule_AddObject (module, "LESS", Py_BuildValue ("i", CGL_LESS));
+-  PyModule_AddObject (module, "LEQUAL", Py_BuildValue ("i", CGL_LEQUAL));
+-  PyModule_AddObject (module, "EQUAL", Py_BuildValue ("i", CGL_EQUAL));
+-  PyModule_AddObject (module, "NOTEQUAL", Py_BuildValue ("i", CGL_NOTEQUAL));
+-  PyModule_AddObject (module, "GEQUAL", Py_BuildValue ("i", CGL_GEQUAL));
+-  PyModule_AddObject (module, "GREATER", Py_BuildValue ("i", CGL_GREATER));
+-  PyModule_AddObject (module, "ALWAYS", Py_BuildValue ("i", CGL_ALWAYS));
++  PyModule_AddObject (module, "NEVER", Py_BuildValue ("i", GL_NEVER));
++  PyModule_AddObject (module, "LESS", Py_BuildValue ("i", GL_LESS));
++  PyModule_AddObject (module, "LEQUAL", Py_BuildValue ("i", GL_LEQUAL));
++  PyModule_AddObject (module, "EQUAL", Py_BuildValue ("i", GL_EQUAL));
++  PyModule_AddObject (module, "NOTEQUAL", Py_BuildValue ("i", GL_NOTEQUAL));
++  PyModule_AddObject (module, "GEQUAL", Py_BuildValue ("i", GL_GEQUAL));
++  PyModule_AddObject (module, "GREATER", Py_BuildValue ("i", GL_GREATER));
++  PyModule_AddObject (module, "ALWAYS", Py_BuildValue ("i", GL_ALWAYS));
+ 
+-  PyModule_AddObject (module, "SRC_ALPHA", Py_BuildValue ("i", CGL_SRC_ALPHA));
+-  PyModule_AddObject (module, "ONE_MINUS_SRC_ALPHA", Py_BuildValue ("i", CGL_ONE_MINUS_SRC_ALPHA));
++  PyModule_AddObject (module, "SRC_ALPHA", Py_BuildValue ("i", GL_SRC_ALPHA));
++  PyModule_AddObject (module, "ONE_MINUS_SRC_ALPHA", Py_BuildValue ("i", GL_ONE_MINUS_SRC_ALPHA));
+ 
+-  PyModule_AddObject (module, "OBJECT_COMPILE_STATUS", Py_BuildValue ("i", CGL_OBJECT_COMPILE_STATUS));
++  PyModule_AddObject (module, "OBJECT_COMPILE_STATUS", Py_BuildValue ("i", GL_OBJECT_COMPILE_STATUS_ARB));
+ 
+   if (PyErr_Occurred ())
+     PyErr_Print ();