From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QllkX-0000Ny-5H for garchives@archives.gentoo.org; Tue, 26 Jul 2011 17:48:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 843E421C0DC; Tue, 26 Jul 2011 17:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2A84B21C0DC for ; Tue, 26 Jul 2011 17:48:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A1C71B4008 for ; Tue, 26 Jul 2011 17:48:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 944808003D for ; Tue, 26 Jul 2011 17:48:47 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <8990ddfe0d9e55e727c143b7dacb5937273005b5.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/ X-VCS-Repository: proj/gnome X-VCS-Files: media-libs/clutter/clutter-1.7.4-r1.ebuild media-libs/clutter/clutter-1.7.6.ebuild media-libs/clutter/clutter-9999.ebuild media-libs/clutter/files/clutter-1.7.4-cogl_egl_context.patch media-libs/clutter/files/clutter-1.7.4-cogl_set_default_context.patch media-libs/clutter/files/clutter-1.7.4-cogl_x11_onscreen.patch X-VCS-Directories: media-libs/clutter/ media-libs/clutter/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 8990ddfe0d9e55e727c143b7dacb5937273005b5 Date: Tue, 26 Jul 2011 17:48:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3e62b00928ba6eaaa682b3a980706012 commit: 8990ddfe0d9e55e727c143b7dacb5937273005b5 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jul 26 17:46:32 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jul 26 17:46:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8990ddfe media-libs/clutter: 1.7.4-r1 =E2=86=92 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 =3D> 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/clut= ter/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 =20 # NOTE: glx flavour uses libdrm + >=3Dmesa-7.3 # XXX: uprof needed for profiling +# >=3DlibX11-1.3.1 needed for X Generic Event support RDEPEND=3D" >=3Ddev-libs/glib-2.26:2 >=3Ddev-libs/atk-1.17[introspection?] @@ -35,7 +36,7 @@ RDEPEND=3D" =09 virtual/opengl x11-libs/libdrm - x11-libs/libX11 + >=3Dx11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage x11-proto/inputproto @@ -74,11 +75,6 @@ pkg_setup() { } =20 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 muc= h [[ ${PV} =3D 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in= " "${S}/po" =20 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 =20 # NOTE: glx flavour uses libdrm + >=3Dmesa-7.3 # XXX: uprof needed for profiling +# >=3DlibX11-1.3.1 needed for X Generic Event support RDEPEND=3D" >=3Ddev-libs/glib-2.26:2 >=3Ddev-libs/atk-1.17[introspection?] @@ -35,7 +36,7 @@ RDEPEND=3D" =09 virtual/opengl x11-libs/libdrm - x11-libs/libX11 + >=3Dx11-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.patc= h 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 -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; - } -=20 -- return cogl_context_egl_get_egl_display (backend_singleton->cogl_cont= ext); -+ return cogl_egl_context_get_egl_display (backend_singleton->cogl_cont= ext); - } - #endif -=20 --- -cgit v0.9 diff --git a/media-libs/clutter/files/clutter-1.7.4-cogl_set_default_cont= ext.patch b/media-libs/clutter/files/clutter-1.7.4-cogl_set_default_conte= xt.patch deleted file mode 100644 index acb9055..0000000 --- a/media-libs/clutter/files/clutter-1.7.4-cogl_set_default_context.pat= ch +++ /dev/null @@ -1,40 +0,0 @@ -From 71d0872b76ec6678f03fddf4731f394eaa06ba9f Mon Sep 17 00:00:00 2001 -From: Robert Bragg -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; -=20 -- /* 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; -=20 - error: -diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutt= er-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 (ClutterBacken= d *backend, - if (!backend->cogl_context) - goto error; -=20 -- /* 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; -=20 - error: --- -cgit v0.9 diff --git a/media-libs/clutter/files/clutter-1.7.4-cogl_x11_onscreen.pat= ch 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 -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__blah to be consistent with other platform -specific APIs so they are now named like cogl__onscreen_blah. -This makes the corresponding change to clutter. ---- -diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-st= age-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 *stag= e_window) - #ifdef COGL_HAS_XLIB_SUPPORT - if (stage_x11->xwin !=3D 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_upda= te_foreign_event_mask, - stage_x11); -@@ -160,7 +160,7 @@ clutter_stage_cogl_realize (ClutterStageWindow *stag= e_window) -=20 - #ifdef COGL_HAS_XLIB_SUPPORT - if (stage_x11->xwin =3D=3D None) -- stage_x11->xwin =3D cogl_onscreen_x11_get_window_xid (stage_cogl->o= nscreen); -+ stage_x11->xwin =3D cogl_x11_onscreen_get_window_xid (stage_cogl->o= nscreen); -=20 - return clutter_stage_window_parent_iface->realize (stage_window); - #else --- -cgit v0.9