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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     2b72686a4d9ee3dccb170f681ad6d12735870a40
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  7 22:43:32 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  7 23:08:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2b72686a

media-libs/cogl: add wayland backend support

---
 .../cogl/{cogl-9999.ebuild => cogl-1.18.2.ebuild}  | 41 +++++++++-------------
 media-libs/cogl/cogl-9999.ebuild                   | 14 ++++++--
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-1.18.2.ebuild
similarity index 82%
copy from media-libs/cogl/cogl-9999.ebuild
copy to media-libs/cogl/cogl-1.18.2.ebuild
index 0199c34..83e1cfc 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-1.18.2.ebuild
@@ -7,23 +7,16 @@ CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
 inherit clutter gnome2 multilib virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
+HOMEPAGE="http://www.cogl3d.org/"
 
 LICENSE="MIT BSD"
-SLOT="2.0/0" # subslot = .so version
+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
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	IUSE="${IUSE} doc"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test wayland" # doc profile
+REQUIRED_USE="wayland? ( gles2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
@@ -44,6 +37,9 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
 	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+	wayland? (
+		>=dev-libs/wayland-1.1.90
+		media-libs/mesa[egl,wayland] )
 "
 # before clutter-1.7, cogl was part of clutter
 RDEPEND="${COMMON_DEPEND}
@@ -58,33 +54,28 @@ DEPEND="${COMMON_DEPEND}
 "
 
 # Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? (
-			app-text/docbook-xml-dtd:4.1.2
-			>=dev-util/gtk-doc-1.13 )"
-fi
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
 
 src_prepare() {
 	# Do not build examples
 	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
-		-i Makefile.am || die
+		-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 || die
+    		-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+    		-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+			-i Makefile.am Makefile.in || die
 	fi
 
 	gnome2_src_prepare
 }
 
 src_configure() {
-	# TODO: think about kms-egl, quartz, sdl, wayland
+	# TODO: think about kms-egl, quartz, sdl
 	# 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
@@ -105,6 +96,8 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_enable pango cogl-pango) \
 		$(use_enable test unit-tests) \
+		$(use_enable wayland wayland-egl-platform) \
+		$(use_enable wayland wayland-egl-server) \
 		--disable-profile
 #		$(use_enable profile)
 }

diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 0199c34..2ab4111 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -12,12 +12,13 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
+HOMEPAGE="http://www.cogl3d.org/"
 
 LICENSE="MIT BSD"
 SLOT="2.0/0" # subslot = .so version
 # doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test wayland" # doc profile
+REQUIRED_USE="wayland? ( gles2 )"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 	IUSE="${IUSE} doc"
@@ -44,6 +45,9 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
 	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+	wayland? (
+		>=dev-libs/wayland-1.1.90
+		media-libs/mesa[egl,wayland] )
 "
 # before clutter-1.7, cogl was part of clutter
 RDEPEND="${COMMON_DEPEND}
@@ -58,6 +62,8 @@ DEPEND="${COMMON_DEPEND}
 "
 
 # Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -84,7 +90,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: think about kms-egl, quartz, sdl, wayland
+	# TODO: think about kms-egl, quartz, sdl
 	# 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
@@ -105,6 +111,8 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_enable pango cogl-pango) \
 		$(use_enable test unit-tests) \
+		$(use_enable wayland wayland-egl-platform) \
+		$(use_enable wayland wayland-egl-server) \
 		--disable-profile
 #		$(use_enable profile)
 }