Version bump for Gnome 3.12.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806)

2 files changed, 127 insertions, 1 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 32d0d8efb2e0..2502f133b319 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/cogl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.48 2014/04/18 11:19:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.49 2014/04/27 17:30:40 eva Exp $
+
+*cogl-1.18.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +cogl-1.18.0.ebuild:
+  Version bump for Gnome 3.12.
 
   18 Apr 2014; Pacho Ramos <pacho@gentoo.org> -cogl-1.10.4.ebuild,
   -cogl-1.14.1_pre20130901-r1.ebuild, -cogl-1.16.0.ebuild:
diff --git a/media-libs/cogl/cogl-1.18.0.ebuild b/media-libs/cogl/cogl-1.18.0.ebuild
new file mode 100644
index 000000000000..a4ed92ddb6aa
--- /dev/null
+++ b/media-libs/cogl/cogl-1.18.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.0.ebuild,v 1.1 2014/04/27 17:30:40 eva Exp $
+
+EAPI="5"
+CLUTTER_LA_PUNT="yes"
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+inherit clutter gnome2 multilib virtualx
+
+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="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/cairo:=
+	>=x11-libs/gdk-pixbuf-2:2
+	x11-libs/libdrm:=
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXrandr-1.2
+	virtual/opengl
+	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+
+	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/clutter-1.7"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-admin/eselect-opengl
+		media-libs/mesa[classic] )
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# Fox 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 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
+
+	gnome2_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_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)
+}
+
+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
+	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+	DOCS="NEWS README"
+	EXAMPLES="examples/{*.c,*.jpg}"
+
+	clutter_src_install
+
+	# Remove silly examples-data directory
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}