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

[Alexandre Rostovtsev]

commit:     e2ecd06dc280c3e622b86918a7988835a28b9ee1
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 10:10:36 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 10:44:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e2ecd06d

media-libs/cogl: 1.11.4 → 1.12.0

Update license.

---
 .../{cogl-1.11.4.ebuild => cogl-1.12.0.ebuild}     |   10 +++++-
 media-libs/cogl/cogl-9999.ebuild                   |    2 +-
 .../cogl-1.12.0-fix-experimental-doc-build.patch   |   33 ++++++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/media-libs/cogl/cogl-1.11.4.ebuild b/media-libs/cogl/cogl-1.12.0.ebuild
similarity index 91%
rename from media-libs/cogl/cogl-1.11.4.ebuild
rename to media-libs/cogl/cogl-1.12.0.ebuild
index c5243a5..6632c9d 100644
--- a/media-libs/cogl/cogl-1.11.4.ebuild
+++ b/media-libs/cogl/cogl-1.12.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
+inherit eutils clutter gnome2 multilib virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="http://www.clutter-project.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="doc examples +introspection +opengl gles2 +pango"
 if [[ ${PV} = 9999 ]]; then
@@ -73,6 +73,12 @@ pkg_setup() {
 	use gles2 && G2CONF="${G2CONF} --with-default-driver=gles2"
 }
 
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684731
+	epatch "${FILESDIR}/${PN}-1.12.0-fix-experimental-doc-build.patch"
+	gnome2_src_prepare
+}
+
 src_test() {
 	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
 	# NOTE: recheck if this is needed after every mesa bump

diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index c5243a5..7fa5842 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="http://www.clutter-project.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="doc examples +introspection +opengl gles2 +pango"
 if [[ ${PV} = 9999 ]]; then

diff --git a/media-libs/cogl/files/cogl-1.12.0-fix-experimental-doc-build.patch b/media-libs/cogl/files/cogl-1.12.0-fix-experimental-doc-build.patch
new file mode 100644
index 0000000..9bd8018
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.12.0-fix-experimental-doc-build.patch
@@ -0,0 +1,33 @@
+Author: Dimitri <mitya@××××××.org>
+
+Build breaks on cogl-2.0-experimental docs
+
+https://bugzilla.gnome.org/show_bug.cgi?id=684731
+
+--- a/cogl/cogl-context.h
++++ b/cogl/cogl-context.h
+@@ -72,19 +72,19 @@
+  * help applications control the lifetime a context without us needing to
+  * introduce special api to handle the breakup of internal circular
+  * references due to internal resources and caches associated with the
+- * context.
++ * context.</note>
+  *
+- * One a context has been destroyed then all directly or indirectly
++ * <note>One a context has been destroyed then all directly or indirectly
+  * dependant resources will be in an inconsistent state and should not
+- * be manipulated or queried in any way.
++ * be manipulated or queried in any way.</note>
+  *
+- * For applications that rely on the operating system to clean up
++ * <note>For applications that rely on the operating system to clean up
+  * resources this policy shouldn't affect them, but for applications
+  * that need to carefully destroy and re-create Cogl contexts multiple
+  * times throughout their lifetime (such as Android applications) they
+  * should be careful to destroy all context dependant resources, such as
+  * framebuffers or textures etc before unrefing and destroying the
+- * context.<note>
++ * context.</note>
+  */
+ 
+ #ifdef COGL_ENABLE_EXPERIMENTAL_API