* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/
@ 2011-07-26 17:48 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-26 17:48 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/
@ 2011-07-06 16:17 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-06 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 427dd31249a7368f349924109aab99c5fc09b299
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 6 16:15:26 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 6 16:15:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=427dd312
media-libs/clutter: 1.7.2-r1 → 1.7.4
Version bump with numerous changes. Cogl-1.7.2 patch no longer needed.
Fix tests/Makefile.in sed to handle two-line SUBDIRS.
---
...lutter-1.7.2-r1.ebuild => clutter-1.7.4.ebuild} | 7 +--
media-libs/clutter/clutter-9999.ebuild | 2 +-
.../files/clutter-1.7.2-cogl-1.7.2-xlib.patch | 46 --------------------
3 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/media-libs/clutter/clutter-1.7.2-r1.ebuild b/media-libs/clutter/clutter-1.7.4.ebuild
similarity index 93%
rename from media-libs/clutter/clutter-1.7.2-r1.ebuild
rename to media-libs/clutter/clutter-1.7.4.ebuild
index 41eda9e..190f2ad 100644
--- a/media-libs/clutter/clutter-1.7.2-r1.ebuild
+++ b/media-libs/clutter/clutter-1.7.4.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOMAKE="1.11"
# Inherit gnome2 after clutter to download sources from gnome.org
# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter eutils gnome2
+inherit clutter gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -74,9 +74,6 @@ pkg_setup() {
}
src_prepare() {
- # cogl-1.7.2 compatibility, will be in next release
- epatch "${FILESDIR}/${P}-cogl-1.7.2-xlib.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"
@@ -85,7 +82,7 @@ src_prepare() {
# We only need conformance tests, the rest are useless for us
sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-i tests/Makefile.am || die "am tests sed failed"
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+ sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
-i tests/Makefile.in || die "in tests sed failed"
}
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 609f0ae..190f2ad 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
# We only need conformance tests, the rest are useless for us
sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-i tests/Makefile.am || die "am tests sed failed"
- sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+ sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
-i tests/Makefile.in || die "in tests sed failed"
}
diff --git a/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch b/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch
deleted file mode 100644
index 55ddaeb..0000000
--- a/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bc34b4ace42cac34b966cc5fa357452d23c86d5b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 1 Jul 2011 16:04:37 -0400
-Subject: [PATCH] backend-cogl: update in line with Cogl API change
-
-cogl_renderer_xlib_set_foreign_display was renamed to
-cogl_xlib_renderer_set_foriegn_display so this is the corresponding
-change to clutter.
-
-Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: backported to clutter-1.7.2]
----
- clutter/egl/clutter-backend-egl.c | 2 +-
- clutter/glx/clutter-backend-glx.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/clutter/egl/clutter-backend-egl.c b/clutter/egl/clutter-backend-egl.c
-index 601b4bf..ff1cd2c 100644
---- a/clutter/egl/clutter-backend-egl.c
-+++ b/clutter/egl/clutter-backend-egl.c
-@@ -300,7 +300,7 @@ clutter_backend_egl_create_context (ClutterBackend *backend,
-
- backend->cogl_renderer = cogl_renderer_new ();
- #ifdef COGL_HAS_XLIB_SUPPORT
-- cogl_renderer_xlib_set_foreign_display (backend->cogl_renderer,
-+ cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer,
- backend_x11->xdpy);
- #endif
- if (!cogl_renderer_connect (backend->cogl_renderer, error))
-diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c
-index 76f48ee..03cfb1c 100644
---- a/clutter/glx/clutter-backend-glx.c
-+++ b/clutter/glx/clutter-backend-glx.c
-@@ -243,7 +243,7 @@ clutter_backend_glx_create_context (ClutterBackend *backend,
- return TRUE;
-
- backend->cogl_renderer = cogl_renderer_new ();
-- cogl_renderer_xlib_set_foreign_display (backend->cogl_renderer,
-+ cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer,
- backend_x11->xdpy);
- if (!cogl_renderer_connect (backend->cogl_renderer, error))
- goto error;
---
-1.7.6
-
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/
@ 2011-07-01 20:13 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-01 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 752cd2ba884a74ae0b33a2d6b9b09811bff79399
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 1 20:12:04 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 1 20:12:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=752cd2ba
media-libs/clutter: cogl-1.7.2 update
Live clutter depends on cogl-1.7.2; add a patch to clutter-1.7.2 for
cogl-1.7.2 compatibility.
---
...lutter-1.7.2.ebuild => clutter-1.7.2-r1.ebuild} | 7 ++-
media-libs/clutter/clutter-9999.ebuild | 2 +-
.../files/clutter-1.7.2-cogl-1.7.2-xlib.patch | 46 ++++++++++++++++++++
3 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/media-libs/clutter/clutter-1.7.2.ebuild b/media-libs/clutter/clutter-1.7.2-r1.ebuild
similarity index 92%
rename from media-libs/clutter/clutter-1.7.2.ebuild
rename to media-libs/clutter/clutter-1.7.2-r1.ebuild
index 89a5390..41eda9e 100644
--- a/media-libs/clutter/clutter-1.7.2.ebuild
+++ b/media-libs/clutter/clutter-1.7.2-r1.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOMAKE="1.11"
# Inherit gnome2 after clutter to download sources from gnome.org
# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter gnome2
+inherit clutter eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -29,7 +29,7 @@ RDEPEND="
>=dev-libs/glib-2.26:2
>=dev-libs/atk-1.17[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.6.0:1.0[introspection?,pango]
+ >=media-libs/cogl-1.7.2:1.0[introspection?,pango]
>=x11-libs/cairo-1.10[glib]
>=x11-libs/pango-1.20[introspection?]
@@ -74,6 +74,9 @@ pkg_setup() {
}
src_prepare() {
+ # cogl-1.7.2 compatibility, will be in next release
+ epatch "${FILESDIR}/${P}-cogl-1.7.2-xlib.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 89a5390..609f0ae 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
>=dev-libs/glib-2.26:2
>=dev-libs/atk-1.17[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.6.0:1.0[introspection?,pango]
+ >=media-libs/cogl-1.7.2:1.0[introspection?,pango]
>=x11-libs/cairo-1.10[glib]
>=x11-libs/pango-1.20[introspection?]
diff --git a/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch b/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch
new file mode 100644
index 0000000..55ddaeb
--- /dev/null
+++ b/media-libs/clutter/files/clutter-1.7.2-cogl-1.7.2-xlib.patch
@@ -0,0 +1,46 @@
+From bc34b4ace42cac34b966cc5fa357452d23c86d5b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 1 Jul 2011 16:04:37 -0400
+Subject: [PATCH] backend-cogl: update in line with Cogl API change
+
+cogl_renderer_xlib_set_foreign_display was renamed to
+cogl_xlib_renderer_set_foriegn_display so this is the corresponding
+change to clutter.
+
+Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: backported to clutter-1.7.2]
+---
+ clutter/egl/clutter-backend-egl.c | 2 +-
+ clutter/glx/clutter-backend-glx.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clutter/egl/clutter-backend-egl.c b/clutter/egl/clutter-backend-egl.c
+index 601b4bf..ff1cd2c 100644
+--- a/clutter/egl/clutter-backend-egl.c
++++ b/clutter/egl/clutter-backend-egl.c
+@@ -300,7 +300,7 @@ clutter_backend_egl_create_context (ClutterBackend *backend,
+
+ backend->cogl_renderer = cogl_renderer_new ();
+ #ifdef COGL_HAS_XLIB_SUPPORT
+- cogl_renderer_xlib_set_foreign_display (backend->cogl_renderer,
++ cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer,
+ backend_x11->xdpy);
+ #endif
+ if (!cogl_renderer_connect (backend->cogl_renderer, error))
+diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c
+index 76f48ee..03cfb1c 100644
+--- a/clutter/glx/clutter-backend-glx.c
++++ b/clutter/glx/clutter-backend-glx.c
+@@ -243,7 +243,7 @@ clutter_backend_glx_create_context (ClutterBackend *backend,
+ return TRUE;
+
+ backend->cogl_renderer = cogl_renderer_new ();
+- cogl_renderer_xlib_set_foreign_display (backend->cogl_renderer,
++ cogl_xlib_renderer_set_foreign_display (backend->cogl_renderer,
+ backend_x11->xdpy);
+ if (!cogl_renderer_connect (backend->cogl_renderer, error))
+ goto error;
+--
+1.7.6
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-26 17:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-26 17:48 [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/clutter/, media-libs/clutter/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-07-06 16:17 Alexandre Restovtsev
2011-07-01 20:13 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox