- update to clutter-1.12.0

* includes a fix for the dreaded threading issues
This commit is contained in:
jasper 2012-09-27 11:48:23 +00:00
parent d27021ffe5
commit 283a6691c8
8 changed files with 81 additions and 49 deletions

View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.16 2012/09/24 19:22:27 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2012/09/27 11:48:23 jasper Exp $
COMMENT= OpenGL-based interactive canvas library
GNOME_PROJECT= clutter
GNOME_VERSION= ${MAJOR}.8
REVISION= 0
GNOME_VERSION= ${MAJOR}.0
SHARED_LIBS += clutter-1.0 0.0 # 1000.8
SHARED_LIBS += clutter-1.0 1.0 # 1200.8
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
WANTLIB += cogl cogl-pango drm expat ffi fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 json-glib-1.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs stdc++
WANTLIB += xcb xcb-render xcb-shm z
WANTLIB += gthread-2.0 harfbuzz icudata icule icuuc json-glib-1.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs stdc++ xcb xcb-render xcb-shm
WANTLIB += z
MODGNOME_TOOLS= goi
@ -27,6 +27,8 @@ MODGNOME_LDFLAGS= -L${X11BASE}/lib
CONFIGURE_ARGS= --enable-x11-backend
REGRESS_IS_INTERACTIVE= X11
pre-configure:
${SUBST_CMD} ${WRKSRC}/clutter/Makefile.in

View File

@ -1,5 +1,2 @@
MD5 (clutter/clutter-1.10.8.tar.xz) = 7JUa1IDHMv3twwI+r+c1KQ==
RMD160 (clutter/clutter-1.10.8.tar.xz) = ZJ6x45L6K5B04amW6Fyyd+5NMgE=
SHA1 (clutter/clutter-1.10.8.tar.xz) = bPklObKgzpUshQeVWLONY7DCrC0=
SHA256 (clutter/clutter-1.10.8.tar.xz) = fAjC3v9iwTTBo9GOBNy2+65LvFQcgAY4ufw9cf5KZL8=
SIZE (clutter/clutter-1.10.8.tar.xz) = 4761332
SHA256 (clutter/clutter-1.12.0.tar.xz) = 51Ewpd9tvpfo01AlkngzHGNSstITIwcSEnFg5CBT5Vg=
SIZE (clutter/clutter-1.12.0.tar.xz) = 5009984

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clutter_Makefile_in,v 1.2 2012/07/07 12:49:17 ajacoutot Exp $
--- clutter/Makefile.in.orig Tue Jun 19 14:30:53 2012
+++ clutter/Makefile.in Tue Jun 19 14:32:59 2012
@@ -3840,13 +3840,8 @@ install-exec-local:
$OpenBSD: patch-clutter_Makefile_in,v 1.3 2012/09/27 11:48:23 jasper Exp $
--- clutter/Makefile.in.orig Mon Sep 24 18:18:42 2012
+++ clutter/Makefile.in Mon Sep 24 21:10:01 2012
@@ -4069,13 +4069,8 @@ install-exec-local:
rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
) ; \
(cd $(DESTDIR)$(libdir) && \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-clutter_clutter-actor_c,v 1.1 2012/09/27 11:48:23 jasper Exp $
--- clutter/clutter-actor.c.orig Tue Sep 25 11:34:26 2012
+++ clutter/clutter-actor.c Tue Sep 25 11:34:48 2012
@@ -15772,7 +15772,7 @@ clutter_actor_set_transform_internal (ClutterActor
was_set = info->transform_set;
info->transform = *transform;
- info->transform_set = cogl_matrix_is_identity (&info->transform);
+ info->transform_set = !cogl_matrix_is_identity (&info->transform);
self->priv->transform_valid = FALSE;

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-clutter_clutter-main_c,v 1.1 2012/09/27 11:48:23 jasper Exp $
From 48b3e9ca8b81080bb75869c85f213b8c415fba6f Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 26 Sep 2012 09:45:46 +0100
Subject: [PATCH] main: Do not release the lock if it hasn't been acquired
https://bugzilla.gnome.org/show_bug.cgi?id=679439
--- clutter/clutter-main.c.orig Thu Sep 27 12:57:55 2012
+++ clutter/clutter-main.c Thu Sep 27 12:58:21 2012
@@ -226,6 +226,7 @@ clutter_threads_impl_lock (void)
static void
clutter_threads_impl_unlock (void)
{
+ g_mutex_trylock (&clutter_threads_mutex);
g_mutex_unlock (&clutter_threads_mutex);
}

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.1 2012/07/07 12:49:17 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.2 2012/09/27 11:48:23 jasper Exp $
- Don't do bash pattern substitutions.
--- configure.orig Tue Jun 19 09:54:30 2012
+++ configure Tue Jun 19 14:30:45 2012
@@ -14940,11 +14940,11 @@ $as_echo "$as_me: WARNING: unsupported compiler flags:
--- configure.orig Mon Sep 24 18:18:40 2012
+++ configure Mon Sep 24 21:10:01 2012
@@ -14849,11 +14849,11 @@ $as_echo "$as_me: WARNING: unsupported compiler flags:
esac
# strip leading spaces

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-tests_interactive_test-animation_c,v 1.1 2012/07/07 12:49:17 ajacoutot Exp $
--- tests/interactive/test-animation.c.orig Sat Jul 7 14:36:34 2012
+++ tests/interactive/test-animation.c Sat Jul 7 14:36:52 2012
@@ -111,7 +111,9 @@ test_animation_main (int argc, char *argv[])
clutter_actor_show (stage);
+ clutter_threads_enter ();
clutter_main ();
+ clutter_threads_leave ();
return EXIT_SUCCESS;
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2012/07/07 12:49:17 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/09/27 11:48:23 jasper Exp $
@conflict cogl-<1.8.0
include/clutter-${API_VERSION}/
include/clutter-${API_VERSION}/cally/
@ -19,10 +19,7 @@ include/clutter-${API_VERSION}/clutter/clutter-action.h
include/clutter-${API_VERSION}/clutter/clutter-actor-meta.h
include/clutter-${API_VERSION}/clutter/clutter-actor.h
include/clutter-${API_VERSION}/clutter/clutter-align-constraint.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-animator.h
include/clutter-${API_VERSION}/clutter/clutter-backend.h
include/clutter-${API_VERSION}/clutter/clutter-bin-layout.h
include/clutter-${API_VERSION}/clutter/clutter-bind-constraint.h
@ -30,7 +27,7 @@ include/clutter-${API_VERSION}/clutter/clutter-binding-pool.h
include/clutter-${API_VERSION}/clutter/clutter-blur-effect.h
include/clutter-${API_VERSION}/clutter/clutter-box-layout.h
include/clutter-${API_VERSION}/clutter/clutter-brightness-contrast-effect.h
include/clutter-${API_VERSION}/clutter/clutter-cairo-texture.h
include/clutter-${API_VERSION}/clutter/clutter-cairo.h
include/clutter-${API_VERSION}/clutter/clutter-canvas.h
include/clutter-${API_VERSION}/clutter/clutter-child-meta.h
include/clutter-${API_VERSION}/clutter/clutter-click-action.h
@ -57,10 +54,12 @@ include/clutter-${API_VERSION}/clutter/clutter-feature.h
include/clutter-${API_VERSION}/clutter/clutter-fixed-layout.h
include/clutter-${API_VERSION}/clutter/clutter-flow-layout.h
include/clutter-${API_VERSION}/clutter/clutter-gesture-action.h
include/clutter-${API_VERSION}/clutter/clutter-grid-layout.h
include/clutter-${API_VERSION}/clutter/clutter-group.h
include/clutter-${API_VERSION}/clutter/clutter-image.h
include/clutter-${API_VERSION}/clutter/clutter-input-device.h
include/clutter-${API_VERSION}/clutter/clutter-interval.h
include/clutter-${API_VERSION}/clutter/clutter-keyframe-transition.h
include/clutter-${API_VERSION}/clutter/clutter-keysyms.h
include/clutter-${API_VERSION}/clutter/clutter-layout-manager.h
include/clutter-${API_VERSION}/clutter/clutter-layout-meta.h
@ -68,39 +67,44 @@ include/clutter-${API_VERSION}/clutter/clutter-list-model.h
include/clutter-${API_VERSION}/clutter/clutter-macros.h
include/clutter-${API_VERSION}/clutter/clutter-main.h
include/clutter-${API_VERSION}/clutter/clutter-marshal.h
include/clutter-${API_VERSION}/clutter/clutter-media.h
include/clutter-${API_VERSION}/clutter/clutter-model.h
include/clutter-${API_VERSION}/clutter/clutter-offscreen-effect.h
include/clutter-${API_VERSION}/clutter/clutter-page-turn-effect.h
include/clutter-${API_VERSION}/clutter/clutter-paint-node.h
include/clutter-${API_VERSION}/clutter/clutter-paint-nodes.h
include/clutter-${API_VERSION}/clutter/clutter-pan-action.h
include/clutter-${API_VERSION}/clutter/clutter-path-constraint.h
include/clutter-${API_VERSION}/clutter/clutter-path.h
include/clutter-${API_VERSION}/clutter/clutter-property-transition.h
include/clutter-${API_VERSION}/clutter/clutter-rotate-action.h
include/clutter-${API_VERSION}/clutter/clutter-script.h
include/clutter-${API_VERSION}/clutter/clutter-scriptable.h
include/clutter-${API_VERSION}/clutter/clutter-scroll-actor.h
include/clutter-${API_VERSION}/clutter/clutter-settings.h
include/clutter-${API_VERSION}/clutter/clutter-shader-effect.h
include/clutter-${API_VERSION}/clutter/clutter-shader-types.h
include/clutter-${API_VERSION}/clutter/clutter-snap-constraint.h
include/clutter-${API_VERSION}/clutter/clutter-stage-manager.h
include/clutter-${API_VERSION}/clutter/clutter-stage.h
include/clutter-${API_VERSION}/clutter/clutter-state.h
include/clutter-${API_VERSION}/clutter/clutter-swipe-action.h
include/clutter-${API_VERSION}/clutter/clutter-table-layout.h
include/clutter-${API_VERSION}/clutter/clutter-text-buffer.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-transition-group.h
include/clutter-${API_VERSION}/clutter/clutter-transition.h
include/clutter-${API_VERSION}/clutter/clutter-types.h
include/clutter-${API_VERSION}/clutter/clutter-units.h
include/clutter-${API_VERSION}/clutter/clutter-version.h
include/clutter-${API_VERSION}/clutter/clutter-zoom-action.h
include/clutter-${API_VERSION}/clutter/clutter.h
include/clutter-${API_VERSION}/clutter/deprecated/
include/clutter-${API_VERSION}/clutter/deprecated/clutter-actor.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-alpha.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-animatable.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-animation.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-animator.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-backend.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-behaviour-depth.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-behaviour-ellipse.h
@ -109,19 +113,23 @@ include/clutter-${API_VERSION}/clutter/deprecated/clutter-behaviour-path.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-behaviour-rotate.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-behaviour-scale.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-behaviour.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-bin-layout.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-box.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-cairo-texture.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-container.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-fixed.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-frame-source.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-group.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-input-device.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-keysyms.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-main.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-media.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-rectangle.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-score.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-shader.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-stage-manager.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-stage.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-state.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-texture.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-timeline.h
include/clutter-${API_VERSION}/clutter/deprecated/clutter-timeout-pool.h
@ -223,8 +231,11 @@ 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
@ -233,13 +244,17 @@ 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
@ -252,9 +267,10 @@ 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/actor-example.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
@ -272,10 +288,8 @@ 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/ch12.html
share/gtk-doc/html/clutter/ch13.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-ClutterImage.html
share/gtk-doc/html/clutter/clutter-ClutterPaintNode.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
@ -297,10 +311,6 @@ 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-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.devhelp2
share/gtk-doc/html/clutter/clutteranimation.html
@ -333,15 +343,17 @@ 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/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
@ -359,6 +371,7 @@ share/locale/ca@valencia/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/cs/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/da/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/de/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/el/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/en_GB/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/eo/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/es/LC_MESSAGES/clutter-${API_VERSION}.mo
@ -370,11 +383,13 @@ share/locale/he/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/hi/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/id/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/it/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/ja/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/km/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/kn/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/lt/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/lv/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/mk/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/ml/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/nb/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/nl/LC_MESSAGES/clutter-${API_VERSION}.mo
share/locale/or/LC_MESSAGES/clutter-${API_VERSION}.mo