Downgrade clutter to 1.2.14nb1, due to incompatibilities with some bindings.

3 files changed, 16 insertions, 126 deletions

diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 7d5c738daed..45424b1f021 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2010/12/03 05:27:30 obache Exp $
+# $NetBSD: Makefile,v 1.24 2010/12/03 07:30:17 obache Exp $
 #
 
-DISTNAME=	clutter-1.4.2
+DISTNAME=	clutter-1.2.14
+PKGREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://source.clutter-project.org/sources/clutter/1.4/
-#		${MASTER_SITE_GNOME:=sources/clutter/1.4/}
+MASTER_SITES=	http://source.clutter-project.org/sources/clutter/1.2/
+#		${MASTER_SITE_GNOME:=sources/clutter/1.2/}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://clutter-project.org/
@@ -28,15 +29,12 @@ PKGCONFIG_OVERRIDE+=	clutter.pc.in
 
 TEST_TARGET=	check
 
-BUILDLINK_API_DEPENDS.atk+=	atk>=1.7
-.include "../../devel/atk/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.18.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.20.0
 .include "../../devel/pango/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.6.0
 .include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.json-glib+=	json-glib>=0.10.0
+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 b562a9e3fb4..7afbf9eaec2 100644
--- a/graphics/clutter/PLIST
+++ b/graphics/clutter/PLIST
@@ -1,20 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2010/11/21 13:20:54 obache Exp $
-include/clutter-1.0/cally/cally-actor.h
-include/clutter-1.0/cally/cally-clone.h
-include/clutter-1.0/cally/cally-factory.h
-include/clutter-1.0/cally/cally-group.h
-include/clutter-1.0/cally/cally-main.h
-include/clutter-1.0/cally/cally-rectangle.h
-include/clutter-1.0/cally/cally-root.h
-include/clutter-1.0/cally/cally-stage.h
-include/clutter-1.0/cally/cally-text.h
-include/clutter-1.0/cally/cally-texture.h
-include/clutter-1.0/cally/cally-util.h
-include/clutter-1.0/cally/cally.h
-include/clutter-1.0/clutter/clutter-action.h
-include/clutter-1.0/clutter/clutter-actor-meta.h
+@comment $NetBSD: PLIST,v 1.7 2010/12/03 07:30:17 obache Exp $
 include/clutter-1.0/clutter/clutter-actor.h
-include/clutter-1.0/clutter/clutter-align-constraint.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
@@ -28,25 +13,16 @@ 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-bind-constraint.h
 include/clutter-1.0/clutter/clutter-binding-pool.h
-include/clutter-1.0/clutter/clutter-blur-effect.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-click-action.h
 include/clutter-1.0/clutter/clutter-clone.h
 include/clutter-1.0/clutter/clutter-color.h
-include/clutter-1.0/clutter/clutter-colorize-effect.h
-include/clutter-1.0/clutter/clutter-constraint.h
 include/clutter-1.0/clutter/clutter-container.h
-include/clutter-1.0/clutter/clutter-deform-effect.h
 include/clutter-1.0/clutter/clutter-deprecated.h
-include/clutter-1.0/clutter/clutter-desaturate-effect.h
 include/clutter-1.0/clutter/clutter-device-manager.h
-include/clutter-1.0/clutter/clutter-drag-action.h
-include/clutter-1.0/clutter/clutter-effect.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
@@ -58,32 +34,24 @@ 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-compat.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-marshal.h
 include/clutter-1.0/clutter/clutter-media.h
 include/clutter-1.0/clutter/clutter-model.h
-include/clutter-1.0/clutter/clutter-offscreen-effect.h
 ${PLIST.osx}include/clutter-1.0/clutter/clutter-osx.h
-include/clutter-1.0/clutter/clutter-page-turn-effect.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-settings.h
-include/clutter-1.0/clutter/clutter-shader-effect.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-state.h
-include/clutter-1.0/clutter/clutter-table-layout.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
@@ -101,69 +69,32 @@ ${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.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-object.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-array.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-3d.h
-${PLIST.x11}include/clutter-1.0/cogl/cogl-texture-pixmap-x11.h
 include/clutter-1.0/cogl/cogl-texture.h
 include/clutter-1.0/cogl/cogl-types.h
-include/clutter-1.0/cogl/cogl-vector.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/cally-1.0.pc
 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/cally/CallyActor.html
-share/gtk-doc/html/cally/CallyClone.html
-share/gtk-doc/html/cally/CallyGroup.html
-share/gtk-doc/html/cally/CallyRectangle.html
-share/gtk-doc/html/cally/CallyRoot.html
-share/gtk-doc/html/cally/CallyStage.html
-share/gtk-doc/html/cally/CallyText.html
-share/gtk-doc/html/cally/CallyTexture.html
-share/gtk-doc/html/cally/CallyUtil.html
-share/gtk-doc/html/cally/cally-General-API.html
-share/gtk-doc/html/cally/cally.devhelp
-share/gtk-doc/html/cally/cally.devhelp2
-share/gtk-doc/html/cally/callybase.html
-share/gtk-doc/html/cally/callyobjecthierarchy.html
-share/gtk-doc/html/cally/callyobjectindex.html
-share/gtk-doc/html/cally/callyobjects.html
-share/gtk-doc/html/cally/ch01.html
-share/gtk-doc/html/cally/ch02.html
-share/gtk-doc/html/cally/clutter-overview.html
-share/gtk-doc/html/cally/home.png
-share/gtk-doc/html/cally/index.html
-share/gtk-doc/html/cally/index.sgml
-share/gtk-doc/html/cally/ix01.html
-share/gtk-doc/html/cally/ix02.html
-share/gtk-doc/html/cally/ix03.html
-share/gtk-doc/html/cally/left.png
-share/gtk-doc/html/cally/license.html
-share/gtk-doc/html/cally/right.png
-share/gtk-doc/html/cally/style.css
-share/gtk-doc/html/cally/up.png
-share/gtk-doc/html/clutter/ClutterAction.html
 share/gtk-doc/html/clutter/ClutterActor.html
-share/gtk-doc/html/clutter/ClutterActorMeta.html
-share/gtk-doc/html/clutter/ClutterAlignConstraint.html
 share/gtk-doc/html/clutter/ClutterAlpha.html
 share/gtk-doc/html/clutter/ClutterAnimatable.html
 share/gtk-doc/html/clutter/ClutterAnimator.html
@@ -175,22 +106,13 @@ 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/ClutterBindConstraint.html
-share/gtk-doc/html/clutter/ClutterBlurEffect.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/ClutterClickAction.html
 share/gtk-doc/html/clutter/ClutterClone.html
-share/gtk-doc/html/clutter/ClutterColorizeEffect.html
-share/gtk-doc/html/clutter/ClutterConstraint.html
 share/gtk-doc/html/clutter/ClutterContainer.html
-share/gtk-doc/html/clutter/ClutterDeformEffect.html
-share/gtk-doc/html/clutter/ClutterDesaturateEffect.html
 share/gtk-doc/html/clutter/ClutterDeviceManager.html
-share/gtk-doc/html/clutter/ClutterDragAction.html
-share/gtk-doc/html/clutter/ClutterEffect.html
 share/gtk-doc/html/clutter/ClutterFixedLayout.html
 share/gtk-doc/html/clutter/ClutterFlowLayout.html
 share/gtk-doc/html/clutter/ClutterGroup.html
@@ -201,18 +123,12 @@ 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/ClutterOffscreenEffect.html
-share/gtk-doc/html/clutter/ClutterPageTurnEffect.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/ClutterSettings.html
-share/gtk-doc/html/clutter/ClutterShaderEffect.html
 share/gtk-doc/html/clutter/ClutterStage.html
-share/gtk-doc/html/clutter/ClutterState.html
-share/gtk-doc/html/clutter/ClutterTableLayout.html
 share/gtk-doc/html/clutter/ClutterText.html
 share/gtk-doc/html/clutter/ClutterTexture.html
 share/gtk-doc/html/clutter/ClutterTimeline.html
@@ -233,17 +149,15 @@ 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/ch11.html
 share/gtk-doc/html/clutter/clutter-ClutterBackend.html
-share/gtk-doc/html/clutter/clutter-ClutterX11TexturePixmap.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-Intel-CE3100-CE4100-Specific-Support.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
@@ -288,7 +202,6 @@ 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/ix09.html
 share/gtk-doc/html/clutter/left.png
 share/gtk-doc/html/clutter/license.html
 share/gtk-doc/html/clutter/migrating-ClutterEffect.html
@@ -303,36 +216,22 @@ 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/ch03.html
-share/gtk-doc/html/cogl/cogl-3D-textures.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-(Deprecated).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-(Deprecated).html
 share/gtk-doc/html/cogl/cogl-General-API.html
-share/gtk-doc/html/cogl/cogl-Materials-(Deprecated).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-(Deprecated).html
 share/gtk-doc/html/cogl/cogl-Offscreen-Buffers.html
-share/gtk-doc/html/cogl/cogl-Path-Primitives.html
 share/gtk-doc/html/cogl/cogl-Primitives.html
-share/gtk-doc/html/cogl/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html
 share/gtk-doc/html/cogl/cogl-Shaders-and-Programmable-Pipeline.html
-share/gtk-doc/html/cogl/cogl-Textures-(Deprecated).html
 share/gtk-doc/html/cogl/cogl-Textures.html
-share/gtk-doc/html/cogl/cogl-Vectors.html
-share/gtk-doc/html/cogl/cogl-Vertex-Buffers-(Deprecated).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/cogl_ortho.png
-share/gtk-doc/html/cogl/coglglossary.html
-share/gtk-doc/html/cogl/fill-rule-even-odd.png
-share/gtk-doc/html/cogl/fill-rule-non-zero.png
+share/gtk-doc/html/cogl/fill-rule.png
 share/gtk-doc/html/cogl/home.png
 share/gtk-doc/html/cogl/index.html
 share/gtk-doc/html/cogl/index.sgml
@@ -341,15 +240,8 @@ 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/ix06.html
 share/gtk-doc/html/cogl/left.png
 share/gtk-doc/html/cogl/license.html
-share/gtk-doc/html/cogl/quad-indices-order.png
-share/gtk-doc/html/cogl/quad-indices-triangles.png
 share/gtk-doc/html/cogl/right.png
 share/gtk-doc/html/cogl/style.css
 share/gtk-doc/html/cogl/up.png
-share/locale/de/LC_MESSAGES/clutter-1.0.mo
-share/locale/it/LC_MESSAGES/clutter-1.0.mo
-share/locale/pl/LC_MESSAGES/clutter-1.0.mo
-share/locale/zh_CN/LC_MESSAGES/clutter-1.0.mo
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 0c2fb955147..f7283781df5 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2010/12/03 05:27:30 obache Exp $
+$NetBSD: distinfo,v 1.16 2010/12/03 07:30:17 obache Exp $
 
-SHA1 (clutter-1.4.2.tar.gz) = acbffd2688b8c417c7f90bab1cf7bba420501aa4
-RMD160 (clutter-1.4.2.tar.gz) = 771419cc9d8756b85c7c90ca7b1ed8b19962f6af
-Size (clutter-1.4.2.tar.gz) = 5487121 bytes
+SHA1 (clutter-1.2.14.tar.gz) = 2fcc0a053424a33f98cbab51477cec2518c4bba6
+RMD160 (clutter-1.2.14.tar.gz) = 9f54c29e17b5595b964f3345729d001189df40f1
+Size (clutter-1.2.14.tar.gz) = 3201417 bytes