Version bump for Gnome 3.14. Clean up old revisions.

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

6 files changed, 25 insertions, 202 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index aa7f5b044b54..ca02e82b3ffe 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,14 @@
 # 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.52 2014/07/23 15:19:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.53 2014/12/23 22:25:58 eva Exp $
+
+*cogl-1.18.2-r1 (23 Dec 2014)
+
+  23 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -cogl-1.16.2.ebuild,
+  -cogl-1.18.0.ebuild, +cogl-1.18.2-r1.ebuild,
+  -files/cogl-1.10.4-cogl-clipping.xml.patch,
+  -files/cogl-1.14.1-framebuffer-allocate.patch, metadata.xml:
+  Version bump for Gnome 3.14. Clean up old revisions.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> cogl-1.18.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/media-libs/cogl/cogl-1.16.2.ebuild b/media-libs/cogl/cogl-1.16.2.ebuild
deleted file mode 100644
index 47e7c516c72d..000000000000
--- a/media-libs/cogl/cogl-1.16.2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.16.2.ebuild,v 1.5 2014/03/09 12:02:08 pacho 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="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/15" # 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] )
-"
-#	doc? ( >=dev-util/gtk-doc-1.13 )
-
-# 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
-}
diff --git a/media-libs/cogl/cogl-1.18.0.ebuild b/media-libs/cogl/cogl-1.18.2-r1.ebuild
index a4ed92ddb6aa..5a3d3f204aaf 100644
--- a/media-libs/cogl/cogl-1.18.0.ebuild
+++ b/media-libs/cogl/cogl-1.18.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.2-r1.ebuild,v 1.1 2014/12/23 22:25:58 eva Exp $
 
 EAPI="5"
 CLUTTER_LA_PUNT="yes"
@@ -9,19 +9,19 @@ CLUTTER_LA_PUNT="yes"
 inherit clutter gnome2 multilib virtualx
 
 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="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
+IUSE="examples gles2 gstreamer +introspection +kms +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
 	x11-libs/cairo:=
 	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libdrm:=
 	x11-libs/libX11
 	>=x11-libs/libXcomposite-0.4
 	x11-libs/libXdamage
@@ -35,7 +35,13 @@ COMMON_DEPEND="
 		media-libs/gst-plugins-base:1.0 )
 
 	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+	kms? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm:= )
 	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}
@@ -50,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 "
 
 # Need classic mesa swrast for tests, llvmpipe causes a test failure
-# Fox some reason GL3 conformance test all fails again...
+# For some reason GL3 conformance test all fails again...
 RESTRICT="test"
 
 src_prepare() {
@@ -71,7 +77,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: think about kms-egl, quartz, sdl, wayland
+	# TODO: think about 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
@@ -82,7 +88,6 @@ src_configure() {
 		--enable-deprecated        \
 		--enable-gdk-pixbuf        \
 		--enable-glib              \
-		--disable-gtk-doc          \
 		$(use_enable opengl glx)   \
 		$(use_enable opengl gl)    \
 		$(use_enable gles2)        \
@@ -91,10 +96,12 @@ src_configure() {
 		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
 		$(use_enable gstreamer cogl-gst)    \
 		$(use_enable introspection) \
+		$(use_enable kms kms-egl-platform) \
 		$(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 doc gtk-doc)  \
 #		$(use_enable profile)
 }
 
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
deleted file mode 100644
index b27afbad8b71..000000000000
--- a/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.14.1-framebuffer-allocate.patch b/media-libs/cogl/files/cogl-1.14.1-framebuffer-allocate.patch
deleted file mode 100644
index c6263a0a9f21..000000000000
--- a/media-libs/cogl/files/cogl-1.14.1-framebuffer-allocate.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5efbcc10a3420e26859f8e915f0259a0103b7727 Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Wed, 3 Jul 2013 18:51:53 +0200
-Subject: [PATCH] offscreen: Allocate the framebuffer in
- cogl_offscreen_new_to_texture_full
-
-The API says that it should return NULL on failure but it does not do that
-due to the lazy allocation.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703174
----
- cogl/cogl-framebuffer.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
-index d9ec88d..9649e4d 100644
---- a/cogl/cogl-framebuffer.c
-+++ b/cogl/cogl-framebuffer.c
-@@ -618,6 +618,7 @@ _cogl_offscreen_new_to_texture_full (CoglTexture *texture,
-   int level_width;
-   int level_height;
-   CoglOffscreen *ret;
-+  CoglError *error = NULL;
- 
-   _COGL_RETURN_VAL_IF_FAIL (cogl_is_texture (texture), NULL);
-   _COGL_RETURN_VAL_IF_FAIL (level < _cogl_texture_get_n_levels (texture),
-@@ -649,6 +650,13 @@ _cogl_offscreen_new_to_texture_full (CoglTexture *texture,
- 
-   _cogl_texture_associate_framebuffer (texture, fb);
- 
-+  if (!cogl_framebuffer_allocate (ret, &error))
-+    {
-+      cogl_object_unref (offscreen);
-+      cogl_error_free (error);
-+      ret = NULL;
-+    }
-+
-   return ret;
- }
- 
--- 
-1.8.3.1
\ No newline at end of file
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index 8ba968705519..e3cc8551b059 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/metadata.xml
@@ -4,6 +4,7 @@
 <herd>gnome</herd>
 <use>
   <flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+  <flag name="kms">Enable KMS support.</flag>
   <flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
     integration</flag>
 </use>