cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to clutter-1.12.2

Browse Source
This commit is contained in:
jasper 2012-10-17 11:32:42 +00:00
parent c7c15e2024
commit e6064e13f7
4 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/clutter/core/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.18 2012/09/27 13:00:40 jasper Exp $
# $OpenBSD: Makefile,v 1.19 2012/10/17 11:32:42 jasper Exp $
COMMENT= OpenGL-based interactive canvas library
GNOME_PROJECT= clutter
GNOME_VERSION= ${MAJOR}.0
REVISION= 0
GNOME_VERSION= ${MAJOR}.2
SHARED_LIBS += clutter-1.0 1.0 # 1200.8
SHARED_LIBS += clutter-1.0 1.0 # 1200.2
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject

4
graphics/clutter/core/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (clutter/clutter-1.12.0.tar.xz) = 51Ewpd9tvpfo01AlkngzHGNSstITIwcSEnFg5CBT5Vg=
SIZE (clutter/clutter-1.12.0.tar.xz) = 5009984
SHA256 (clutter/clutter-1.12.2.tar.xz) = J6jESVCZ6jPeOcLZqRGiyeAP+k3Mj5T6/tvMdSwN3xM=
SIZE (clutter/clutter-1.12.2.tar.xz) = 4996752

18
graphics/clutter/core/patches/patch-clutter_clutter-actor_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-clutter_clutter-actor_c,v 1.2 2012/09/27 12:07:00 jasper Exp $
From 696f1afc041cdc76293931cf90fee99f8a0aecd2 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue, 25 Sep 2012 08:05:39 +0000
Subject: actor: Fix transform-set condition
--- 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;

26
graphics/clutter/core/patches/patch-clutter_clutter-main_c
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-clutter_clutter-main_c,v 1.2 2012/10/05 16:44:27 jasper Exp $
From 0da0e5122e7526ada688beef22684bb0ed54a367 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 26 Sep 2012 08:45:46 +0000
Subject: main: Do not release the lock if it hasn't been acquired
--- clutter/clutter-main.c.orig Mon Sep 24 17:59:01 2012
+++ clutter/clutter-main.c Fri Oct 5 18:44:09 2012
@@ -226,6 +226,16 @@ clutter_threads_impl_lock (void)
static void
clutter_threads_impl_unlock (void)
{
+ /* we need to trylock here, in case the lock hasn't been acquired; on
+ * various systems trying to release a mutex that hasn't been acquired
+ * will cause a run-time error. trylock() will either fail, in which
+ * case we can release the lock we own; or it will succeeds, in which
+ * case we need to release the lock we just acquired. so we ignore the
+ * returned value.
+ *
+ * see: https://bugs.gnome.org/679439
+ */
+ g_mutex_trylock (&clutter_threads_mutex);
g_mutex_unlock (&clutter_threads_mutex);
}