1 |
commit: fbaebef276ef0676f3157115bb2b8c1d6d8077ac |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 26 03:19:24 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Sep 26 03:46:44 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fbaebef2 |
7 |
|
8 |
media-libs/cogl: 1.7.8 → 1.8.0 |
9 |
|
10 |
Version bump. Now comes with tests, which require virtualx.eclass. |
11 |
However, I cannot get those tests to actually run in Xvfb, at least on a |
12 |
machine with nvidia-drivers, no matter what I set in eselect-opengl. |
13 |
|
14 |
--- |
15 |
.../cogl/{cogl-1.7.8.ebuild => cogl-1.8.0.ebuild} | 12 +++++--- |
16 |
media-libs/cogl/cogl-9999.ebuild | 10 ++++++- |
17 |
.../cogl/files/cogl-1.7.8-rendrer-typo.patch | 28 -------------------- |
18 |
3 files changed, 16 insertions(+), 34 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/cogl/cogl-1.7.8.ebuild b/media-libs/cogl/cogl-1.8.0.ebuild |
21 |
similarity index 87% |
22 |
rename from media-libs/cogl/cogl-1.7.8.ebuild |
23 |
rename to media-libs/cogl/cogl-1.8.0.ebuild |
24 |
index 5bd32eb..adf4366 100644 |
25 |
--- a/media-libs/cogl/cogl-1.7.8.ebuild |
26 |
+++ b/media-libs/cogl/cogl-1.8.0.ebuild |
27 |
@@ -6,7 +6,7 @@ EAPI="4" |
28 |
CLUTTER_LA_PUNT="yes" |
29 |
|
30 |
# Inherit gnome2 after clutter to download sources from gnome.org |
31 |
-inherit eutils clutter gnome2 |
32 |
+inherit clutter gnome2 virtualx |
33 |
if [[ ${PV} = 9999 ]]; then |
34 |
inherit gnome2-live |
35 |
fi |
36 |
@@ -46,6 +46,10 @@ DEPEND="${COMMON_DEPEND} |
37 |
doc? ( app-text/docbook-xml-dtd:4.1.2 |
38 |
>=dev-util/gtk-doc-1.13 )" |
39 |
|
40 |
+# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no |
41 |
+# matter whether "eselect opengl" is set to nvidia or xorg-x11. |
42 |
+RESTRICT="test" |
43 |
+ |
44 |
pkg_setup() { |
45 |
DOCS="NEWS README" |
46 |
EXAMPLES="examples/{*.c,*.jpg}" |
47 |
@@ -61,10 +65,8 @@ pkg_setup() { |
48 |
$(use_enable pango cogl-pango)" |
49 |
} |
50 |
|
51 |
-src_prepare() { |
52 |
- # Upstream patch to fix a typo in cogl/cogl-display.h |
53 |
- epatch "${FILESDIR}/${P}-rendrer-typo.patch" |
54 |
- gnome2_src_prepare |
55 |
+src_test() { |
56 |
+ Xemake check |
57 |
} |
58 |
|
59 |
src_install() { |
60 |
|
61 |
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild |
62 |
index 9e5f6c4..adf4366 100644 |
63 |
--- a/media-libs/cogl/cogl-9999.ebuild |
64 |
+++ b/media-libs/cogl/cogl-9999.ebuild |
65 |
@@ -6,7 +6,7 @@ EAPI="4" |
66 |
CLUTTER_LA_PUNT="yes" |
67 |
|
68 |
# Inherit gnome2 after clutter to download sources from gnome.org |
69 |
-inherit clutter gnome2 |
70 |
+inherit clutter gnome2 virtualx |
71 |
if [[ ${PV} = 9999 ]]; then |
72 |
inherit gnome2-live |
73 |
fi |
74 |
@@ -46,6 +46,10 @@ DEPEND="${COMMON_DEPEND} |
75 |
doc? ( app-text/docbook-xml-dtd:4.1.2 |
76 |
>=dev-util/gtk-doc-1.13 )" |
77 |
|
78 |
+# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no |
79 |
+# matter whether "eselect opengl" is set to nvidia or xorg-x11. |
80 |
+RESTRICT="test" |
81 |
+ |
82 |
pkg_setup() { |
83 |
DOCS="NEWS README" |
84 |
EXAMPLES="examples/{*.c,*.jpg}" |
85 |
@@ -61,6 +65,10 @@ pkg_setup() { |
86 |
$(use_enable pango cogl-pango)" |
87 |
} |
88 |
|
89 |
+src_test() { |
90 |
+ Xemake check |
91 |
+} |
92 |
+ |
93 |
src_install() { |
94 |
clutter_src_install |
95 |
} |
96 |
|
97 |
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 |
98 |
deleted file mode 100644 |
99 |
index d48110d..0000000 |
100 |
--- a/media-libs/cogl/files/cogl-1.7.8-rendrer-typo.patch |
101 |
+++ /dev/null |
102 |
@@ -1,28 +0,0 @@ |
103 |
-From a1d869384eb9ba1c7d0c82194ec7cf80574efc8a Mon Sep 17 00:00:00 2001 |
104 |
-From: Chun-wei Fan <fanchunwei@×××××××××.org> |
105 |
-Date: Tue, 06 Sep 2011 07:32:15 +0000 |
106 |
-Subject: Fix typo in cogl/cogl-display.h |
107 |
- |
108 |
-The line "#define cogl_display_get_rendrer cogl_display_get_rendrer_EXP" |
109 |
-should read |
110 |
-"#define cogl_display_get_renderer cogl_display_get_renderer_EXP"... |
111 |
- |
112 |
-https://bugzilla.gnome.org/show_bug.cgi?id=658333 |
113 |
- |
114 |
-Reviewed-by: Emmanuele Bassi <ebassi@×××××××××××.com> |
115 |
---- |
116 |
-diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h |
117 |
-index 8cd215b..e0006a9 100644 |
118 |
---- a/cogl/cogl-display.h |
119 |
-+++ b/cogl/cogl-display.h |
120 |
-@@ -81,7 +81,7 @@ CoglDisplay * |
121 |
- cogl_display_new (CoglRenderer *renderer, |
122 |
- CoglOnscreenTemplate *onscreen_template); |
123 |
- |
124 |
--#define cogl_display_get_rendrer cogl_display_get_rendrer_EXP |
125 |
-+#define cogl_display_get_renderer cogl_display_get_renderer_EXP |
126 |
- CoglRenderer * |
127 |
- cogl_display_get_renderer (CoglDisplay *display); |
128 |
- |
129 |
--- |
130 |
-cgit v0.9.0.2 |