media-libs/cogl-1.18.0-r1: revbump/merge

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

3 files changed, 153 insertions, 0 deletions

diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 0394978..aa4ba1a 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,6 +1,9 @@
 AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24147a1791ca1c4ddc3321052d843512e1eb9d SHA512 ff0d47e5cb2e7533d8f909504c66e07ac405ffb7606675d4bb937201d97d49099e57d2a34522c287e68eff46397fe6e2822e64e0e04a84f40a166c08aea0970a WHIRLPOOL ec8750a39a06fd72ac4e3321a21107fd01702aeedf25d8984bac3ed039a9d388d40c97c87dbafb426d30ba9a090f32009b23a311704dcad56b4ceb40c1129f42
 AUX cogl-1.14.1-framebuffer-allocate.patch 1262 SHA256 ff62c540091022aacf65ef65c06c9a93a64a4e2ef0c4b37794e418e108f28a85 SHA512 0738dbad6a88cafa3ea8f500ae424946ac6f78fb4e25f0691eee2a25d7732a5f628de8348a7124cc875a23fe0d6e8c0635f1da07f9340d8a698639024c3288b9 WHIRLPOOL 9346e381d53bbb2c105a66cafef2497d48c4e04bdc138e9ebe192c0758c1e2370db11c07a53412e3183e39d8bad6eef6d3f5b8a7d1215d9b5ae441ba8c3faf4d
+AUX cogl-1.18.0-cogl-h-trouble.patch 372 SHA256 cc597e4b86db1a6a1c651cdbe5d9bdeae9033b307910da37afca411c4f459491 SHA512 43ca01eb4ff916eab8244c888b68934697006dcd10285f57697ea70d80170b3acfed3652c2eb614f57bc3262d9af9586837c775e8293f1ad8b8a60f503aa63d3 WHIRLPOOL 6d2160f4f250e7fe91608f26b08abdc7b5f364e5dc5d250f23745758ab081abe41659863aa9af2e1c7d0906936ab298c357879e1cfab77367e7f4f0cf7d8e3cd
 DIST cogl-1.16.2.tar.xz 1647192 SHA256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7 SHA512 638aea5a12d5f33d481ac6af767af74acdfcbb3512e38740847f385b38b665a108ae616c5971a38f0055cae5b7d9054075f97e4b18af0464c1a5553c6bc3e815 WHIRLPOOL 7eee8f5dd6cd642d02014950d7263ff8cd766e80abef386f771833c017cd699dceb3cd9f2381a6a861048050ef86747d0bfcb7fe74c2a73f9e594b4e24ec7dbf
+DIST cogl-1.18.0.tar.xz 1665100 SHA256 a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e SHA512 2f338d4028f61038cf90f6f1fbe71c4c090084bb5598f9e70c7c46fa905f20c883bcf0522848f3a188187b6202ed496a8aa712276be0768a795a47c7ef1a6b2d WHIRLPOOL a5a051b7c8bd7dca99aff35a7452dcd9111be9c74d93141c62295558768fce155f07993e0020fb617942aae12762f892fe6e7e1ac39f891083c5993165f911c9
 EBUILD cogl-1.16.2-r1.ebuild 4562 SHA256 26170bcc0555ea4b081cdb8435ddebaea6b1766d6cf93a4ed7b9ab5226d430fb SHA512 6926dea64c35d5063c09bb8f558754bc4d564773375e0d2e9322f745e56acb093771bb72eb588fed735673fe087b6f658ee6e459d7111e602d103427dfc02a42 WHIRLPOOL 49de9324d82ea47ad1e208fb13158a702881cbdd0ca8e191e81df5c6eca2765e5aa063a467aefad10171752954bc93fbd9ebe975795640cd51fd3c50f8d364c4
+EBUILD cogl-1.18.0-r1.ebuild 4573 SHA256 be6248b4093b611bbfb099ed1c3e030031399c0d82f113dcfcd74f1c6c137222 SHA512 06f84c76f9bde1b33762bbd115eb5c7d8e09168c1b7442108c7f3bfe1fb04c0e2742063a9460803e987524bed9af19100c9929441593c14ae327d93b0d0c9796 WHIRLPOOL 2e7364575752695953f8fc3a57eedb8461a6ef92b7f619eb9e7b76d0d5c1b06292cfe2f50a3dd7cb354dee8cafc5ebde34fdae828009d9720e8eae5c19d43035
 MISC ChangeLog 7377 SHA256 66091bfe60aafe259f3d0f3357ad200ca0fb01a1a0a1bfdb96a213e7bc049f3e SHA512 6ab614be6b1eee478258bd6a7c31011244e0ef2a2ae9e3a5087441f846a6438b2155ec510d97ff7e0dd4fd983a7541d8676e44fbe0239e2ac2100b6d78dc83c4 WHIRLPOOL 64bce75446ec2c6bd8e03e1f01c1f966d4b5d2af01a820a6e8e66992fab7d2c2720180ac14ca76d01b8f0a92db51b6c0e9013a94d3a258515d81b801a63909a5
 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
diff --git a/media-libs/cogl/cogl-1.18.0-r1.ebuild b/media-libs/cogl/cogl-1.18.0-r1.ebuild
new file mode 100644
index 0000000..836eb31
--- /dev/null
+++ b/media-libs/cogl/cogl-1.18.0-r1.ebuild
@@ -0,0 +1,139 @@
+# 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 gtk-doc virtualx clutter-multilib gnome2-multilib
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.clutter-project.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+# doc and profile disable for now due bugs #484750 and #483332
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # 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}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${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}] )
+"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance tests all fail again...
+RESTRICT="test"
+
+DOCS=(NEWS)
+EXAMPLES="examples/{*.c,*.jpg}"
+
+src_prepare() {
+	# Do not build examples
+	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+
+	if ! use test ; then
+		# For some reason the configure switch will not completely disable
+		# tests being built
+		sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+    		-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+    		-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+			-i Makefile.am Makefile.in || die
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.18.0-cogl-h-trouble.patch
+
+	gnome2-multilib_src_prepare
+}
+
+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 gstreamer cogl-gst)    \
+		$(use_enable introspection) \
+		$(use_enable pango cogl-pango) \
+		$(use_enable test unit-tests) \
+		--disable-profile
+#		$(use_enable doc gtk-doc)  \
+#		$(use_enable profile)
+}
+
+ehook gnome2-multilib-global-pre_src_test maybe_skip_src_test
+maybe_skip_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 1
+	fi
+	return 0
+}
+
+ehook gnome2-multilib-per-abi-pre_src_test abi_src_test
+abi_src_test() {
+	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+	# NOTE: recheck if this is needed after every mesa bump
+	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+	return 1
+}
+
+src_install() {
+	clutter-multilib_src_install
+}
+
+ehook clutter-multilib-global-post_src_install global_post_install
+global_post_install() {
+	# Remove silly examples-data directory
+	rm -rvf "${ED}usr/share/cogl/examples-data/" || die
+}
+
+ehook clutter-multilib-best-abi-post_src_install install_generated_readme
+install_generated_readme() {
+	dodoc README
+}
diff --git a/media-libs/cogl/files/cogl-1.18.0-cogl-h-trouble.patch b/media-libs/cogl/files/cogl-1.18.0-cogl-h-trouble.patch
new file mode 100644
index 0000000..f59ff89
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.18.0-cogl-h-trouble.patch
@@ -0,0 +1,11 @@
+diff -urpN cogl-1.18.0.orig/cogl/cogl-matrix.c cogl-1.18.0/cogl/cogl-matrix.c
+--- cogl-1.18.0.orig/cogl/cogl-matrix.c	2014-06-06 17:54:26.431953372 -0700
++++ cogl-1.18.0/cogl/cogl-matrix.c	2014-06-06 17:57:34.383111468 -0700
+@@ -73,7 +73,6 @@
+ #include "config.h"
+ #endif
+ 
+-#include <cogl.h>
+ #include <cogl-util.h>
+ #include <cogl-debug.h>
+ #include <cogl-quaternion.h>