summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/clutter/Makefile41
-rw-r--r--graphics/clutter/PLIST350
-rw-r--r--graphics/clutter/buildlink3.mk4
-rw-r--r--graphics/clutter/distinfo10
-rw-r--r--graphics/clutter/options.mk22
-rw-r--r--graphics/clutter/patches/patch-aa12
-rw-r--r--graphics/clutter/patches/patch-ab12
7 files changed, 299 insertions, 152 deletions
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 98de453b63b..eeb67ec06f5 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,38 +1,39 @@
-# $NetBSD: Makefile,v 1.39 2013/06/06 12:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2013/07/15 01:25:59 obache Exp $
#
-DISTNAME= clutter-1.2.14
-PKGREVISION= 14
+DISTNAME= clutter-1.14.4
CATEGORIES= graphics
-MASTER_SITES= http://source.clutter-project.org/sources/clutter/1.2/
-# ${MASTER_SITE_GNOME:=sources/clutter/1.2/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/clutter/1.14/}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://clutter-project.org/
+HOMEPAGE= http://blog.gnome.org/clutter/
COMMENT= Open GL based interactive canvas library
LICENSE= gnu-lgpl-v2.1
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake pkg-config
+USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS+= --with-json=system
-
-PKGCONFIG_OVERRIDE+= clutter/cogl/cogl/cogl.pc.in
-PKGCONFIG_OVERRIDE+= clutter/x11/clutter-x11.pc.in
-PKGCONFIG_OVERRIDE+= clutter/win32/clutter-win32.pc.in
-PKGCONFIG_OVERRIDE+= clutter.pc.in
+PKGCONFIG_OVERRIDE+= clutter/cally/cally.pc.in
+PKGCONFIG_OVERRIDE+= clutter/clutter.pc.in
.include "options.mk"
TEST_TARGET= check
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
+.include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.atk+= atk>=2.5.3
+.include "../../devel/atk/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.31.19
.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0
+BUILDLINK_API_DEPENDS.pango+= pango>=1.30.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.8.0
+BUILDLINK_API_DEPENDS.cairo-gobject+= cairo-gobject>=1.10.0
+.include "../../graphics/cairo-gobject/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cogl+= cogl>=1.14.0
+.include "../../graphics/cogl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.12.0
.include "../../textproc/json-glib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clutter/PLIST b/graphics/clutter/PLIST
index 7afbf9eaec2..efa58eaac33 100644
--- a/graphics/clutter/PLIST
+++ b/graphics/clutter/PLIST
@@ -1,103 +1,194 @@
-@comment $NetBSD: PLIST,v 1.7 2010/12/03 07:30:17 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/07/15 01:25:59 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
include/clutter-1.0/clutter/clutter-actor.h
-include/clutter-1.0/clutter/clutter-alpha.h
+include/clutter-1.0/clutter/clutter-align-constraint.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
-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-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-brightness-contrast-effect.h
+include/clutter-1.0/clutter/clutter-cairo.h
+include/clutter-1.0/clutter/clutter-canvas.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-cogl-compat.h
+include/clutter-1.0/clutter/clutter-color-static.h
include/clutter-1.0/clutter/clutter-color.h
+include/clutter-1.0/clutter/clutter-colorize-effect.h
+include/clutter-1.0/clutter/clutter-config.h
+include/clutter-1.0/clutter/clutter-constraint.h
include/clutter-1.0/clutter/clutter-container.h
+include/clutter-1.0/clutter/clutter-content.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-drop-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-enums.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-gesture-action.h
+include/clutter-1.0/clutter/clutter-grid-layout.h
include/clutter-1.0/clutter/clutter-group.h
+include/clutter-1.0/clutter/clutter-image.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-keyframe-transition.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-macros.h
include/clutter-1.0/clutter/clutter-main.h
-include/clutter-1.0/clutter/clutter-media.h
+include/clutter-1.0/clutter/clutter-marshal.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-paint-node.h
+include/clutter-1.0/clutter/clutter-paint-nodes.h
+include/clutter-1.0/clutter/clutter-pan-action.h
+include/clutter-1.0/clutter/clutter-path-constraint.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-property-transition.h
+include/clutter-1.0/clutter/clutter-rotate-action.h
include/clutter-1.0/clutter/clutter-script.h
include/clutter-1.0/clutter/clutter-scriptable.h
+include/clutter-1.0/clutter/clutter-scroll-actor.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-snap-constraint.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-swipe-action.h
+include/clutter-1.0/clutter/clutter-table-layout.h
+include/clutter-1.0/clutter/clutter-tap-action.h
+include/clutter-1.0/clutter/clutter-text-buffer.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-transition-group.h
+include/clutter-1.0/clutter/clutter-transition.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-zoom-action.h
include/clutter-1.0/clutter/clutter.h
+include/clutter-1.0/clutter/deprecated/clutter-actor.h
+include/clutter-1.0/clutter/deprecated/clutter-alpha.h
+include/clutter-1.0/clutter/deprecated/clutter-animatable.h
+include/clutter-1.0/clutter/deprecated/clutter-animation.h
+include/clutter-1.0/clutter/deprecated/clutter-animator.h
+include/clutter-1.0/clutter/deprecated/clutter-backend.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour-depth.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour-ellipse.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour-opacity.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour-path.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour-rotate.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour-scale.h
+include/clutter-1.0/clutter/deprecated/clutter-behaviour.h
+include/clutter-1.0/clutter/deprecated/clutter-bin-layout.h
+include/clutter-1.0/clutter/deprecated/clutter-box.h
+include/clutter-1.0/clutter/deprecated/clutter-cairo-texture.h
+include/clutter-1.0/clutter/deprecated/clutter-container.h
+include/clutter-1.0/clutter/deprecated/clutter-fixed.h
+include/clutter-1.0/clutter/deprecated/clutter-frame-source.h
+include/clutter-1.0/clutter/deprecated/clutter-group.h
+include/clutter-1.0/clutter/deprecated/clutter-input-device.h
+include/clutter-1.0/clutter/deprecated/clutter-keysyms.h
+include/clutter-1.0/clutter/deprecated/clutter-main.h
+include/clutter-1.0/clutter/deprecated/clutter-media.h
+include/clutter-1.0/clutter/deprecated/clutter-rectangle.h
+include/clutter-1.0/clutter/deprecated/clutter-score.h
+include/clutter-1.0/clutter/deprecated/clutter-shader.h
+include/clutter-1.0/clutter/deprecated/clutter-stage-manager.h
+include/clutter-1.0/clutter/deprecated/clutter-stage.h
+include/clutter-1.0/clutter/deprecated/clutter-state.h
+include/clutter-1.0/clutter/deprecated/clutter-texture.h
+include/clutter-1.0/clutter/deprecated/clutter-timeline.h
+include/clutter-1.0/clutter/deprecated/clutter-timeout-pool.h
+include/clutter-1.0/clutter/deprecated/clutter-util.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-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-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
-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
+${PLIST.introspection}lib/girepository-1.0/Cally-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Clutter-1.0.typelib
+${PLIST.x11}${PLIST.introspection}lib/girepository-1.0/ClutterX11-1.0.typelib
+lib/libclutter-1.0.la
+${PLIST.x11}lib/libclutter-glx-1.0.so
+${PLIST.x11}lib/libclutter-glx-1.0.so.0
+lib/pkgconfig/cally-1.0.pc
lib/pkgconfig/clutter-1.0.pc
+lib/pkgconfig/clutter-cogl-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
+${PLIST.introspection}share/gir-1.0/Cally-1.0.gir
+${PLIST.introspection}share/gir-1.0/Clutter-1.0.gir
+${PLIST.x11}${PLIST.introspection}share/gir-1.0/ClutterX11-1.0.gir
+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.devhelp2
+share/gtk-doc/html/cally/callyannotationglossary.html
+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/ix04.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
+share/gtk-doc/html/clutter/ClutterBackend.html
share/gtk-doc/html/clutter/ClutterBehaviour.html
share/gtk-doc/html/clutter/ClutterBehaviourDepth.html
share/gtk-doc/html/clutter/ClutterBehaviourEllipse.html
@@ -106,34 +197,70 @@ 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/ClutterBrightnessContrastEffect.html
share/gtk-doc/html/clutter/ClutterCairoTexture.html
+share/gtk-doc/html/clutter/ClutterCanvas.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/ClutterContent.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/ClutterDropAction.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/ClutterGestureAction.html
+share/gtk-doc/html/clutter/ClutterGridLayout.html
share/gtk-doc/html/clutter/ClutterGroup.html
+share/gtk-doc/html/clutter/ClutterImage.html
share/gtk-doc/html/clutter/ClutterInputDevice.html
+share/gtk-doc/html/clutter/ClutterKeyframeTransition.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
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/ClutterPaintNode.html
+share/gtk-doc/html/clutter/ClutterPanAction.html
share/gtk-doc/html/clutter/ClutterPath.html
+share/gtk-doc/html/clutter/ClutterPathConstraint.html
+share/gtk-doc/html/clutter/ClutterPropertyTransition.html
share/gtk-doc/html/clutter/ClutterRectangle.html
+share/gtk-doc/html/clutter/ClutterRotateAction.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/ClutterScrollActor.html
+share/gtk-doc/html/clutter/ClutterSettings.html
+share/gtk-doc/html/clutter/ClutterShaderEffect.html
+share/gtk-doc/html/clutter/ClutterSnapConstraint.html
share/gtk-doc/html/clutter/ClutterStage.html
+share/gtk-doc/html/clutter/ClutterState.html
+share/gtk-doc/html/clutter/ClutterSwipeAction.html
+share/gtk-doc/html/clutter/ClutterTableLayout.html
+share/gtk-doc/html/clutter/ClutterTapAction.html
share/gtk-doc/html/clutter/ClutterText.html
+share/gtk-doc/html/clutter/ClutterTextBuffer.html
share/gtk-doc/html/clutter/ClutterTexture.html
share/gtk-doc/html/clutter/ClutterTimeline.html
+share/gtk-doc/html/clutter/ClutterTransition.html
+share/gtk-doc/html/clutter/ClutterTransitionGroup.html
+share/gtk-doc/html/clutter/ClutterZoomAction.html
share/gtk-doc/html/clutter/actor-box.png
-share/gtk-doc/html/clutter/additionaldocs.html
+share/gtk-doc/html/clutter/actor-example.png
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
@@ -149,32 +276,32 @@ 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/ch11.html
+share/gtk-doc/html/clutter/ch12.html
+share/gtk-doc/html/clutter/clutter-Base-geometric-types.html
+share/gtk-doc/html/clutter/clutter-ClutterGLXTexturePixmap.html
+share/gtk-doc/html/clutter/clutter-ClutterWaylandSurface.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-GDK-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-Paint-Nodes.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
share/gtk-doc/html/clutter/clutter-Versioning-Macros.html
+share/gtk-doc/html/clutter/clutter-Wayland-compositor-specific-support.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-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
-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
@@ -184,11 +311,11 @@ 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/constraints-example.png
+share/gtk-doc/html/clutter/deprecated.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/flow-layout.png
share/gtk-doc/html/clutter/go01.html
share/gtk-doc/html/clutter/home.png
share/gtk-doc/html/clutter/index.html
@@ -202,46 +329,81 @@ 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/ix10.html
+share/gtk-doc/html/clutter/ix11.html
+share/gtk-doc/html/clutter/ix12.html
+share/gtk-doc/html/clutter/ix13.html
+share/gtk-doc/html/clutter/ix14.html
share/gtk-doc/html/clutter/left.png
share/gtk-doc/html/clutter/license.html
+share/gtk-doc/html/clutter/migrating-ClutterAnimation.html
+share/gtk-doc/html/clutter/migrating-ClutterBehaviour.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/offscreen-redirect.png
share/gtk-doc/html/clutter/path-alpha-func.png
-share/gtk-doc/html/clutter/pt10.html
+share/gtk-doc/html/clutter/pt09.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/table-layout.png
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
-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-Vertex-Buffers.html
-share/gtk-doc/html/cogl/cogl.devhelp
-share/gtk-doc/html/cogl/cogl.devhelp2
-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
-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
-share/gtk-doc/html/cogl/style.css
-share/gtk-doc/html/cogl/up.png
+share/locale/ar/LC_MESSAGES/clutter-1.0.mo
+share/locale/as/LC_MESSAGES/clutter-1.0.mo
+share/locale/ast/LC_MESSAGES/clutter-1.0.mo
+share/locale/az_IR/LC_MESSAGES/clutter-1.0.mo
+share/locale/be/LC_MESSAGES/clutter-1.0.mo
+share/locale/bg/LC_MESSAGES/clutter-1.0.mo
+share/locale/ca/LC_MESSAGES/clutter-1.0.mo
+share/locale/ca@valencia/LC_MESSAGES/clutter-1.0.mo
+share/locale/cs/LC_MESSAGES/clutter-1.0.mo
+share/locale/da/LC_MESSAGES/clutter-1.0.mo
+share/locale/de/LC_MESSAGES/clutter-1.0.mo
+share/locale/el/LC_MESSAGES/clutter-1.0.mo
+share/locale/en_GB/LC_MESSAGES/clutter-1.0.mo
+share/locale/eo/LC_MESSAGES/clutter-1.0.mo
+share/locale/es/LC_MESSAGES/clutter-1.0.mo
+share/locale/fa/LC_MESSAGES/clutter-1.0.mo
+share/locale/fi/LC_MESSAGES/clutter-1.0.mo
+share/locale/fr/LC_MESSAGES/clutter-1.0.mo
+share/locale/gl/LC_MESSAGES/clutter-1.0.mo
+share/locale/he/LC_MESSAGES/clutter-1.0.mo
+share/locale/hi/LC_MESSAGES/clutter-1.0.mo
+share/locale/id/LC_MESSAGES/clutter-1.0.mo
+share/locale/it/LC_MESSAGES/clutter-1.0.mo
+share/locale/ja/LC_MESSAGES/clutter-1.0.mo
+share/locale/km/LC_MESSAGES/clutter-1.0.mo
+share/locale/kn/LC_MESSAGES/clutter-1.0.mo
+share/locale/lt/LC_MESSAGES/clutter-1.0.mo
+share/locale/lv/LC_MESSAGES/clutter-1.0.mo
+share/locale/mk/LC_MESSAGES/clutter-1.0.mo
+share/locale/ml/LC_MESSAGES/clutter-1.0.mo
+share/locale/nb/LC_MESSAGES/clutter-1.0.mo
+share/locale/nl/LC_MESSAGES/clutter-1.0.mo
+share/locale/or/LC_MESSAGES/clutter-1.0.mo
+share/locale/pa/LC_MESSAGES/clutter-1.0.mo
+share/locale/pl/LC_MESSAGES/clutter-1.0.mo
+share/locale/ps/LC_MESSAGES/clutter-1.0.mo
+share/locale/pt/LC_MESSAGES/clutter-1.0.mo
+share/locale/pt_BR/LC_MESSAGES/clutter-1.0.mo
+share/locale/ro/LC_MESSAGES/clutter-1.0.mo
+share/locale/ru/LC_MESSAGES/clutter-1.0.mo
+share/locale/sk/LC_MESSAGES/clutter-1.0.mo
+share/locale/sl/LC_MESSAGES/clutter-1.0.mo
+share/locale/sr/LC_MESSAGES/clutter-1.0.mo
+share/locale/sr@latin/LC_MESSAGES/clutter-1.0.mo
+share/locale/sv/LC_MESSAGES/clutter-1.0.mo
+share/locale/ta/LC_MESSAGES/clutter-1.0.mo
+share/locale/te/LC_MESSAGES/clutter-1.0.mo
+share/locale/tg/LC_MESSAGES/clutter-1.0.mo
+share/locale/tr/LC_MESSAGES/clutter-1.0.mo
+share/locale/ug/LC_MESSAGES/clutter-1.0.mo
+share/locale/uk/LC_MESSAGES/clutter-1.0.mo
+share/locale/ur/LC_MESSAGES/clutter-1.0.mo
+share/locale/yi/LC_MESSAGES/clutter-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/clutter-1.0.mo
+share/locale/zh_HK/LC_MESSAGES/clutter-1.0.mo
+share/locale/zh_TW/LC_MESSAGES/clutter-1.0.mo
diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk
index 635b3b3a4c6..1a2dd4df51f 100644
--- a/graphics/clutter/buildlink3.mk
+++ b/graphics/clutter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2013/06/06 12:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2013/07/15 01:25:59 obache Exp $
#
BUILDLINK_TREE+= clutter
@@ -22,10 +22,12 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.0
.include "../../x11/libXcomposite/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
.endif
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cogl/buildlink3.mk"
.include "../../textproc/json-glib/buildlink3.mk"
.endif # CLUTTER_BUILDLINK3_MK
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 55fee4a226b..2df73ed78fe 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.17 2012/02/02 17:27:19 drochner Exp $
+$NetBSD: distinfo,v 1.18 2013/07/15 01:25:59 obache Exp $
-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
-SHA1 (patch-aa) = b1c1df2dd6806ad9c4626b29b0fa16db67527507
-SHA1 (patch-ab) = 1031517c2a9ee5716a8cf5cf9188a53861d1f9a9
+SHA1 (clutter-1.14.4.tar.xz) = 57f87cacb2d0133656e627e16eefaa6150b4a4a2
+RMD160 (clutter-1.14.4.tar.xz) = c5ca1e458b8afdbab1f4958d4b7cdf2c9f0c393e
+Size (clutter-1.14.4.tar.xz) = 5095688 bytes
diff --git a/graphics/clutter/options.mk b/graphics/clutter/options.mk
index c5827b73956..e428437cb23 100644
--- a/graphics/clutter/options.mk
+++ b/graphics/clutter/options.mk
@@ -1,18 +1,27 @@
-# $NetBSD: options.mk,v 1.4 2010/11/17 21:13:09 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2013/07/15 01:25:59 obache Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.clutter
-PKG_SUPPORTED_OPTIONS= x11
+PKG_SUPPORTED_OPTIONS= introspection x11
PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= x11 osx
+PLIST_VARS+= introspection x11 osx
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection= yes
+BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-intrpspection=yes
+.else
+CONFIGURE_ARGS+= --enable-intrpspection=no
+.endif
.if !empty(PKG_OPTIONS:Mx11)
PLIST.x11= yes
-CONFIGURE_ARGS+= --with-x
-CONFIGURE_ARGS+= --with-flavour=glx
+CONFIGURE_ARGS+= --enable-x11-backend
CONFIGURE_ARGS+= --with-imagebackend=gdk-pixbuf
CONFIGURE_ARGS+= --enable-xinput
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.0
@@ -28,7 +37,6 @@ CONFIGURE_ARGS+= --without-x
.include "../../mk/bsd.prefs.mk"
. if ${OPSYS} == Darwin
PLIST.osx= yes
-CONFIGURE_ARGS+= --with-flavour=osx
-CONFIGURE_ARGS+= --with-imagebackend=quartz
+CONFIGURE_ARGS+= --with-quartz-backend
. endif
.endif
diff --git a/graphics/clutter/patches/patch-aa b/graphics/clutter/patches/patch-aa
deleted file mode 100644
index 7007097bf4a..00000000000
--- a/graphics/clutter/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2012/02/02 17:27:19 drochner Exp $
-
---- clutter/cogl/cogl/Makefile.in.orig 2010-09-24 15:28:53.000000000 +0000
-+++ clutter/cogl/cogl/Makefile.in
-@@ -418,7 +418,6 @@ INCLUDES = \
-
- AM_CPPFLAGS = \
- -DG_DISABLE_SINGLE_INCLUDES \
-- -DG_DISABLE_DEPRECATED \
- -DG_LOG_DOMAIN=\"Cogl-$(COGL_WINSYS)\" \
- -DCLUTTER_COMPILATION \
- $(COGL_DEBUG_CFLAGS) \
diff --git a/graphics/clutter/patches/patch-ab b/graphics/clutter/patches/patch-ab
deleted file mode 100644
index 317f7fe40fc..00000000000
--- a/graphics/clutter/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2012/02/02 17:27:19 drochner Exp $
-
---- clutter/Makefile.in.orig 2010-09-24 15:28:52.000000000 +0000
-+++ clutter/Makefile.in
-@@ -472,7 +472,6 @@ AM_CPPFLAGS = \
- -DCLUTTER_COMPILATION=1 \
- -DCOGL_DISABLE_DEPRECATED \
- -DCOGL_ENABLE_EXPERIMENTAL_API \
-- -DG_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES \
- -DG_LOG_DOMAIN=\"Clutter\" \
- $(CLUTTER_DEBUG_CFLAGS) \