commit: 9390e14b24d49f4ea1ddbce798be9589c89bedf7
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 19:14:50 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 19:14:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9390e14b
media-libs/clutter: 1.22.0 → 1.22.2
...clutter-1.22.0.ebuild => clutter-1.22.2.ebuild} | 7 +---
media-libs/clutter/clutter-9999.ebuild | 17 ++++-----
.../clutter/files/clutter-1.22.0-init-fixes.patch | 43 ----------------------
3 files changed, 10 insertions(+), 57 deletions(-)
diff --git a/media-libs/clutter/clutter-1.22.0.ebuild
b/media-libs/clutter/clutter-1.22.2.ebuild
similarity index 89%
rename from media-libs/clutter/clutter-1.22.0.ebuild
rename to media-libs/clutter/clutter-1.22.2.ebuild
index a1b6dda..12733d0 100644
--- a/media-libs/clutter/clutter-1.22.0.ebuild
+++ b/media-libs/clutter/clutter-1.22.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.20.0.ebuild,v
1.4 2015/03/15 13:28:34 pacho Exp $
+# $Header: $
EAPI="5"
GCONF_DEBUG="no"
@@ -75,9 +75,6 @@ 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
}
@@ -108,5 +105,5 @@ src_configure() {
}
src_test() {
- LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check -C
tests/conform
+ Xemake check -C tests/conform
}
diff --git a/media-libs/clutter/clutter-9999.ebuild
b/media-libs/clutter/clutter-9999.ebuild
index ba7c84a..266b765 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -28,28 +28,27 @@ else
fi
# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# XXX: uprof needed for profiling
# >=libX11-1.3.1 needed for X Generic Event support
# do not depend on tslib, it does not build and is disable by default upstream
RDEPEND="
- >=dev-libs/glib-2.37.3:2
+ >=dev-libs/glib-2.39.0:2
>=dev-libs/atk-2.5.3[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.17.5:1.0=[introspection?,pango,wayland?]
- >=x11-libs/cairo-1.12:=[aqua?,glib]
+ >=media-libs/cogl-1.20.0:1.0=[introspection?,pango,wayland?]
+ >=x11-libs/cairo-1.14:=[aqua?,glib]
>=x11-libs/pango-1.30[introspection?]
virtual/opengl
x11-libs/libdrm:=
egl? (
- >=dev-libs/libinput-0.4
+ >=dev-libs/libinput-0.8
media-libs/cogl[gles2,kms]
>=virtual/libgudev-136
x11-libs/libxkbcommon
)
gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+ introspection? ( >=dev-libs/gobject-introspection-1.39 )
X? (
media-libs/fontconfig
>=x11-libs/libX11-1.3.1
@@ -89,11 +88,11 @@ src_prepare() {
src_configure() {
# XXX: Conformance test suite (and clutter itself) does not work under
Xvfb
# (GLX error blabla)
- # XXX: Profiling, coverage disabled for now
+ # XXX: coverage disabled for now
# XXX: What about cex100/win32 backends?
gnome2_src_configure \
- --disable-profile \
--disable-maintainer-flags \
+ --disable-mir-backend \
--disable-gcov \
--disable-cex100-backend \
--disable-win32-backend \
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
deleted file mode 100644
index cc86452..0000000
--- a/media-libs/clutter/files/clutter-1.22.0-init-fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 438d739442be9e646caa2100942543301666074d Mon Sep 17 00:00:00 2001
-From: Matthieu Bouron <matthieu.bou...@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
-
