summaryrefslogtreecommitdiff
path: root/graphics/clutter
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/clutter')
-rw-r--r--graphics/clutter/Makefile16
-rw-r--r--graphics/clutter/PLIST46
-rw-r--r--graphics/clutter/distinfo9
-rw-r--r--graphics/clutter/patches/patch-aa14
4 files changed, 54 insertions, 31 deletions
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index d554c057fb6..f27262c1e5a 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/01/20 04:54:51 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/03/04 08:13:15 obache Exp $
#
-DISTNAME= clutter-1.0.10
+DISTNAME= clutter-1.2.0
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/clutter/1.0/ \
- ${MASTER_SITE_GNOME:=sources/clutter/1.0/}
+MASTER_SITES= http://www.clutter-project.org/sources/clutter/1.2/ \
+ ${MASTER_SITE_GNOME:=clutter/1.2/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://clutter-project.org/
@@ -23,10 +23,6 @@ PKGCONFIG_OVERRIDE+= clutter/x11/clutter-x11.pc.in
PKGCONFIG_OVERRIDE+= clutter/win32/clutter-win32.pc.in
PKGCONFIG_OVERRIDE+= clutter.pc.in
-# Workaround for Upstream Bug#562310.
-# for more detail, see also PR#41475.
-TOOLS_NOOP+= gtkdoc-rebase
-
.include "options.mk"
TEST_TARGET= check
@@ -35,6 +31,8 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0
.include "../../devel/pango/buildlink3.mk"
-BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.7.4
+BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0
+.include "../../graphics/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.8.0
.include "../../textproc/json-glib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clutter/PLIST b/graphics/clutter/PLIST
index 4948dbdd712..62c0ada6e9b 100644
--- a/graphics/clutter/PLIST
+++ b/graphics/clutter/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/26 08:45:51 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/03/04 08:13:15 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-animator.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
@@ -11,22 +12,31 @@ 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-bin-layout.h
include/clutter-1.0/clutter/clutter-binding-pool.h
+include/clutter-1.0/clutter/clutter-box-layout.h
+include/clutter-1.0/clutter/clutter-box.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-device-manager.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-layout.h
include/clutter-1.0/clutter/clutter-fixed.h
+include/clutter-1.0/clutter/clutter-flow-layout.h
include/clutter-1.0/clutter/clutter-frame-source.h
include/clutter-1.0/clutter/clutter-group.h
+include/clutter-1.0/clutter/clutter-input-device.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-layout-manager.h
+include/clutter-1.0/clutter/clutter-layout-meta.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
@@ -40,6 +50,7 @@ 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-window.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
@@ -56,9 +67,10 @@ ${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-buffer.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-defines.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
@@ -67,6 +79,8 @@ 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-pixel-buffer.h
+include/clutter-1.0/cogl/cogl-primitives.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
@@ -83,6 +97,7 @@ 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/ClutterAnimator.html
share/gtk-doc/html/clutter/ClutterBehaviour.html
share/gtk-doc/html/clutter/ClutterBehaviourDepth.html
share/gtk-doc/html/clutter/ClutterBehaviourEllipse.html
@@ -90,11 +105,20 @@ 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/ClutterBinLayout.html
+share/gtk-doc/html/clutter/ClutterBox.html
+share/gtk-doc/html/clutter/ClutterBoxLayout.html
share/gtk-doc/html/clutter/ClutterCairoTexture.html
share/gtk-doc/html/clutter/ClutterChildMeta.html
share/gtk-doc/html/clutter/ClutterClone.html
share/gtk-doc/html/clutter/ClutterContainer.html
+share/gtk-doc/html/clutter/ClutterDeviceManager.html
+share/gtk-doc/html/clutter/ClutterFixedLayout.html
+share/gtk-doc/html/clutter/ClutterFlowLayout.html
share/gtk-doc/html/clutter/ClutterGroup.html
+share/gtk-doc/html/clutter/ClutterInputDevice.html
+share/gtk-doc/html/clutter/ClutterLayoutManager.html
+share/gtk-doc/html/clutter/ClutterLayoutMeta.html
share/gtk-doc/html/clutter/ClutterListModel.html
share/gtk-doc/html/clutter/ClutterMedia.html
share/gtk-doc/html/clutter/ClutterModel.html
@@ -104,14 +128,16 @@ 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/additionaldocs.html
+share/gtk-doc/html/clutter/animator-key-frames.png
share/gtk-doc/html/clutter/annotation-glossary.html
+share/gtk-doc/html/clutter/bin-layout.png
+share/gtk-doc/html/clutter/box-layout.png
share/gtk-doc/html/clutter/building-clutter.html
share/gtk-doc/html/clutter/ch01.html
share/gtk-doc/html/clutter/ch02.html
@@ -122,15 +148,19 @@ 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/ch10.html
share/gtk-doc/html/clutter/clutter-ClutterBackend.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-Features.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-Shaders.html
+share/gtk-doc/html/clutter/clutter-Stage-Manager.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
@@ -157,6 +187,8 @@ 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/flow-layout-horizontal.png
+share/gtk-doc/html/clutter/flow-layout-vertical.png
share/gtk-doc/html/clutter/go01.html
share/gtk-doc/html/clutter/home.png
share/gtk-doc/html/clutter/index.html
@@ -169,6 +201,7 @@ 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/ix08.html
share/gtk-doc/html/clutter/left.png
share/gtk-doc/html/clutter/license.html
share/gtk-doc/html/clutter/migrating-ClutterEffect.html
@@ -182,7 +215,10 @@ 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/ch02.html
share/gtk-doc/html/cogl/cogl-Blend-Strings.html
+share/gtk-doc/html/cogl/cogl-Buffers.html
+share/gtk-doc/html/cogl/cogl-Clipping.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
@@ -199,6 +235,10 @@ share/gtk-doc/html/cogl/home.png
share/gtk-doc/html/cogl/index.html
share/gtk-doc/html/cogl/index.sgml
share/gtk-doc/html/cogl/ix01.html
+share/gtk-doc/html/cogl/ix02.html
+share/gtk-doc/html/cogl/ix03.html
+share/gtk-doc/html/cogl/ix04.html
+share/gtk-doc/html/cogl/ix05.html
share/gtk-doc/html/cogl/left.png
share/gtk-doc/html/cogl/license.html
share/gtk-doc/html/cogl/right.png
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 44d0a042be7..12e60074763 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/01/20 04:54:51 obache Exp $
+$NetBSD: distinfo,v 1.5 2010/03/04 08:13:15 obache Exp $
-SHA1 (clutter-1.0.10.tar.gz) = 9a0ce6dbc8328bcd85b65cd8c67044c99398ebfe
-RMD160 (clutter-1.0.10.tar.gz) = 0b75c0be0d9a68c954bb32acd35e4c55024e11bc
-Size (clutter-1.0.10.tar.gz) = 2719583 bytes
-SHA1 (patch-aa) = 4e5aff1ec5d7c6190bdd59c7eb18359954c26755
+SHA1 (clutter-1.2.0.tar.gz) = 31eaa2fc180d6eba2ec2175d49fcd1a991a48da1
+RMD160 (clutter-1.2.0.tar.gz) = de37dacd9de9ece4dcaa6ffc58c26a61ea910246
+Size (clutter-1.2.0.tar.gz) = 3494490 bytes
diff --git a/graphics/clutter/patches/patch-aa b/graphics/clutter/patches/patch-aa
deleted file mode 100644
index ecb58d34807..00000000000
--- a/graphics/clutter/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$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__ */