* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/cogl/, media-libs/cogl/files/
@ 2011-08-15 8:17 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-08-15 8:17 UTC (permalink / raw
To: gentoo-commits
commit: a4f2f20c7f3795859b69548d0bbff02b4cc300e6
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 08:13:38 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Aug 15 08:13:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a4f2f20c
media-libs/cogl: 1.7.4 → 1.7.6
Version bump with various bugfixes and support for cogl.conf config
files. Link order patch was applied upstream. Also, for reasons unknown,
the 1.7.6 tarball was only uploaded to clutter-project.org, not to
gnome.org. Need to see if this situation becomes permanent.
---
.../cogl/{cogl-1.7.4.ebuild => cogl-1.7.6.ebuild} | 15 ++----
.../files/cogl-1.7.4-make-install-link-order.patch | 50 --------------------
2 files changed, 4 insertions(+), 61 deletions(-)
diff --git a/media-libs/cogl/cogl-1.7.4.ebuild b/media-libs/cogl/cogl-1.7.6.ebuild
similarity index 81%
rename from media-libs/cogl/cogl-1.7.4.ebuild
rename to media-libs/cogl/cogl-1.7.6.ebuild
index 96d0f7c..b5b0c9b 100644
--- a/media-libs/cogl/cogl-1.7.4.ebuild
+++ b/media-libs/cogl/cogl-1.7.6.ebuild
@@ -5,9 +5,10 @@
EAPI="4"
CLUTTER_LA_PUNT="yes"
-# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
-inherit autotools clutter eutils gnome2
+# Normally, inherit gnome2 after clutter to download sources from gnome.org
+inherit clutter gnome2
+# XXX: but 1.7.6 wasn't uploaded to gnome.org for some reason :/
+SRC_URI="http://www.clutter-project.org/sources/${PN}/1.7/${P}.tar.xz"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -62,14 +63,6 @@ pkg_setup() {
$(use_enable pango cogl-pango)"
}
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=655026
- epatch "${FILESDIR}/${PN}-1.7.4-make-install-link-order.patch"
- eautoreconf
-
- gnome2_src_prepare
-}
-
src_install() {
clutter_src_install
}
diff --git a/media-libs/cogl/files/cogl-1.7.4-make-install-link-order.patch b/media-libs/cogl/files/cogl-1.7.4-make-install-link-order.patch
deleted file mode 100644
index 4786612..0000000
--- a/media-libs/cogl/files/cogl-1.7.4-make-install-link-order.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e70f5a11359c23d9d7424edeffd5cc0d1fa7722d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 21 Jul 2011 01:09:04 -0400
-Subject: [PATCH] cogl-pango: prevent linking to systemwide libcogl during
- make install (#655026)
-
-At the moment, on make install, libcogl-pango will link to the
-version of libcogl that is installed systemwide. This leads to
-interesting problems when the version installed systemwide is
-incompatible with the version of cogl being built.
-
-E.g., when building cogl-1.7.4 (with --enable-cogl-pango and
---prefix=/usr) on a system that has cogl-1.7.2 installed in /usr:
-
-$ make
-[...]
-$ ldd cogl-pango/.libs/libcogl-pango.so | grep cogl
- libcogl.so.2 => /var/tmp/cogl-1.7.4/cogl/.libs/libcogl.so.2 (0x00007eff4bfb2000)
-$ make DESTDIR=/var/tmp/cogl-1.7.4/dest install
-[...]
-$ ldd /var/tmp/cogl-1.7.4/dest/usr/lib64/libcogl-pango.so | grep cogl
- libcogl.so.1 => /usr/lib64/libcogl.so.1 (0x00007f4647747000)
-
-This problem can be avoided by reordering libcogl_pango_la_LIBADD
-to ensure that during make installs' relinking phase, libtool looks
-at the libcogl in the build directory before the systemwide libcogl.
-
-Addresses Gnome bug #655026.
----
- cogl-pango/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
-index afd96d6..9805c58 100644
---- a/cogl-pango/Makefile.am
-+++ b/cogl-pango/Makefile.am
-@@ -28,8 +28,8 @@ lib_LTLIBRARIES = libcogl-pango.la
-
- libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
- libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
--libcogl_pango_la_LIBADD = $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
--libcogl_pango_la_LIBADD += $(top_builddir)/cogl/libcogl.la
-+libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la
-+libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
- libcogl_pango_la_LDFLAGS = \
- -export-dynamic \
- -export-symbols-regex "^cogl_pango_.*"
---
-1.7.6
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/cogl/, media-libs/cogl/files/
@ 2011-09-07 21:30 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-07 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 4f9179133b18c2f1482b563ded09dfce054933cc
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 7 20:50:20 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 7 20:50:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4f917913
media-libs/cogl: 1.7.6 → 1.7.8
Version bump, includes lots of optimizations. Add a patch to fix a typo
in a header file.
---
.../cogl/{cogl-1.7.6.ebuild => cogl-1.7.8.ebuild} | 12 +++++---
media-libs/cogl/cogl-9999.ebuild | 1 -
.../cogl/files/cogl-1.7.8-rendrer-typo.patch | 28 ++++++++++++++++++++
3 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/media-libs/cogl/cogl-1.7.6.ebuild b/media-libs/cogl/cogl-1.7.8.ebuild
similarity index 86%
rename from media-libs/cogl/cogl-1.7.6.ebuild
rename to media-libs/cogl/cogl-1.7.8.ebuild
index b5b0c9b..5bd32eb 100644
--- a/media-libs/cogl/cogl-1.7.6.ebuild
+++ b/media-libs/cogl/cogl-1.7.8.ebuild
@@ -5,10 +5,8 @@
EAPI="4"
CLUTTER_LA_PUNT="yes"
-# Normally, inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2
-# XXX: but 1.7.6 wasn't uploaded to gnome.org for some reason :/
-SRC_URI="http://www.clutter-project.org/sources/${PN}/1.7/${P}.tar.xz"
+# Inherit gnome2 after clutter to download sources from gnome.org
+inherit eutils clutter gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -63,6 +61,12 @@ 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_install() {
clutter_src_install
}
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index a61e7f4..9e5f6c4 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -6,7 +6,6 @@ EAPI="4"
CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
inherit clutter gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
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
new file mode 100644
index 0000000..d48110d
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.7.8-rendrer-typo.patch
@@ -0,0 +1,28 @@
+From a1d869384eb9ba1c7d0c82194ec7cf80574efc8a Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei@src.gnome.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@linux.intel.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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/cogl/, media-libs/cogl/files/
@ 2011-09-26 4:46 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26 4:46 UTC (permalink / raw
To: gentoo-commits
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@src.gnome.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@linux.intel.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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-26 5:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-26 4:46 [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/cogl/, media-libs/cogl/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-07 21:30 Alexandre Restovtsev
2011-08-15 8:17 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox