diff options
| -rw-r--r-- | graphics/clutter/Makefile | 12 | ||||
| -rw-r--r-- | graphics/clutter/PLIST | 194 | ||||
| -rw-r--r-- | graphics/clutter/buildlink3.mk | 5 | ||||
| -rw-r--r-- | graphics/clutter/distinfo | 9 | ||||
| -rw-r--r-- | graphics/clutter/options.mk | 3 | ||||
| -rw-r--r-- | graphics/clutter/patches/patch-aa | 14 |
6 files changed, 148 insertions, 89 deletions
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 4fba9590bd5..79f02d3d140 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2009/09/30 09:22:47 sketch Exp $ +# $NetBSD: Makefile,v 1.6 2009/10/26 08:45:51 obache Exp $ # -DISTNAME= clutter-0.8.8 -PKGREVISION= 1 +DISTNAME= clutter-1.0.8 CATEGORIES= graphics -MASTER_SITES= http://www.clutter-project.org/sources/clutter/0.8/ +MASTER_SITES= http://www.clutter-project.org/sources/clutter/1.0/ MAINTAINER= obache@NetBSD.org HOMEPAGE= http://clutter-project.org/ @@ -31,9 +30,10 @@ TOOLS_NOOP+= gtkdoc-rebase TEST_TARGET= check -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.14.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_API_DEPENDS.pango+= pango>=1.18.0 +BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 .include "../../devel/pango/buildlink3.mk" +BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.7.4 .include "../../textproc/json-glib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/clutter/PLIST b/graphics/clutter/PLIST index 7e3218a8419..4948dbdd712 100644 --- a/graphics/clutter/PLIST +++ b/graphics/clutter/PLIST @@ -1,94 +1,117 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:08 joerg Exp $ -include/clutter-0.8/clutter/clutter-actor.h -include/clutter-0.8/clutter/clutter-alpha.h -include/clutter-0.8/clutter/clutter-backend.h -include/clutter-0.8/clutter/clutter-behaviour-bspline.h -include/clutter-0.8/clutter/clutter-behaviour-depth.h -include/clutter-0.8/clutter/clutter-behaviour-ellipse.h -include/clutter-0.8/clutter/clutter-behaviour-opacity.h -include/clutter-0.8/clutter/clutter-behaviour-path.h -include/clutter-0.8/clutter/clutter-behaviour-rotate.h -include/clutter-0.8/clutter/clutter-behaviour-scale.h -include/clutter-0.8/clutter/clutter-behaviour.h -include/clutter-0.8/clutter/clutter-child-meta.h -include/clutter-0.8/clutter/clutter-clone-texture.h -include/clutter-0.8/clutter/clutter-color.h -include/clutter-0.8/clutter/clutter-container.h -include/clutter-0.8/clutter/clutter-deprecated.h -include/clutter-0.8/clutter/clutter-effect.h -include/clutter-0.8/clutter/clutter-entry.h -include/clutter-0.8/clutter/clutter-enum-types.h -include/clutter-0.8/clutter/clutter-event.h -include/clutter-0.8/clutter/clutter-feature.h -include/clutter-0.8/clutter/clutter-fixed.h -include/clutter-0.8/clutter/clutter-frame-source.h -include/clutter-0.8/clutter/clutter-group.h -include/clutter-0.8/clutter/clutter-json.h -include/clutter-0.8/clutter/clutter-keysyms.h -include/clutter-0.8/clutter/clutter-label.h -include/clutter-0.8/clutter/clutter-list-model.h -include/clutter-0.8/clutter/clutter-main.h -include/clutter-0.8/clutter/clutter-media.h -include/clutter-0.8/clutter/clutter-model.h -${PLIST.osx}include/clutter-0.8/clutter/clutter-osx.h -include/clutter-0.8/clutter/clutter-rectangle.h -include/clutter-0.8/clutter/clutter-score.h -include/clutter-0.8/clutter/clutter-script.h -include/clutter-0.8/clutter/clutter-scriptable.h -include/clutter-0.8/clutter/clutter-shader.h -include/clutter-0.8/clutter/clutter-stage-manager.h -include/clutter-0.8/clutter/clutter-stage.h -include/clutter-0.8/clutter/clutter-texture.h -include/clutter-0.8/clutter/clutter-timeline.h -include/clutter-0.8/clutter/clutter-timeout-pool.h -include/clutter-0.8/clutter/clutter-types.h -include/clutter-0.8/clutter/clutter-units.h -include/clutter-0.8/clutter/clutter-util.h -include/clutter-0.8/clutter/clutter-version.h -include/clutter-0.8/clutter/clutter.h -${PLIST.x11}include/clutter-0.8/clutter/glx/clutter-glx-texture-pixmap.h -${PLIST.x11}include/clutter-0.8/clutter/glx/clutter-glx.h -include/clutter-0.8/clutter/pangoclutter.h -${PLIST.x11}include/clutter-0.8/clutter/x11/clutter-x11-enum-types.h -${PLIST.x11}include/clutter-0.8/clutter/x11/clutter-x11-texture-pixmap.h -${PLIST.x11}include/clutter-0.8/clutter/x11/clutter-x11.h -include/clutter-0.8/cogl/cogl-defines-gl.h -include/clutter-0.8/cogl/cogl.h -${PLIST.x11}lib/libclutter-glx-0.8.la -${PLIST.osx}lib/libclutter-osx-0.8.la -lib/pkgconfig/clutter-0.8.pc -${PLIST.x11}lib/pkgconfig/clutter-glx-0.8.pc -${PLIST.osx}lib/pkgconfig/clutter-osx-0.8.pc -${PLIST.x11}lib/pkgconfig/clutter-x11-0.8.pc +@comment $NetBSD: PLIST,v 1.3 2009/10/26 08:45:51 obache Exp $ +include/clutter-1.0/clutter/clutter-actor.h +include/clutter-1.0/clutter/clutter-alpha.h +include/clutter-1.0/clutter/clutter-animatable.h +include/clutter-1.0/clutter/clutter-animation.h +include/clutter-1.0/clutter/clutter-backend.h +include/clutter-1.0/clutter/clutter-behaviour-depth.h +include/clutter-1.0/clutter/clutter-behaviour-ellipse.h +include/clutter-1.0/clutter/clutter-behaviour-opacity.h +include/clutter-1.0/clutter/clutter-behaviour-path.h +include/clutter-1.0/clutter/clutter-behaviour-rotate.h +include/clutter-1.0/clutter/clutter-behaviour-scale.h +include/clutter-1.0/clutter/clutter-behaviour.h +include/clutter-1.0/clutter/clutter-binding-pool.h +include/clutter-1.0/clutter/clutter-cairo-texture.h +include/clutter-1.0/clutter/clutter-child-meta.h +include/clutter-1.0/clutter/clutter-clone.h +include/clutter-1.0/clutter/clutter-color.h +include/clutter-1.0/clutter/clutter-container.h +include/clutter-1.0/clutter/clutter-deprecated.h +include/clutter-1.0/clutter/clutter-enum-types.h +include/clutter-1.0/clutter/clutter-event.h +include/clutter-1.0/clutter/clutter-feature.h +include/clutter-1.0/clutter/clutter-fixed.h +include/clutter-1.0/clutter/clutter-frame-source.h +include/clutter-1.0/clutter/clutter-group.h +include/clutter-1.0/clutter/clutter-interval.h +include/clutter-1.0/clutter/clutter-json.h +include/clutter-1.0/clutter/clutter-keysyms.h +include/clutter-1.0/clutter/clutter-list-model.h +include/clutter-1.0/clutter/clutter-main.h +include/clutter-1.0/clutter/clutter-media.h +include/clutter-1.0/clutter/clutter-model.h +${PLIST.osx}include/clutter-1.0/clutter/clutter-osx.h +include/clutter-1.0/clutter/clutter-path.h +include/clutter-1.0/clutter/clutter-rectangle.h +include/clutter-1.0/clutter/clutter-score.h +include/clutter-1.0/clutter/clutter-script.h +include/clutter-1.0/clutter/clutter-scriptable.h +include/clutter-1.0/clutter/clutter-shader-types.h +include/clutter-1.0/clutter/clutter-shader.h +include/clutter-1.0/clutter/clutter-stage-manager.h +include/clutter-1.0/clutter/clutter-stage.h +include/clutter-1.0/clutter/clutter-text.h +include/clutter-1.0/clutter/clutter-texture.h +include/clutter-1.0/clutter/clutter-timeline.h +include/clutter-1.0/clutter/clutter-timeout-pool.h +include/clutter-1.0/clutter/clutter-types.h +include/clutter-1.0/clutter/clutter-units.h +include/clutter-1.0/clutter/clutter-util.h +include/clutter-1.0/clutter/clutter-version.h +include/clutter-1.0/clutter/clutter.h +${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h +${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx.h +${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11-enum-types.h +${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h +${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11.h +include/clutter-1.0/cogl/cogl-bitmap.h +include/clutter-1.0/cogl/cogl-color.h +include/clutter-1.0/cogl/cogl-debug.h +include/clutter-1.0/cogl/cogl-defines-gl.h +include/clutter-1.0/cogl/cogl-deprecated.h +include/clutter-1.0/cogl/cogl-enum-types.h +include/clutter-1.0/cogl/cogl-fixed.h +include/clutter-1.0/cogl/cogl-material.h +include/clutter-1.0/cogl/cogl-matrix.h +include/clutter-1.0/cogl/cogl-offscreen.h +include/clutter-1.0/cogl/cogl-pango.h +include/clutter-1.0/cogl/cogl-path.h +include/clutter-1.0/cogl/cogl-shader.h +include/clutter-1.0/cogl/cogl-texture.h +include/clutter-1.0/cogl/cogl-types.h +include/clutter-1.0/cogl/cogl-vertex-buffer.h +include/clutter-1.0/cogl/cogl.h +${PLIST.x11}lib/libclutter-glx-1.0.la +${PLIST.osx}lib/libclutter-osx-1.0.la +lib/pkgconfig/clutter-1.0.pc +${PLIST.x11}lib/pkgconfig/clutter-glx-1.0.pc +${PLIST.osx}lib/pkgconfig/clutter-osx-1.0.pc +${PLIST.x11}lib/pkgconfig/clutter-x11-1.0.pc +lib/pkgconfig/cogl-1.0.pc +lib/pkgconfig/cogl-gl-1.0.pc 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 @@ -99,21 +122,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 @@ -121,34 +147,52 @@ 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/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 diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk index 4de155e12fe..639832c9a56 100644 --- a/graphics/clutter/buildlink3.mk +++ b/graphics/clutter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:57:00 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/10/26 08:45:51 obache Exp $ # BUILDLINK_TREE+= clutter @@ -6,8 +6,7 @@ BUILDLINK_TREE+= clutter .if !defined(CLUTTER_BUILDLINK3_MK) CLUTTER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.clutter+= clutter>=0.8.0 -BUILDLINK_ABI_DEPENDS.clutter?= clutter>=0.8.8 +BUILDLINK_API_DEPENDS.clutter+= clutter>=1.0.0 BUILDLINK_PKGSRCDIR.clutter?= ../../graphics/clutter pkgbase := clutter diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo index aff36843375..79d636ae2f2 100644 --- a/graphics/clutter/distinfo +++ b/graphics/clutter/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2009/05/08 11:02:28 obache Exp $ +$NetBSD: distinfo,v 1.3 2009/10/26 08:45:51 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 (clutter-1.0.8.tar.gz) = 2dbf1adaca38a70e7b2b7da06263d502f96a9d62 +RMD160 (clutter-1.0.8.tar.gz) = b6b25d27b6e4199223dd26e9037e8f92e3b5acee +Size (clutter-1.0.8.tar.gz) = 2676163 bytes +SHA1 (patch-aa) = 4e5aff1ec5d7c6190bdd59c7eb18359954c26755 diff --git a/graphics/clutter/options.mk b/graphics/clutter/options.mk index 2bd90f98557..989cdce6c51 100644 --- a/graphics/clutter/options.mk +++ b/graphics/clutter/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2009/04/11 17:19:00 reed Exp $ +# $NetBSD: options.mk,v 1.3 2009/10/26 08:45:51 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.clutter @@ -14,6 +14,7 @@ PLIST.x11= yes CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-flavour=glx CONFIGURE_ARGS+= --with-imagebackend=gdk-pixbuf +CONFIGURE_ARGS+= --enable-xinput BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.0 .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/graphics/clutter/patches/patch-aa b/graphics/clutter/patches/patch-aa new file mode 100644 index 00000000000..ecb58d34807 --- /dev/null +++ b/graphics/clutter/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1 2009/10/26 08:45:52 obache Exp $ + +--- clutter/clutter-json.h.in.orig 2009-10-19 14:32:54.000000000 +0000 ++++ clutter/clutter-json.h.in +@@ -6,8 +6,6 @@ + * without changing the other headers. + */ + +-#include "@JSON_PREFIX@/json-types.h" +-#include "@JSON_PREFIX@/json-parser.h" +-#include "@JSON_PREFIX@/json-generator.h" ++#include "@JSON_PREFIX@/json-glib.h" + + #endif /* __CLUTTER_JSON_H__ */ |