new ebuild: media-libs/cogl-1.14.1_pre20130901-r2.ebuild

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

6 files changed, 362 insertions, 0 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
new file mode 100644
index 0000000..7225404
--- /dev/null
+++ b/media-libs/cogl/ChangeLog
@@ -0,0 +1,159 @@
+# ChangeLog for media-libs/cogl
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.37 2013/09/14 09:08:34 pacho Exp $
+
+  14 Sep 2013; Pacho Ramos <pacho@gentoo.org> cogl-1.14.1_pre20130901.ebuild:
+  Profiling needs uprof, which is not available in portage yet, bug #484750;
+  gtk-doc cannot be built and upstream neither provides prebuilt files, bug
+  #483332
+
+*cogl-1.14.1_pre20130901 (01 Sep 2013)
+
+  01 Sep 2013; Pacho Ramos <pacho@gentoo.org> +cogl-1.14.1_pre20130901.ebuild:
+  Bump including all commits from 1.14 branch (fixing #481348 by Kamil Kamiński
+  also)
+
+  27 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.14.0.ebuild:
+  Add missing dependency, per configure.
+
+*cogl-1.12.2-r1 (03 May 2013)
+
+  03 May 2013; Mart Raudsepp <leio@gentoo.org> -cogl-1.12.2.ebuild,
+  +cogl-1.12.2-r1.ebuild, +files/cogl-1.12.2-dont-use-MSAA.patch:
+  Import patch for 1.12 (used by GNOME-3.6) to not accidentally pick a MSAA
+  visual as default - it can seriously degrade performance and cause SIGBUS
+  crashes; both primarily with gnome-shell
+
+  01 Apr 2013; Pacho Ramos <pacho@gentoo.org> cogl-1.14.0.ebuild:
+  Fix subslot value, #463938 by Andreas Mielke.
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -cogl-1.8.2.ebuild:
+  Clean up old revision.
+
+*cogl-1.14.0 (28 Mar 2013)
+
+  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +cogl-1.14.0.ebuild:
+  Version bump for Gnome 3.8
+
+  27 Mar 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.10.4.ebuild:
+  Stable for ppc64, wrt bug #458984
+
+  26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.10.4.ebuild:
+  Stable for ppc, wrt bug #458984
+
+  25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.10.4.ebuild:
+  Stable for x86, wrt bug #458984
+
+  25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.10.4.ebuild:
+  Stable for amd64, wrt bug #458984
+
+  02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.12.2.ebuild:
+  Add ~arm, wrt bug #449220
+
+  19 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cogl-1.12.0-r1.ebuild, -files/cogl-1.12.0-fix-experimental-doc-build.patch,
+  cogl-1.12.2.ebuild:
+  Remove unneeded glu dependency (bug #452912, thanks to Matt Turner). Drop
+  old.
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.12.2.ebuild:
+  Revert changes for gtk-doc, upstream managed to tight this too well :(.
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.12.2.ebuild:
+  Actually make gtk-doc installation work. Needs latest gnome2.eclass changes.
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.12.0-r1.ebuild,
+  cogl-1.12.2.ebuild:
+  Raise gobject-introspection dependency per bug #449228.
+
+*cogl-1.12.2 (13 Jan 2013)
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> -cogl-1.12.0.ebuild,
+  +cogl-1.12.2.ebuild:
+  Version bump.
+
+  06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.12.0-r1.ebuild:
+  Add ~sparc, wrt bug #449220
+
+  01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> cogl-1.12.0-r1.ebuild:
+  Add ~ia64, wrt bug #449220
+
+*cogl-1.12.0-r1 (18 Dec 2012)
+
+  18 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cogl-1.12.0-r1.ebuild:
+  Prefer gl over gles2 as the default driver, since that's what most users
+  would want; thanks to Rafał Mużyło.
+
+*cogl-1.12.0 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.10.4.ebuild,
+  +cogl-1.12.0.ebuild, +files/cogl-1.12.0-fix-experimental-doc-build.patch,
+  metadata.xml:
+  Version bump for gnome-3.6. Switch to global introspection USE flag.
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.10.4.ebuild:
+  Accidentally set wrong subslot.
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.8.2.ebuild,
+  cogl-1.10.4.ebuild:
+  Update to EAPI5 and enable subslots.
+
+  10 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.8.2.ebuild,
+  -cogl-1.10.2.ebuild, cogl-1.10.4.ebuild,
+  +files/cogl-1.10.4-cogl-clipping.xml.patch:
+  Fix USE=doc build failure with libxslt-1.1.27 (bug #436308, thanks to
+  bambucha14). Update license. Drop old.
+
+*cogl-1.10.4 (17 Jul 2012)
+
+  17 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -cogl-1.10.0.ebuild,
+  +cogl-1.10.4.ebuild:
+  Version bump with various bugfixes. Skip tests for non-mesa opengl. Drop old.
+
+  14 Jul 2012; Anthony G. Basile <blueness@gentoo.org> cogl-1.8.2.ebuild,
+  cogl-1.10.0.ebuild, cogl-1.10.2.ebuild:
+  Keyword ~mips
+
+  14 Jun 2012; Luca Barbato <lu_zero@gentoo.org> cogl-1.10.2.ebuild,
+  metadata.xml:
+  Add gles2 useflag
+
+  24 May 2012; Samuli Suominen <ssuominen@gentoo.org> cogl-1.8.2.ebuild:
+  ppc stable wrt #410611
+
+  05 May 2012; Jeff Horelick <jdhore@gentoo.org> cogl-1.8.2.ebuild,
+  cogl-1.10.0.ebuild, cogl-1.10.2.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  29 Apr 2012; Markus Meier <maekke@gentoo.org> cogl-1.8.2.ebuild:
+  x86 stable, bug #410611
+
+*cogl-1.10.2 (20 Apr 2012)
+
+  20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +cogl-1.10.2.ebuild:
+  Version bump with various bugfixes.
+
+  19 Apr 2012; Brent Baude <ranger@gentoo.org> cogl-1.8.2.ebuild:
+  Marking cogl-1.8.2 ppc64 stable for bug 410611
+
+  18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> cogl-1.8.2.ebuild:
+  Stable for amd64, wrt bug #410611
+
+*cogl-1.10.0 (25 Mar 2012)
+
+  25 Mar 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +cogl-1.10.0.ebuild:
+  Bump to 1.10.0, p.masked, do not use yet
+
+  19 Feb 2012; Tobias Klausmann <klausman@gentoo.org> cogl-1.8.2.ebuild:
+  Keyworded on alpha, bug #379649
+
+  28 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
+  Cosmetic: unneeded newline.
+
+*cogl-1.8.2 (28 Oct 2011)
+
+  28 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +cogl-1.8.2.ebuild,
+  +metadata.xml:
+  New package, moved from the gnome overlay. Formerly part of
+  media-libs/clutter. Required for clutter-1.8.
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
new file mode 100644
index 0000000..f652955
--- /dev/null
+++ b/media-libs/cogl/Manifest
@@ -0,0 +1,6 @@
+AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24147a1791ca1c4ddc3321052d843512e1eb9d SHA512 ff0d47e5cb2e7533d8f909504c66e07ac405ffb7606675d4bb937201d97d49099e57d2a34522c287e68eff46397fe6e2822e64e0e04a84f40a166c08aea0970a WHIRLPOOL ec8750a39a06fd72ac4e3321a21107fd01702aeedf25d8984bac3ed039a9d388d40c97c87dbafb426d30ba9a090f32009b23a311704dcad56b4ceb40c1129f42
+AUX cogl-1.12.2-dont-use-MSAA.patch 1565 SHA256 484e371b7d3b60af0c054bfe8fcd69870a3e1c30de6b1a155937b1da2b11d9cf SHA512 e145ccd45ad2b6e1859c031185d8c5d20a7b0b05bf3ff14cda77ea5822455b78c1324a77007c493a6a8d1670403ad75ab7051527222b5289cebb62bdfcb7411b WHIRLPOOL bf8a4596d4485ae6d61d84d63ed473c0aa5833ac7ca89ea538e8cd271c00f28637a376d805289978d5500c8f059cc6a66ab6cc125f266692048f502f075196a8
+DIST cogl-1.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9699a1da21c60fd4c17ff2858060f24642af SHA512 528c799398920804c8f9e7b649822a0b2af7e34ef6ab884be000d7e32d0b1d1134ccbbc824c712b4a1457249bcdf73abe3c6196858be1008b1536447d907bb3e WHIRLPOOL e35ac2db1f16a20f5b6fb125c603587bd217247a0c5971464619434195c1f61e5eafde778931761a68b7abc25c5ed23fddda2e2b6ae0e9354431a65f66bcfc5a
+EBUILD cogl-1.14.1_pre20130901-r2.ebuild 3747 SHA256 eaf41fe1a3a74bf1b0b8a66d7c3e0e55adef70c0a18a620ec3fe7ff4d6d57da7 SHA512 ff3e1b80d362a1b1998522cec62dac2a8af81927352acfedff7de99d032423201cd29bad0d604ab50c038018ff335fec97e5a63a2131ac6c55c90b01e3b89d57 WHIRLPOOL ff6b0ec11b2ebefb0e4706a182d119893955932610ecf241091e7986cd401a968761ee970e20ca5bf5941f88d487fbb545c058abe5928f48f8d7013a597d818e
+MISC ChangeLog 5838 SHA256 ae6353fb47ac84fe3a576d5fee1ffc748b5d5be5b447daddc8de36e6f757ed00 SHA512 48b2e1e93e14a33026fe2675865b540f237a4faa7f44cfdf69df0efe52b879152ae713f86b024b70fef397d6a81514d209e153464373f69451a8175eeffa5e60 WHIRLPOOL 678f327d77c7edd0f8be464614b68de8a6ca8b787c58cfb83b4811af2a3458c124c6ba63f968f4f97fa285f5a0d199dd75dcbcd387d5df66cebf4ae13960f238
+MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
diff --git a/media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild b/media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild
new file mode 100644
index 0000000..9e8f74b
--- /dev/null
+++ b/media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+CLUTTER_LA_PUNT="yes"
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+inherit eutils clutter virtualx gnome2-multilib
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.clutter-project.org/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0/12" # subslot = .so version
+# doc and profile disable for now due bugs #484750 and #483332
+IUSE="examples +introspection +opengl gles2 +pango" # doc profile
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	x11-libs/cairo:=[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2:2[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:=[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	>=x11-libs/libXcomposite-0.4[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-3[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrandr-1.2[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
+
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?,${MULTILIB_USEDEP}] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/clutter-1.7[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	sys-devel/gettext[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	test? (	app-admin/eselect-opengl
+		media-libs/mesa[classic,${MULTILIB_USEDEP}] )
+"
+#	doc? ( >=dev-util/gtk-doc-1.13 )
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+
+S="${WORKDIR}/${PN}-1.14.1"
+
+src_configure() {
+	# TODO: think about kms-egl, quartz, sdl, wayland
+	# Prefer gl over gles2 if both are selected
+	# Profiling needs uprof, which is not available in portage yet, bug #484750
+	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+	gnome2-multilib_src_configure \
+		--disable-examples-install \
+		--disable-maintainer-flags \
+		--enable-cairo             \
+		--enable-deprecated        \
+		--enable-gdk-pixbuf        \
+		--enable-glib              \
+		--disable-gtk-doc	   \
+		$(use_enable opengl glx)   \
+		$(use_enable opengl gl)    \
+		$(use_enable gles2)        \
+		$(use_enable gles2 cogl-gles2) \
+		$(use_enable gles2 xlib-egl-platform) \
+		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(use_enable introspection) \
+		$(use_enable pango cogl-pango) \
+		--disable-profile
+#		$(use_enable doc gtk-doc)  \
+#		$(use_enable profile)
+}
+
+src_test() {
+	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+	# NOTE: recheck if this is needed after every mesa bump
+	if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+		ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+		ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+		ewarn "# eselect opengl set xorg-x11"
+		return
+	fi
+	multilib_foreach_abi run_in_build_dir cogl_perabi_src_test
+}
+
+cogl_perabi_src_test() {
+	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+	DOCS=(NEWS)
+	ehook autotools-utils_pre_src_install cogl_src_install_override
+	autotools-multilib_src_install
+
+	# README is generated from README.in
+	multilib_for_best_abi run_in_build_dir dodoc README
+}
+
+cogl_src_install_override() {
+	EXAMPLES="examples/{*.c,*.jpg}"
+
+	clutter_src_install
+
+	# Remove silly examples-data directory
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+	# return 1 to veto standard autotools-multilib_src_install handling.
+	return 1
+}
+
diff --git a/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch b/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch
new file mode 100644
index 0000000..b27afba
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch
@@ -0,0 +1,29 @@
+From f5ca6733c4389de9a5bd55b51b016ce40b8e983e Mon Sep 17 00:00:00 2001
+From: Damien Lespiau <damien.lespiau@intel.com>
+Date: Fri, 11 May 2012 12:24:29 +0100
+Subject: [PATCH] doc: Remove the inclusion of non-existent cogl-clipping.xml
+
+The API is now gone, so cogl-clipping.xml is not generated.
+
+Reviewed-by: Robert Bragg <robert@linux.intel.com>
+
+(cherry picked from commit ff3956c25676c898948c5c7239c85154564c0e16)
+---
+ doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
+index 411503f..55c88f7 100644
+--- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
++++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
+@@ -113,7 +113,6 @@
+       <xi:include href="xml/cogl-texture-rectangle.xml"/>
+     </section>
+ 
+-    <xi:include href="xml/cogl-clipping.xml"/>
+     <section id="cogl-framebuffer-apis">
+       <title>Framebuffers</title>
+       <xi:include href="xml/cogl-framebuffer.xml"/>
+-- 
+1.7.12
+
diff --git a/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch b/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
new file mode 100644
index 0000000..68570b6
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
@@ -0,0 +1,43 @@
+From 1f84b5c9b41fb053e7d96b93e3558ca03eed2ae0 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse
+Date: Tue, 29 Jan 2013 18:37:41 -0500
+Subject: [PATCH] glx do not use multisample visual config for front or pixmap
+
+There is no guaranty that glXGetFBConfigs will return fbconfig ordered
+with non msaa config first. This patch make sure that non msaa config
+get choose.
+
+Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+Reviewed-by: Robert Bragg <robert@linux.intel.com>
+
+(cherry picked from commit 93b7b4c850dd928bf21ee168a95641a8d631f713)
+---
+ cogl/winsys/cogl-winsys-glx.c | 31 ++++++++++++++++++++++++-------
+ 1 file changed, 24 insertions(+), 7 deletions(-)
+
+commit 8a1353a215ab that removes a hunk as unnecessary is manually removed
+from this patchfile instead of reverting in a second patch for Gentoo.
+diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
+index 234e9da..24aee14 100644
+--- a/cogl/winsys/cogl-winsys-glx.c
++++ b/cogl/winsys/cogl-winsys-glx.c
+@@ -2024,6 +2031,16 @@ get_fbconfig_for_depth (CoglContext *context,
+       if (value != depth && (value - alpha) != depth)
+         continue;
+ 
++      if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4)
++        {
++          glx_renderer->glXGetFBConfigAttrib (dpy,
++                                              fbconfigs[i],
++                                              GLX_SAMPLES,
++                                              &value);
++          if (value > 1)
++            continue;
++        }
++
+       value = 0;
+       if (depth == 32)
+         {
+-- 
+1.8.2.1
+
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
new file mode 100644
index 0000000..8ba9687
--- /dev/null
+++ b/media-libs/cogl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+  <flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+  <flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
+    integration</flag>
+</use>
+</pkgmetadata>