Version bump for Gnome 3.10. Clean up old revisions.

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

5 files changed, 35 insertions, 254 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 795b303b0931..fc7da13ae2ed 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.40 2013/12/08 19:11:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.41 2013/12/23 23:28:44 eva Exp $
+
+*cogl-1.16.0 (23 Dec 2013)
+
+  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org> -cogl-1.12.2-r1.ebuild,
+  -cogl-1.14.0.ebuild, -cogl-1.14.1_pre20130901.ebuild, +cogl-1.16.0.ebuild,
+  -files/cogl-1.12.2-dont-use-MSAA.patch:
+  Version bump for Gnome 3.10. Clean up old revisions.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> cogl-1.14.1_pre20130901-r1.ebuild:
   x86 stable, bug #478252
diff --git a/media-libs/cogl/cogl-1.12.2-r1.ebuild b/media-libs/cogl/cogl-1.12.2-r1.ebuild
deleted file mode 100644
index b3d2010a08a6..000000000000
--- a/media-libs/cogl/cogl-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.2-r1.ebuild,v 1.1 2013/05/03 05:43:15 leio Exp $
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
-
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/11"
-IUSE="doc examples +introspection +opengl gles2 +pango"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: need uprof for optional profiling support
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28.0: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
-	virtual/opengl
-	gles2? ( media-libs/mesa[gles2] )
-
-	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
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	test? (	app-admin/eselect-opengl
-		media-libs/mesa[classic] )
-"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-src_configure() {
-	# XXX: think about kms-egl, quartz, sdl, wayland
-	# Prefer gl over gles2 if both are selected
-	gnome2_src_configure \
-		--disable-examples-install \
-		--disable-profile          \
-		--disable-maintainer-flags \
-		--enable-cairo             \
-		--enable-deprecated        \
-		--enable-gdk-pixbuf        \
-		--enable-glib              \
-		$(use_enable doc 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)
-}
-
-src_prepare() {
-	# Don't accidentally use MSAA visuals - it degrades performance and could
-	# crash gnome-shell with SIGBUS on large textures
-	# http://lists.freedesktop.org/archives/cogl/2013-April/001090.html
-	# https://bugs.freedesktop.org/show_bug.cgi?id=61182
-	epatch "${FILESDIR}/${P}-dont-use-MSAA.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
-	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
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libcogl.so.9
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libcogl.so.9
-}
diff --git a/media-libs/cogl/cogl-1.14.0.ebuild b/media-libs/cogl/cogl-1.14.0.ebuild
deleted file mode 100644
index 7edae0255555..000000000000
--- a/media-libs/cogl/cogl-1.14.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.14.0.ebuild,v 1.3 2013/07/27 23:57:28 eva Exp $
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
-
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/12" # subslot = .so version
-IUSE="doc examples +introspection +opengl gles2 +pango profile"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: need uprof for optional profiling support
-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] )
-
-	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
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	test? (	app-admin/eselect-opengl
-		media-libs/mesa[classic] )
-"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-src_configure() {
-	# XXX: think about kms-egl, quartz, sdl, wayland
-	# Prefer gl over gles2 if both are selected
-	gnome2_src_configure \
-		--disable-examples-install \
-		--disable-maintainer-flags \
-		--enable-cairo             \
-		--enable-deprecated        \
-		--enable-gdk-pixbuf        \
-		--enable-glib              \
-		$(use_enable doc 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) \
-		$(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
-}
diff --git a/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild b/media-libs/cogl/cogl-1.16.0.ebuild
index 3035d963f11c..20078333ad7a 100644
--- a/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild
+++ b/media-libs/cogl/cogl-1.16.0.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild,v 1.2 2013/09/14 09:08:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.16.0.ebuild,v 1.1 2013/12/23 23:28:44 eva Exp $
 
 EAPI="5"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
+inherit clutter gnome2 multilib virtualx
 
 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
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
@@ -32,6 +30,9 @@ COMMON_DEPEND="
 	>=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?] )
@@ -43,13 +44,29 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? (	app-admin/eselect-opengl
+	test? (
+		app-admin/eselect-opengl
 		media-libs/mesa[classic] )
 "
 #	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_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
@@ -63,15 +80,17 @@ src_configure() {
 		--enable-deprecated        \
 		--enable-gdk-pixbuf        \
 		--enable-glib              \
-		--disable-gtk-doc	   \
+		--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)
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
deleted file mode 100644
index 68570b6fe016..000000000000
--- a/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-