aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2015-05-12 19:59:48 +0200
committerGilles Dartiguelongue <eva@gentoo.org>2015-05-12 20:02:18 +0200
commit70b354bc22ad67d1aadce6cac17f8be6cc771839 (patch)
tree2fd8f25751106de6e91f35daf379d6ed43b9369c /media-libs
parentgnome-extra/gnome-packagekit: remove marshalled files cleanup (diff)
downloadgnome-70b354bc22ad67d1aadce6cac17f8be6cc771839.tar.gz
gnome-70b354bc22ad67d1aadce6cac17f8be6cc771839.tar.bz2
gnome-70b354bc22ad67d1aadce6cac17f8be6cc771839.zip
media-libs/clutter: fix clutter initialization errors
made cheese unittests fail.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/clutter/Manifest12
-rw-r--r--media-libs/clutter/clutter-1.22.0.ebuild5
-rw-r--r--media-libs/clutter/files/clutter-1.22.0-init-fixes.patch43
3 files changed, 58 insertions, 2 deletions
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 50e3c795..2f0cf7f6 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,8 +1,11 @@
-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
DIST clutter-1.22.0.tar.xz 5303728 SHA256 5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54 SHA512 1290e29168c3a00bf4fb0685e6269f59c772b208b0bd126ad30d652674454d2043eca26ba8abb8021138a813404cb3ca75fb57e691e32957238488f3d77a1d5b WHIRLPOOL d3568f72147b5f5119dfd86f1ea76b4718e393e5916b737c833290ccfd91b49f6a273c72c643ae166fabfcdc85f772bb255a6a0c7a6817186e61298f20f3d6b9
------BEGIN PGP SIGNATURE-----
+- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAEBCAAGBQJVMASeAAoJEOnlaGd+i01CRLIH/jQ/di8kPPpxtxD2pa2wy5zV
@@ -12,4 +15,11 @@ E8rvG5aKzg8r5fs33gzvHtCu7zrjNQD75DnbqNQSeBsY2uDqlwgw2jMgxwPcr6TK
ZvqA9eAMz7dak4d9Ph9N0bmplA1vNUlQtV3aEonP0KW61ANdnTozJEeJoCCIoAWL
2buLtcSFoVQAsCiGvpCTg1DdxA6K1CNEHY+l8KwDQ16x609tZ62hUMuOYScm+pc=
=KlWT
+- -----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREKAAYFAlVSP5UACgkQ1fmVwcYIWAaETACg032gXbour7filk/gZuybaUej
+wbkAoJEd/BT3YtkGPNgXJS/hdWnoBddQ
+=p9O8
-----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.22.0.ebuild b/media-libs/clutter/clutter-1.22.0.ebuild
index 31e329b1..a1b6dda7 100644
--- a/media-libs/clutter/clutter-1.22.0.ebuild
+++ b/media-libs/clutter/clutter-1.22.0.ebuild
@@ -75,6 +75,9 @@ src_prepare() {
sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility conform/g' \
-i tests/Makefile.in || die "in tests sed failed"
+ # Fix init issues when run under Xvfb for example, upstream #749256 (master)
+ epatch "${FILESDIR}"/${PN}-1.22.0-init-fixes.patch
+
gnome2_src_prepare
}
@@ -105,5 +108,5 @@ src_configure() {
}
src_test() {
- Xemake check -C tests/conform
+ LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check -C tests/conform
}
diff --git a/media-libs/clutter/files/clutter-1.22.0-init-fixes.patch b/media-libs/clutter/files/clutter-1.22.0-init-fixes.patch
new file mode 100644
index 00000000..cc864521
--- /dev/null
+++ b/media-libs/clutter/files/clutter-1.22.0-init-fixes.patch
@@ -0,0 +1,43 @@
+From 438d739442be9e646caa2100942543301666074d Mon Sep 17 00:00:00 2001
+From: Matthieu Bouron <matthieu.bouron@collabora.com>
+Date: Tue, 12 May 2015 11:16:35 +0200
+Subject: [PATCH] clutter-backend-gdk: Only set setting on successful
+ gdk_screen_get_setting call
+
+It could happen that gdk_screen_get_setting fails to retreive
+Gdk/WindowScalingFactor which leads to the following warnings when
+clutter_init is called:
+
+GLib-GObject-WARNING **: value "0" of type 'gint' is invalid or out of range for property 'window-scaling-factor' of type 'gint'
+GLib-GObject-WARNING **: value "0" of type 'gint' is invalid or out of range for property 'dnd-drag-threshold' of type 'gint'
+---
+ clutter/gdk/clutter-backend-gdk.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c
+index b4f7f1c..1e67c07 100644
+--- a/clutter/gdk/clutter-backend-gdk.c
++++ b/clutter/gdk/clutter-backend-gdk.c
+@@ -94,12 +94,14 @@ clutter_backend_gdk_init_settings (ClutterBackendGdk *backend_gdk)
+ GValue val = G_VALUE_INIT;
+
+ g_value_init (&val, CLUTTER_SETTING_TYPE(i));
+- gdk_screen_get_setting (backend_gdk->screen,
++ if (gdk_screen_get_setting (backend_gdk->screen,
+ CLUTTER_SETTING_GDK_NAME(i),
+- &val);
+- clutter_settings_set_property_internal (settings,
+- CLUTTER_SETTING_PROPERTY (i),
+- &val);
++ &val))
++ {
++ clutter_settings_set_property_internal (settings,
++ CLUTTER_SETTING_PROPERTY (i),
++ &val);
++ }
+ g_value_unset (&val);
+ }
+ }
+--
+2.3.7
+