[gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     8990ddfe0d9e55e727c143b7dacb5937273005b5
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 17:46:32 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 17:46:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8990ddfe

media-libs/clutter: 1.7.4-r1 → 1.7.6

Version bump with numerous improvements, now doesn't clobber XI2 events
(when using libX11-1.3.1 and higher). Cogl API patches no longer needed.

---
 ...lutter-1.7.4-r1.ebuild => clutter-1.7.6.ebuild} |    8 +---
 media-libs/clutter/clutter-9999.ebuild             |    3 +-
 .../files/clutter-1.7.4-cogl_egl_context.patch     |   24 ------------
 .../clutter-1.7.4-cogl_set_default_context.patch   |   40 --------------------
 .../files/clutter-1.7.4-cogl_x11_onscreen.patch    |   34 -----------------
 5 files changed, 4 insertions(+), 105 deletions(-)

diff --git a/media-libs/clutter/clutter-1.7.4-r1.ebuild b/media-libs/clutter/clutter-1.7.6.ebuild
similarity index 91%
rename from media-libs/clutter/clutter-1.7.4-r1.ebuild
rename to media-libs/clutter/clutter-1.7.6.ebuild
index 9dc0602..ba4f8ea 100644
--- a/media-libs/clutter/clutter-1.7.4-r1.ebuild
+++ b/media-libs/clutter/clutter-1.7.6.ebuild
@@ -25,6 +25,7 @@ fi
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # XXX: uprof needed for profiling
+# >=libX11-1.3.1 needed for X Generic Event support
 RDEPEND="
 	>=dev-libs/glib-2.26:2
 	>=dev-libs/atk-1.17[introspection?]
@@ -35,7 +36,7 @@ RDEPEND="
 	
 	virtual/opengl
 	x11-libs/libdrm
-	x11-libs/libX11
+	>=x11-libs/libX11-1.3.1
 	x11-libs/libXext
 	x11-libs/libXdamage
 	x11-proto/inputproto
@@ -74,11 +75,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# cogl-1.7.4 compatibility patches, will be in next release
-	epatch "${FILESDIR}/${P}-cogl_set_default_context.patch"
-	epatch "${FILESDIR}/${P}-cogl_egl_context.patch"
-	epatch "${FILESDIR}/${P}-cogl_x11_onscreen.patch"
-
 	# Some gettext stuff, we can't run gettextize because that does too much
 	[[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
 

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index fa6e34a..19636f9 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -25,6 +25,7 @@ fi
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # XXX: uprof needed for profiling
+# >=libX11-1.3.1 needed for X Generic Event support
 RDEPEND="
 	>=dev-libs/glib-2.26:2
 	>=dev-libs/atk-1.17[introspection?]
@@ -35,7 +36,7 @@ RDEPEND="
 	
 	virtual/opengl
 	x11-libs/libdrm
-	x11-libs/libX11
+	>=x11-libs/libX11-1.3.1
 	x11-libs/libXext
 	x11-libs/libXdamage
 	x11-proto/inputproto

diff --git a/media-libs/clutter/files/clutter-1.7.4-cogl_egl_context.patch b/media-libs/clutter/files/clutter-1.7.4-cogl_egl_context.patch
deleted file mode 100644
index 630566e..0000000
--- a/media-libs/clutter/files/clutter-1.7.4-cogl_egl_context.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d182d5a1714be65004e6c68c347a7f45deaf47d8 Mon Sep 17 00:00:00 2001
-From: Robert Bragg <robert@linux.intel.com>
-Date: Fri, 01 Jul 2011 00:50:30 +0000
-Subject: backend-cogl: update _get_egl_context symbol name
-
-Cogl changed has changed the name of cogl_context_egl_get_egl_context to
-cogl_egl_context_get_egl_context to be consistent with other platform
-specific symbols.
----
-diff --git a/clutter/cogl/clutter-backend-cogl.c b/clutter/cogl/clutter-backend-cogl.c
-index c97448c..1ca8850 100644
---- a/clutter/cogl/clutter-backend-cogl.c
-+++ b/clutter/cogl/clutter-backend-cogl.c
-@@ -504,7 +504,7 @@ clutter_egl_get_egl_display (void)
-       return 0;
-     }
- 
--  return cogl_context_egl_get_egl_display (backend_singleton->cogl_context);
-+  return cogl_egl_context_get_egl_display (backend_singleton->cogl_context);
- }
- #endif
- 
---
-cgit v0.9

diff --git a/media-libs/clutter/files/clutter-1.7.4-cogl_set_default_context.patch b/media-libs/clutter/files/clutter-1.7.4-cogl_set_default_context.patch
deleted file mode 100644
index acb9055..0000000
--- a/media-libs/clutter/files/clutter-1.7.4-cogl_set_default_context.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 71d0872b76ec6678f03fddf4731f394eaa06ba9f Mon Sep 17 00:00:00 2001
-From: Robert Bragg <robert@linux.intel.com>
-Date: Fri, 01 Jul 2011 00:44:13 +0000
-Subject: don't call cogl_set_default_context since it's been removed
-
-cogl_set_default_context has been removed from Cogl so this updates
-Clutter in-line with that change.
----
-diff --git a/clutter/cogl/clutter-backend-cogl.c b/clutter/cogl/clutter-backend-cogl.c
-index a712a4e..c97448c 100644
---- a/clutter/cogl/clutter-backend-cogl.c
-+++ b/clutter/cogl/clutter-backend-cogl.c
-@@ -347,10 +347,6 @@ clutter_backend_cogl_create_context (ClutterBackend  *backend,
-   if (!backend->cogl_context)
-     goto error;
- 
--  /* XXX: eventually this should go away but a lot of Cogl code still
--   * depends on a global default context. */
--  cogl_set_default_context (backend->cogl_context);
--
-   return TRUE;
- 
- error:
-diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutter-backend-win32.c
-index 220d517..b16e10e 100644
---- a/clutter/win32/clutter-backend-win32.c
-+++ b/clutter/win32/clutter-backend-win32.c
-@@ -252,10 +252,6 @@ clutter_backend_win32_create_context (ClutterBackend  *backend,
-   if (!backend->cogl_context)
-     goto error;
- 
--  /* XXX: eventually this should go away but a lot of Cogl code still
--   * depends on a global default context. */
--  cogl_set_default_context (backend->cogl_context);
--
-   return TRUE;
- 
- error:
---
-cgit v0.9

diff --git a/media-libs/clutter/files/clutter-1.7.4-cogl_x11_onscreen.patch b/media-libs/clutter/files/clutter-1.7.4-cogl_x11_onscreen.patch
deleted file mode 100644
index c0abc2b..0000000
--- a/media-libs/clutter/files/clutter-1.7.4-cogl_x11_onscreen.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ab6be41ea043065424cb494ec80d4242812e2488 Mon Sep 17 00:00:00 2001
-From: Robert Bragg <robert@linux.intel.com>
-Date: Mon, 04 Jul 2011 14:12:20 +0000
-Subject: build: update cogl_onscreen_x11 syms to cogl_x11_onscreen
-
-Cogl recently renamed symbols with the form
-cogl_onscreen_<platform>_blah to be consistent with other platform
-specific APIs so they are now named like cogl_<platform>_onscreen_blah.
-This makes the corresponding change to clutter.
----
-diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
-index a39c03e..111605e 100644
---- a/clutter/cogl/clutter-stage-cogl.c
-+++ b/clutter/cogl/clutter-stage-cogl.c
-@@ -124,7 +124,7 @@ clutter_stage_cogl_realize (ClutterStageWindow *stage_window)
- #ifdef COGL_HAS_XLIB_SUPPORT
-   if (stage_x11->xwin != None)
-     {
--      cogl_onscreen_x11_set_foreign_window_xid (stage_cogl->onscreen,
-+      cogl_x11_onscreen_set_foreign_window_xid (stage_cogl->onscreen,
-                                                 stage_x11->xwin,
-                                                 _clutter_stage_x11_update_foreign_event_mask,
-                                                 stage_x11);
-@@ -160,7 +160,7 @@ clutter_stage_cogl_realize (ClutterStageWindow *stage_window)
- 
- #ifdef COGL_HAS_XLIB_SUPPORT
-   if (stage_x11->xwin == None)
--    stage_x11->xwin = cogl_onscreen_x11_get_window_xid (stage_cogl->onscreen);
-+    stage_x11->xwin = cogl_x11_onscreen_get_window_xid (stage_cogl->onscreen);
- 
-   return clutter_stage_window_parent_iface->realize (stage_window);
- #else
---
-cgit v0.9