Update to clutter 1.0.6:

disable gobject-introspection by default.
fix for newer json-glib proper inclusion while here.
ok jasper@
This commit is contained in:
landry 2009-10-10 23:19:25 +00:00
parent 18e425c678
commit 6707f5fad4
6 changed files with 156 additions and 100 deletions

View File

@ -1,25 +1,25 @@
# $OpenBSD: Makefile,v 1.3 2009/08/10 06:31:44 kili Exp $
# $OpenBSD: Makefile,v 1.4 2009/10/10 23:19:25 landry Exp $
COMMENT= OpenGL-based interactive canvas library
DISTNAME= clutter-${MAJOR}.8
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += clutter-glx-0.8 0.0 # .808.0
DISTNAME= clutter-1.0.6
SHARED_LIBS += clutter-glx-1.0 0.0 # .0.6
MASTER_SITES= ${MASTER_SITES_CLUTTER:=clutter/${MAJOR}/}
MASTER_SITES= ${MASTER_SITES_CLUTTER:=clutter/1.0/}
MODULES= devel/gettext
WANTLIB += GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xi
WANTLIB += GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes
WANTLIB += Xrender cairo expat fontconfig freetype gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
WANTLIB += pthread-stubs xcb z
WANTLIB += pthread-stubs xcb z Xxf86vm drm
LIB_DEPENDS+= json-glib-1.0::devel/json-glib \
gdk_pixbuf-2.0::x11/gtk+2
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-introspection=no \
--with-json=check \
--enable-manual=no \
--with-imagebackend=gdk-pixbuf \

View File

@ -1,5 +1,5 @@
MD5 (clutter/clutter-0.8.8.tar.gz) = SnfSnMlYRXfJxzLzuMMFQw==
RMD160 (clutter/clutter-0.8.8.tar.gz) = QAyXYXzSaunjOM7d3Oi2e8P+QpM=
SHA1 (clutter/clutter-0.8.8.tar.gz) = Vg4Se5lJQTHsO5AfU72T1oCdeeo=
SHA256 (clutter/clutter-0.8.8.tar.gz) = 8anP9+Dd1g+NU7idC0S5B3gzX2mvU4Y5B+PbJSD+UIM=
SIZE (clutter/clutter-0.8.8.tar.gz) = 2153665
MD5 (clutter/clutter-1.0.6.tar.gz) = hdre3NLHe234Ua5TpTz3kw==
RMD160 (clutter/clutter-1.0.6.tar.gz) = TdfaQvVNeYGZLFkNfG6hZOxvQsQ=
SHA1 (clutter/clutter-1.0.6.tar.gz) = pNVXvbQ36PmwRBMvdUf/Lwb3BL8=
SHA256 (clutter/clutter-1.0.6.tar.gz) = X/ql+ijwptGTADBvoIc0zBP8LcQpOwAUCRwxEB5KkGE=
SIZE (clutter/clutter-1.0.6.tar.gz) = 2643455

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-clutter_clutter-scriptable_h,v 1.1 2009/10/10 23:19:25 landry Exp $
--- clutter/clutter-scriptable.h.orig Sat Sep 19 11:46:56 2009
+++ clutter/clutter-scriptable.h Sat Sep 19 11:48:09 2009
@@ -31,7 +31,7 @@
#include <glib-object.h>
#include <clutter/clutter-script.h>
-#include <clutter/clutter-json.h>
+#include <json-glib/json-glib.h>
G_BEGIN_DECLS

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-clutter_pc_in,v 1.1.1.1 2009/02/15 17:41:13 jasper Exp $
$OpenBSD: patch-clutter_pc_in,v 1.2 2009/10/10 23:19:25 landry Exp $
For some reason using ${requires} doesn't work as expected.
--- clutter.pc.in.orig Fri Feb 13 11:24:08 2009
+++ clutter.pc.in Fri Feb 13 11:24:21 2009
@@ -4,7 +4,6 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include
--- clutter.pc.in.orig Mon Aug 24 15:59:27 2009
+++ clutter.pc.in Sat Sep 19 11:41:30 2009
@@ -4,7 +4,6 @@ libdir=@libdir@
includedir=@includedir@
backend=@clutterbackend@
apiversion=@CLUTTER_API_VERSION@
-requires=@CLUTTER_REQUIRES@

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-clutter_x11_clutter-x11_pc_in,v 1.1.1.1 2009/02/15 17:41:13 jasper Exp $
$OpenBSD: patch-clutter_x11_clutter-x11_pc_in,v 1.2 2009/10/10 23:19:25 landry Exp $
For some reason using ${requires} doesn't work as expected.
--- clutter/x11/clutter-x11.pc.in.orig Fri Feb 13 11:24:42 2009
+++ clutter/x11/clutter-x11.pc.in Fri Feb 13 11:24:53 2009
@@ -4,11 +4,10 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include
--- clutter/x11/clutter-x11.pc.in.orig Sat Jul 4 20:48:24 2009
+++ clutter/x11/clutter-x11.pc.in Sat Sep 19 11:41:30 2009
@@ -4,11 +4,10 @@ libdir=@libdir@
includedir=@includedir@
backend=@clutterbackend@
apiversion=@CLUTTER_API_VERSION@
-requires=@CLUTTER_REQUIRES@

View File

@ -1,98 +1,121 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/02/15 17:41:13 jasper Exp $
include/clutter-${MAJOR}/
include/clutter-${MAJOR}/clutter/
include/clutter-${MAJOR}/clutter/clutter-actor.h
include/clutter-${MAJOR}/clutter/clutter-alpha.h
include/clutter-${MAJOR}/clutter/clutter-backend.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-bspline.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-depth.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-ellipse.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-opacity.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-path.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-rotate.h
include/clutter-${MAJOR}/clutter/clutter-behaviour-scale.h
include/clutter-${MAJOR}/clutter/clutter-behaviour.h
include/clutter-${MAJOR}/clutter/clutter-child-meta.h
include/clutter-${MAJOR}/clutter/clutter-clone-texture.h
include/clutter-${MAJOR}/clutter/clutter-color.h
include/clutter-${MAJOR}/clutter/clutter-container.h
include/clutter-${MAJOR}/clutter/clutter-deprecated.h
include/clutter-${MAJOR}/clutter/clutter-effect.h
include/clutter-${MAJOR}/clutter/clutter-entry.h
include/clutter-${MAJOR}/clutter/clutter-enum-types.h
include/clutter-${MAJOR}/clutter/clutter-event.h
include/clutter-${MAJOR}/clutter/clutter-feature.h
include/clutter-${MAJOR}/clutter/clutter-fixed.h
include/clutter-${MAJOR}/clutter/clutter-frame-source.h
include/clutter-${MAJOR}/clutter/clutter-group.h
include/clutter-${MAJOR}/clutter/clutter-json.h
include/clutter-${MAJOR}/clutter/clutter-keysyms.h
include/clutter-${MAJOR}/clutter/clutter-label.h
include/clutter-${MAJOR}/clutter/clutter-list-model.h
include/clutter-${MAJOR}/clutter/clutter-main.h
include/clutter-${MAJOR}/clutter/clutter-media.h
include/clutter-${MAJOR}/clutter/clutter-model.h
include/clutter-${MAJOR}/clutter/clutter-rectangle.h
include/clutter-${MAJOR}/clutter/clutter-score.h
include/clutter-${MAJOR}/clutter/clutter-script.h
include/clutter-${MAJOR}/clutter/clutter-scriptable.h
include/clutter-${MAJOR}/clutter/clutter-shader.h
include/clutter-${MAJOR}/clutter/clutter-stage-manager.h
include/clutter-${MAJOR}/clutter/clutter-stage.h
include/clutter-${MAJOR}/clutter/clutter-texture.h
include/clutter-${MAJOR}/clutter/clutter-timeline.h
include/clutter-${MAJOR}/clutter/clutter-timeout-pool.h
include/clutter-${MAJOR}/clutter/clutter-types.h
include/clutter-${MAJOR}/clutter/clutter-units.h
include/clutter-${MAJOR}/clutter/clutter-util.h
include/clutter-${MAJOR}/clutter/clutter-version.h
include/clutter-${MAJOR}/clutter/clutter.h
include/clutter-${MAJOR}/clutter/glx/
include/clutter-${MAJOR}/clutter/glx/clutter-glx-texture-pixmap.h
include/clutter-${MAJOR}/clutter/glx/clutter-glx.h
include/clutter-${MAJOR}/clutter/pangoclutter.h
include/clutter-${MAJOR}/clutter/x11/
include/clutter-${MAJOR}/clutter/x11/clutter-x11-enum-types.h
include/clutter-${MAJOR}/clutter/x11/clutter-x11-texture-pixmap.h
include/clutter-${MAJOR}/clutter/x11/clutter-x11.h
include/clutter-${MAJOR}/cogl/
include/clutter-${MAJOR}/cogl/cogl-defines-gl.h
include/clutter-${MAJOR}/cogl/cogl.h
lib/libclutter-glx-${MAJOR}.la
@lib lib/libclutter-glx-${MAJOR}.so.${LIBclutter-glx-0.8_VERSION}
lib/pkgconfig/clutter-${MAJOR}.pc
lib/pkgconfig/clutter-glx-${MAJOR}.pc
lib/pkgconfig/clutter-x11-${MAJOR}.pc
@comment $OpenBSD: PLIST,v 1.2 2009/10/10 23:19:25 landry Exp $
include/clutter-${API_VERSION}/
include/clutter-${API_VERSION}/clutter/
include/clutter-${API_VERSION}/clutter/clutter-actor.h
include/clutter-${API_VERSION}/clutter/clutter-alpha.h
include/clutter-${API_VERSION}/clutter/clutter-animatable.h
include/clutter-${API_VERSION}/clutter/clutter-animation.h
include/clutter-${API_VERSION}/clutter/clutter-backend.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour-depth.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour-ellipse.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour-opacity.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour-path.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour-rotate.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour-scale.h
include/clutter-${API_VERSION}/clutter/clutter-behaviour.h
include/clutter-${API_VERSION}/clutter/clutter-binding-pool.h
include/clutter-${API_VERSION}/clutter/clutter-cairo-texture.h
include/clutter-${API_VERSION}/clutter/clutter-child-meta.h
include/clutter-${API_VERSION}/clutter/clutter-clone.h
include/clutter-${API_VERSION}/clutter/clutter-color.h
include/clutter-${API_VERSION}/clutter/clutter-container.h
include/clutter-${API_VERSION}/clutter/clutter-deprecated.h
include/clutter-${API_VERSION}/clutter/clutter-enum-types.h
include/clutter-${API_VERSION}/clutter/clutter-event.h
include/clutter-${API_VERSION}/clutter/clutter-feature.h
include/clutter-${API_VERSION}/clutter/clutter-fixed.h
include/clutter-${API_VERSION}/clutter/clutter-frame-source.h
include/clutter-${API_VERSION}/clutter/clutter-group.h
include/clutter-${API_VERSION}/clutter/clutter-interval.h
include/clutter-${API_VERSION}/clutter/clutter-json.h
include/clutter-${API_VERSION}/clutter/clutter-keysyms.h
include/clutter-${API_VERSION}/clutter/clutter-list-model.h
include/clutter-${API_VERSION}/clutter/clutter-main.h
include/clutter-${API_VERSION}/clutter/clutter-media.h
include/clutter-${API_VERSION}/clutter/clutter-model.h
include/clutter-${API_VERSION}/clutter/clutter-path.h
include/clutter-${API_VERSION}/clutter/clutter-rectangle.h
include/clutter-${API_VERSION}/clutter/clutter-score.h
include/clutter-${API_VERSION}/clutter/clutter-script.h
include/clutter-${API_VERSION}/clutter/clutter-scriptable.h
include/clutter-${API_VERSION}/clutter/clutter-shader-types.h
include/clutter-${API_VERSION}/clutter/clutter-shader.h
include/clutter-${API_VERSION}/clutter/clutter-stage-manager.h
include/clutter-${API_VERSION}/clutter/clutter-stage.h
include/clutter-${API_VERSION}/clutter/clutter-text.h
include/clutter-${API_VERSION}/clutter/clutter-texture.h
include/clutter-${API_VERSION}/clutter/clutter-timeline.h
include/clutter-${API_VERSION}/clutter/clutter-timeout-pool.h
include/clutter-${API_VERSION}/clutter/clutter-types.h
include/clutter-${API_VERSION}/clutter/clutter-units.h
include/clutter-${API_VERSION}/clutter/clutter-util.h
include/clutter-${API_VERSION}/clutter/clutter-version.h
include/clutter-${API_VERSION}/clutter/clutter.h
include/clutter-${API_VERSION}/clutter/glx/
include/clutter-${API_VERSION}/clutter/glx/clutter-glx-texture-pixmap.h
include/clutter-${API_VERSION}/clutter/glx/clutter-glx.h
include/clutter-${API_VERSION}/clutter/x11/
include/clutter-${API_VERSION}/clutter/x11/clutter-x11-enum-types.h
include/clutter-${API_VERSION}/clutter/x11/clutter-x11-texture-pixmap.h
include/clutter-${API_VERSION}/clutter/x11/clutter-x11.h
include/clutter-${API_VERSION}/cogl/
include/clutter-${API_VERSION}/cogl/cogl-bitmap.h
include/clutter-${API_VERSION}/cogl/cogl-color.h
include/clutter-${API_VERSION}/cogl/cogl-debug.h
include/clutter-${API_VERSION}/cogl/cogl-defines-gl.h
include/clutter-${API_VERSION}/cogl/cogl-deprecated.h
include/clutter-${API_VERSION}/cogl/cogl-enum-types.h
include/clutter-${API_VERSION}/cogl/cogl-fixed.h
include/clutter-${API_VERSION}/cogl/cogl-material.h
include/clutter-${API_VERSION}/cogl/cogl-matrix.h
include/clutter-${API_VERSION}/cogl/cogl-offscreen.h
include/clutter-${API_VERSION}/cogl/cogl-pango.h
include/clutter-${API_VERSION}/cogl/cogl-path.h
include/clutter-${API_VERSION}/cogl/cogl-shader.h
include/clutter-${API_VERSION}/cogl/cogl-texture.h
include/clutter-${API_VERSION}/cogl/cogl-types.h
include/clutter-${API_VERSION}/cogl/cogl-vertex-buffer.h
include/clutter-${API_VERSION}/cogl/cogl.h
lib/libclutter-glx-${API_VERSION}.la
@lib lib/libclutter-glx-${API_VERSION}.so.${LIBclutter-glx-1.0_VERSION}
lib/pkgconfig/clutter-${API_VERSION}.pc
lib/pkgconfig/clutter-glx-${API_VERSION}.pc
lib/pkgconfig/clutter-x11-${API_VERSION}.pc
lib/pkgconfig/cogl-${API_VERSION}.pc
lib/pkgconfig/cogl-gl-${API_VERSION}.pc
share/gtk-doc/html/clutter/
share/gtk-doc/html/clutter/ClutterActor.html
share/gtk-doc/html/clutter/ClutterAlpha.html
share/gtk-doc/html/clutter/ClutterAnimatable.html
share/gtk-doc/html/clutter/ClutterBehaviour.html
share/gtk-doc/html/clutter/ClutterBehaviourBspline.html
share/gtk-doc/html/clutter/ClutterBehaviourDepth.html
share/gtk-doc/html/clutter/ClutterBehaviourEllipse.html
share/gtk-doc/html/clutter/ClutterBehaviourOpacity.html
share/gtk-doc/html/clutter/ClutterBehaviourPath.html
share/gtk-doc/html/clutter/ClutterBehaviourRotate.html
share/gtk-doc/html/clutter/ClutterBehaviourScale.html
share/gtk-doc/html/clutter/ClutterCairoTexture.html
share/gtk-doc/html/clutter/ClutterChildMeta.html
share/gtk-doc/html/clutter/ClutterCloneTexture.html
share/gtk-doc/html/clutter/ClutterClone.html
share/gtk-doc/html/clutter/ClutterContainer.html
share/gtk-doc/html/clutter/ClutterEntry.html
share/gtk-doc/html/clutter/ClutterGroup.html
share/gtk-doc/html/clutter/ClutterLabel.html
share/gtk-doc/html/clutter/ClutterListModel.html
share/gtk-doc/html/clutter/ClutterMedia.html
share/gtk-doc/html/clutter/ClutterModel.html
share/gtk-doc/html/clutter/ClutterModelIter.html
share/gtk-doc/html/clutter/ClutterPath.html
share/gtk-doc/html/clutter/ClutterRectangle.html
share/gtk-doc/html/clutter/ClutterScore.html
share/gtk-doc/html/clutter/ClutterScript.html
share/gtk-doc/html/clutter/ClutterScriptable.html
share/gtk-doc/html/clutter/ClutterShader.html
share/gtk-doc/html/clutter/ClutterStage.html
share/gtk-doc/html/clutter/ClutterText.html
share/gtk-doc/html/clutter/ClutterTexture.html
share/gtk-doc/html/clutter/ClutterTimeline.html
share/gtk-doc/html/clutter/actor-box.png
share/gtk-doc/html/clutter/alpha-func.png
share/gtk-doc/html/clutter/additionaldocs.html
share/gtk-doc/html/clutter/annotation-glossary.html
share/gtk-doc/html/clutter/building-clutter.html
share/gtk-doc/html/clutter/ch01.html
share/gtk-doc/html/clutter/ch02.html
@ -103,21 +126,24 @@ share/gtk-doc/html/clutter/ch06.html
share/gtk-doc/html/clutter/ch07.html
share/gtk-doc/html/clutter/ch08.html
share/gtk-doc/html/clutter/ch09.html
share/gtk-doc/html/clutter/clutter-Clutter-Effects.html
share/gtk-doc/html/clutter/clutter-ClutterBackend.html
share/gtk-doc/html/clutter/clutter-ClutterScriptable.html
share/gtk-doc/html/clutter/clutter-Colors.html
share/gtk-doc/html/clutter/clutter-EGL-Specific-Support.html
share/gtk-doc/html/clutter/clutter-EGLX-Specific-Support.html
share/gtk-doc/html/clutter/clutter-Events.html
share/gtk-doc/html/clutter/clutter-Fixed-Point-Support.html
share/gtk-doc/html/clutter/clutter-GLX-Specific-Support.html
share/gtk-doc/html/clutter/clutter-General.html
share/gtk-doc/html/clutter/clutter-Implicit-Animations.html
share/gtk-doc/html/clutter/clutter-Key-Bindings.html
share/gtk-doc/html/clutter/clutter-Unit-conversion.html
share/gtk-doc/html/clutter/clutter-Utilities.html
share/gtk-doc/html/clutter/clutter-Value-intervals.html
share/gtk-doc/html/clutter/clutter-Versioning-Macros.html
share/gtk-doc/html/clutter/clutter-Win32-Specific-Support.html
share/gtk-doc/html/clutter/clutter-X11-Specific-Support.html
share/gtk-doc/html/clutter/clutter-animation-behaviours.html
share/gtk-doc/html/clutter/clutter-animation-conclusion.html
share/gtk-doc/html/clutter/clutter-animation-effects.html
share/gtk-doc/html/clutter/clutter-animation-implicit.html
share/gtk-doc/html/clutter/clutter-animation-timelines.html
share/gtk-doc/html/clutter/clutter-animations.html
share/gtk-doc/html/clutter/clutter-overview.html
@ -125,35 +151,53 @@ share/gtk-doc/html/clutter/clutter-subclassing-ClutterActor.html
share/gtk-doc/html/clutter/clutter.devhelp
share/gtk-doc/html/clutter/clutter.devhelp2
share/gtk-doc/html/clutter/clutteranimation.html
share/gtk-doc/html/clutter/clutterbackends.html
share/gtk-doc/html/clutter/clutterbase.html
share/gtk-doc/html/clutter/clutterglossary.html
share/gtk-doc/html/clutter/clutterobjecthierarchy.html
share/gtk-doc/html/clutter/clutterobjectindex.html
share/gtk-doc/html/clutter/clutterobjects.html
share/gtk-doc/html/clutter/cluttertools.html
share/gtk-doc/html/clutter/creating-your-own-behaviours.html
share/gtk-doc/html/clutter/easing-modes.png
share/gtk-doc/html/clutter/event-flow.png
share/gtk-doc/html/clutter/go01.html
share/gtk-doc/html/clutter/home.png
share/gtk-doc/html/clutter/index.html
share/gtk-doc/html/clutter/index.sgml
share/gtk-doc/html/clutter/iterating-paths.html
share/gtk-doc/html/clutter/ix01.html
share/gtk-doc/html/clutter/ix02.html
share/gtk-doc/html/clutter/ix03.html
share/gtk-doc/html/clutter/ix04.html
share/gtk-doc/html/clutter/ix05.html
share/gtk-doc/html/clutter/ix06.html
share/gtk-doc/html/clutter/ix07.html
share/gtk-doc/html/clutter/left.png
share/gtk-doc/html/clutter/license.html
share/gtk-doc/html/clutter/migrating-ClutterEffect.html
share/gtk-doc/html/clutter/migrating-ClutterPath.html
share/gtk-doc/html/clutter/migration.html
share/gtk-doc/html/clutter/path-alpha-func.png
share/gtk-doc/html/clutter/pt05.html
share/gtk-doc/html/clutter/pt06.html
share/gtk-doc/html/clutter/pt07.html
share/gtk-doc/html/clutter/pt10.html
share/gtk-doc/html/clutter/right.png
share/gtk-doc/html/clutter/running-clutter.html
share/gtk-doc/html/clutter/style.css
share/gtk-doc/html/clutter/up.png
share/gtk-doc/html/clutter/using-cairo.html
share/gtk-doc/html/cogl/
share/gtk-doc/html/cogl/ch01.html
share/gtk-doc/html/cogl/cogl-Blend-Strings.html
share/gtk-doc/html/cogl/cogl-Color-Type.html
share/gtk-doc/html/cogl/cogl-Fixed-Point-API.html
share/gtk-doc/html/cogl/cogl-General-API.html
share/gtk-doc/html/cogl/cogl-Materials.html
share/gtk-doc/html/cogl/cogl-Matrices.html
share/gtk-doc/html/cogl/cogl-Offscreen-Buffers.html
share/gtk-doc/html/cogl/cogl-Primitives.html
share/gtk-doc/html/cogl/cogl-Shaders-and-Programmable-Pipeline.html
share/gtk-doc/html/cogl/cogl-Textures.html
share/gtk-doc/html/cogl/cogl-Utility-API.html
share/gtk-doc/html/cogl/cogl-Vertex-Buffers.html
share/gtk-doc/html/cogl/cogl.devhelp
share/gtk-doc/html/cogl/cogl.devhelp2
share/gtk-doc/html/cogl/home.png