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

[Alexandre Restovtsev]

commit:     fbaebef276ef0676f3157115bb2b8c1d6d8077ac
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 03:19:24 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 03:46:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fbaebef2

media-libs/cogl: 1.7.8 → 1.8.0

Version bump. Now comes with tests, which require virtualx.eclass.
However, I cannot get those tests to actually run in Xvfb, at least on a
machine with nvidia-drivers, no matter what I set in eselect-opengl.

---
 .../cogl/{cogl-1.7.8.ebuild => cogl-1.8.0.ebuild}  |   12 +++++---
 media-libs/cogl/cogl-9999.ebuild                   |   10 ++++++-
 .../cogl/files/cogl-1.7.8-rendrer-typo.patch       |   28 --------------------
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/media-libs/cogl/cogl-1.7.8.ebuild b/media-libs/cogl/cogl-1.8.0.ebuild
similarity index 87%
rename from media-libs/cogl/cogl-1.7.8.ebuild
rename to media-libs/cogl/cogl-1.8.0.ebuild
index 5bd32eb..adf4366 100644
--- a/media-libs/cogl/cogl-1.7.8.ebuild
+++ b/media-libs/cogl/cogl-1.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2
+inherit clutter gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -46,6 +46,10 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.13 )"
 
+# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no
+# matter whether "eselect opengl" is set to nvidia or xorg-x11.
+RESTRICT="test"
+
 pkg_setup() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,*.jpg}"
@@ -61,10 +65,8 @@ pkg_setup() {
 		$(use_enable pango cogl-pango)"
 }
 
-src_prepare() {
-	# Upstream patch to fix a typo in cogl/cogl-display.h
-	epatch "${FILESDIR}/${P}-rendrer-typo.patch"
-	gnome2_src_prepare
+src_test() {
+	Xemake check
 }
 
 src_install() {

diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 9e5f6c4..adf4366 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2
+inherit clutter gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -46,6 +46,10 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.13 )"
 
+# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no
+# matter whether "eselect opengl" is set to nvidia or xorg-x11.
+RESTRICT="test"
+
 pkg_setup() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,*.jpg}"
@@ -61,6 +65,10 @@ pkg_setup() {
 		$(use_enable pango cogl-pango)"
 }
 
+src_test() {
+	Xemake check
+}
+
 src_install() {
 	clutter_src_install
 }

diff --git a/media-libs/cogl/files/cogl-1.7.8-rendrer-typo.patch b/media-libs/cogl/files/cogl-1.7.8-rendrer-typo.patch
deleted file mode 100644
index d48110d..0000000
--- a/media-libs/cogl/files/cogl-1.7.8-rendrer-typo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a1d869384eb9ba1c7d0c82194ec7cf80574efc8a Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@×××××××××.org>
-Date: Tue, 06 Sep 2011 07:32:15 +0000
-Subject: Fix typo in cogl/cogl-display.h
-
-The line "#define cogl_display_get_rendrer cogl_display_get_rendrer_EXP"
-should read
-"#define cogl_display_get_renderer cogl_display_get_renderer_EXP"...
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658333
-
-Reviewed-by: Emmanuele Bassi <ebassi@×××××××××××.com>
----
-diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h
-index 8cd215b..e0006a9 100644
---- a/cogl/cogl-display.h
-+++ b/cogl/cogl-display.h
-@@ -81,7 +81,7 @@ CoglDisplay *
- cogl_display_new (CoglRenderer *renderer,
-                   CoglOnscreenTemplate *onscreen_template);
- 
--#define cogl_display_get_rendrer cogl_display_get_rendrer_EXP
-+#define cogl_display_get_renderer cogl_display_get_renderer_EXP
- CoglRenderer *
- cogl_display_get_renderer (CoglDisplay *display);
- 
---
-cgit v0.9.0.2