From 4767af3f13ed070ba38b0c3f9b6607efbf52f686 Mon Sep 17 00:00:00 2001 From: landry Date: Sat, 10 Oct 2009 23:22:53 +0000 Subject: [PATCH] Update to clutter-box2d 0.10.0: add a patch to make sure it doesn't try to build gobject-introspection by default (so-called .gir files which turned me mad the whole day) ok jasper@ --- graphics/clutter/clutter-box2d/Makefile | 14 ++++++------ graphics/clutter/clutter-box2d/distinfo | 10 ++++----- .../patches/patch-clutter-box2d_Makefile_in | 22 +++++++++++++++++++ graphics/clutter/clutter-box2d/pkg/PLIST | 18 +++++++-------- 4 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 graphics/clutter/clutter-box2d/patches/patch-clutter-box2d_Makefile_in diff --git a/graphics/clutter/clutter-box2d/Makefile b/graphics/clutter/clutter-box2d/Makefile index 6234b58ca4d..adc2fc272fe 100644 --- a/graphics/clutter/clutter-box2d/Makefile +++ b/graphics/clutter/clutter-box2d/Makefile @@ -1,23 +1,23 @@ -# $OpenBSD: Makefile,v 1.2 2009/08/10 06:31:44 kili Exp $ +# $OpenBSD: Makefile,v 1.3 2009/10/10 23:22:53 landry Exp $ COMMENT= clutter Box2D integration library -DISTNAME= clutter-box2d-${MAJOR}.2 -PKGNAME= ${DISTNAME}p0 -SHARED_LIBS += clutter-box2d-0.8 0.0 # .802.0 +DISTNAME= clutter-box2d-${MAJOR}.0 +SHARED_LIBS += clutter-box2d-0.10 0.0 # .1000.0 MASTER_SITES= ${MASTER_SITES_CLUTTER:=clutter-box2d/${MAJOR}/} MODULES= devel/gettext -WANTLIB += GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xi +WANTLIB += GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xxf86vm drm WANTLIB += Xrender cairo expat fontconfig freetype gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += json-glib-1.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread-stubs xcb z -LIB_DEPENDS= clutter-glx-0.8::graphics/clutter/core +LIB_DEPENDS= clutter-glx-1.0::graphics/clutter/core -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --enable-introspection=no .include diff --git a/graphics/clutter/clutter-box2d/distinfo b/graphics/clutter/clutter-box2d/distinfo index 74b63a01aab..60174e3723f 100644 --- a/graphics/clutter/clutter-box2d/distinfo +++ b/graphics/clutter/clutter-box2d/distinfo @@ -1,5 +1,5 @@ -MD5 (clutter/clutter-box2d-0.8.2.tar.gz) = OTpCuV8u3o4XNhrNvd3h9g== -RMD160 (clutter/clutter-box2d-0.8.2.tar.gz) = JC981ZqJaMYKJ6Jbizwl0s2c3X8= -SHA1 (clutter/clutter-box2d-0.8.2.tar.gz) = Sr8oINkVaqImM1fapkamEByhhno= -SHA256 (clutter/clutter-box2d-0.8.2.tar.gz) = Z2uqrmxN5/eeUaIWfvVXETbHCf5P9SvZGcE+K5PoCpE= -SIZE (clutter/clutter-box2d-0.8.2.tar.gz) = 491985 +MD5 (clutter/clutter-box2d-0.10.0.tar.gz) = KTkSRzzF/LnwrYstob4beQ== +RMD160 (clutter/clutter-box2d-0.10.0.tar.gz) = pDtDeCRr1Dy4q4w0IYUim/X1hOU= +SHA1 (clutter/clutter-box2d-0.10.0.tar.gz) = KEyNIPbQS731RZmvekJUf+Ivrgg= +SHA256 (clutter/clutter-box2d-0.10.0.tar.gz) = IdOpt0+fxEF5FLWk1h9QP3fMcy8e9WVYazWN0nXjzFs= +SIZE (clutter/clutter-box2d-0.10.0.tar.gz) = 491980 diff --git a/graphics/clutter/clutter-box2d/patches/patch-clutter-box2d_Makefile_in b/graphics/clutter/clutter-box2d/patches/patch-clutter-box2d_Makefile_in new file mode 100644 index 00000000000..7391c724ad8 --- /dev/null +++ b/graphics/clutter/clutter-box2d/patches/patch-clutter-box2d_Makefile_in @@ -0,0 +1,22 @@ +$OpenBSD: patch-clutter-box2d_Makefile_in,v 1.1 2009/10/10 23:22:54 landry Exp $ +--- clutter-box2d/Makefile.in.orig Sat Oct 10 16:34:57 2009 ++++ clutter-box2d/Makefile.in Sat Oct 10 16:35:23 2009 +@@ -269,7 +269,7 @@ DISTCLEANFILES = $(MARSHALFILES) + EXTRA_DIST = \ + clutter-box2d-marshal.list + +-BUILT_GIRSOURCES = ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir ++BUILT_GIRSOURCES = + + # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to + # install anything - we need to install inside our prefix. +@@ -585,8 +585,7 @@ info: info-am + + info-am: + +-install-data-am: install-clutter_box2dheadersHEADERS install-girDATA \ +- install-typelibsDATA ++install-data-am: install-clutter_box2dheadersHEADERS + + install-dvi: install-dvi-am + diff --git a/graphics/clutter/clutter-box2d/pkg/PLIST b/graphics/clutter/clutter-box2d/pkg/PLIST index c0333d0e324..994efdf7006 100644 --- a/graphics/clutter/clutter-box2d/pkg/PLIST +++ b/graphics/clutter/clutter-box2d/pkg/PLIST @@ -1,13 +1,13 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/02/15 17:43:23 jasper Exp $ -include/clutter-${MAJOR}/clutter-box2d/ -include/clutter-${MAJOR}/clutter-box2d/clutter-box2d-collision.h -include/clutter-${MAJOR}/clutter-box2d/clutter-box2d-contact.h -include/clutter-${MAJOR}/clutter-box2d/clutter-box2d-joint.h -include/clutter-${MAJOR}/clutter-box2d/clutter-box2d-marshal.h -include/clutter-${MAJOR}/clutter-box2d/clutter-box2d-util.h -include/clutter-${MAJOR}/clutter-box2d/clutter-box2d.h +@comment $OpenBSD: PLIST,v 1.2 2009/10/10 23:22:54 landry Exp $ +include/clutter-${API_VERSION}/clutter-box2d/ +include/clutter-${API_VERSION}/clutter-box2d/clutter-box2d-collision.h +include/clutter-${API_VERSION}/clutter-box2d/clutter-box2d-contact.h +include/clutter-${API_VERSION}/clutter-box2d/clutter-box2d-joint.h +include/clutter-${API_VERSION}/clutter-box2d/clutter-box2d-marshal.h +include/clutter-${API_VERSION}/clutter-box2d/clutter-box2d-util.h +include/clutter-${API_VERSION}/clutter-box2d/clutter-box2d.h lib/libclutter-box2d-${MAJOR}.la -@lib lib/libclutter-box2d-${MAJOR}.so.${LIBclutter-box2d-0.8_VERSION} +@lib lib/libclutter-box2d-${MAJOR}.so.${LIBclutter-box2d-0.10_VERSION} lib/pkgconfig/clutter-box2d-${MAJOR}.pc share/gtk-doc/html/clutter-box2d/ share/gtk-doc/html/clutter-box2d/ClutterBox2D.html