Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 134 insertions, 5 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index d84de6281c2f..93940bade5c2 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.42 2014/01/21 23:05:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.43 2014/02/06 23:30:54 eva Exp $
+
+*cogl-1.16.2 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +cogl-1.16.2.ebuild:
+  Version bump.
 
   21 Jan 2014; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.16.0.ebuild:
   Fix subslot.
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 7dbf8c049577..ed86ba19ad16 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -6,15 +6,17 @@ AUX cogl-1.14.1-framebuffer-allocate.patch 1262 SHA256 ff62c540091022aacf65ef65c
 DIST cogl-1.10.4.tar.xz 1253708 SHA256 0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9 SHA512 bbff0ae9731a12b5f9e493c7dacb8d02fe3289c30c4895fe277959b3e3155095b003b03e7c46a74ed0152916758484e3c305c599e73ceb81fd912ba491dda0ae WHIRLPOOL 65c11ee6eda657add0e0d5068cf8c055202901cb8bb19055d1f7bbe72c54373c3bed83ee3fb84edf6e0a37618d7517f3a38c3e521003c638e9850b09bdc39e82
 DIST cogl-1.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9699a1da21c60fd4c17ff2858060f24642af SHA512 528c799398920804c8f9e7b649822a0b2af7e34ef6ab884be000d7e32d0b1d1134ccbbc824c712b4a1457249bcdf73abe3c6196858be1008b1536447d907bb3e WHIRLPOOL e35ac2db1f16a20f5b6fb125c603587bd217247a0c5971464619434195c1f61e5eafde778931761a68b7abc25c5ed23fddda2e2b6ae0e9354431a65f66bcfc5a
 DIST cogl-1.16.0.tar.xz 1653292 SHA256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094 SHA512 d4e65216ad37680a58cd0a018bb2cb53b11d1e51baa2cd10e615812cbe5e1f9cd3365e248be6d84c8266cd3996039fcfb80e315bcc58f59a290555f57c013358 WHIRLPOOL 4fab497e0b7ab771a34dd53749b635bc87f16f8a2298a057497d60f9951ccaa17df200f2c120c57767007bd31c28e020ea58a7f12e2738ed5051f1d5deef164c
+DIST cogl-1.16.2.tar.xz 1647192 SHA256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7 SHA512 638aea5a12d5f33d481ac6af767af74acdfcbb3512e38740847f385b38b665a108ae616c5971a38f0055cae5b7d9054075f97e4b18af0464c1a5553c6bc3e815 WHIRLPOOL 7eee8f5dd6cd642d02014950d7263ff8cd766e80abef386f771833c017cd699dceb3cd9f2381a6a861048050ef86747d0bfcb7fe74c2a73f9e594b4e24ec7dbf
 EBUILD cogl-1.10.4.ebuild 2686 SHA256 01f3d78f7d9923c75a92b4b80646ed94baa58e044c01eaacb69a73461a9c2080 SHA512 f09233c6605cf2a75b3264c25ea0accfaf1be5715d90d17637bf721bde2fdd73791fb4dbaf589b3d48c8a92f0de299a8f5f52a03615b9148553d3b704b50a6da WHIRLPOOL 602db82a478d0010543d4930d5c77438f0d0d4594d3661895862b67cfed993e940ee0b5a7bb8bad6d1fa6ab2267b3914ee26396c4e35a24d10b7e906b103c5ab
 EBUILD cogl-1.14.1_pre20130901-r1.ebuild 3342 SHA256 39356c793b51a64996e09ce28da9af981ad2f80416b4c622d3151c740f0a435d SHA512 5b10e358b9e81a8bfaeb166d903111942699aec7eb4be5f461f0e87af99f1789649885675c801dfdecf1671a5391414aa3a9ea37b82fd70bf482583e4d0ab7f0 WHIRLPOOL 3f5b8c65a95c667e727e314da509f2dde7942ccfd99ba35fcb1d2b6a5192e5541bbfd3290cdb1d323609bff779b9310a14d4c310c88a95ead868dba7e9b5b50b
 EBUILD cogl-1.16.0.ebuild 3699 SHA256 9bbd16b7ca6f2c477100cab38dffe39361d708026977d47c70669cd8fcebc8d4 SHA512 04502cae03d72f55569fbd529ef2d36ae2309c1ad5f3b45bcb8b627930efda6e73a06b0b46dfcb6f29b23ccd4418f6423ddcbd74383c4ff256018ae7b8960d3f WHIRLPOOL 22e5991cb61fbdb891cc210cc3ffe88bc1ccf4af2d136bbbdeb417999e955e2ed4485398cc9d7db9c3ca99790bd9a6f5e0b7133bc92e4110b85c87a5c08f82f4
-MISC ChangeLog 6669 SHA256 774ffffb3c6ad08f09b01f95503eb8d76793d84109674c8a5ba8ecc5407fc68e SHA512 38936b2b04c1941ef4eae46b218ab4bbb5c7c8079000b45a0dd19271c1bd1d4dc8ed69a997d36e0ea945e8fc6c20a5931b8f8521dcb797dc3271205ca5721ca6 WHIRLPOOL c74dcb6ae9258dc66f02157bb5da0b9ecf94a20c0fa5b6eb983e12f159ce1d2f1af48daf42da776ff7b01db2ab5be8a2728d760572632b21b0e00ae648a1fa60
+EBUILD cogl-1.16.2.ebuild 3774 SHA256 66d91880501dad3215012608b3edfb19b707b5626463a38013a98db8dd86f99c SHA512 60ab892542f43048f77f429f2166b98c63f421d60d56fddbedcf8d81849f25c5bfdd57efe147dbdce6243a2955d183d6ae9ff1f49eb8c2f107ff1b6c7a97e776 WHIRLPOOL 5a2784f1772f755d1abbc5e84c69a26980b96ead81a69338df212b46e47f66c869500a14245bd572a251207b1c7dd595d97af8e2b0a1e4f4c13b4a3861cb210b
+MISC ChangeLog 6789 SHA256 54b6fd0a26b8981a2e5fee9fa4374b6aff06328fa5f08d19230f9b236a30aa92 SHA512 31838aef80804776184eaa3daa275dc06f458aa356df18bec0b1c3df77722b2f3125f87fae3d9bb66279eb3900095f47f344ac25ff2fe1c8dbb84a651117eacb WHIRLPOOL 39900327c013ca3cd0b4368615ce3ebb82e85f86e82ae39760f1bf5cc5eb8c62e6a78deb9c06f9e94c0c2b93eeeb15713c848c56db5ddbb868b8ed2d4e885667
 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLe/SkACgkQ1fmVwcYIWAbOrwCg4w+fP8WRaAembnONItcWURFD
-vrgAoKRiR6f4G5zT/eYSLxjrNQwPGGVW
-=OYqs
+iEYEAREIAAYFAlL0Gy8ACgkQ1fmVwcYIWAY2CQCeL6Cxge7XJN5bK3g/Jx2YxpYd
+pjYAoMmqdYhTOBRRhnAOxFjN6HFLQngj
+=CT5f
 -----END PGP SIGNATURE-----
diff --git a/media-libs/cogl/cogl-1.16.2.ebuild b/media-libs/cogl/cogl-1.16.2.ebuild
new file mode 100644
index 000000000000..ed35d07123f9
--- /dev/null
+++ b/media-libs/cogl/cogl-1.16.2.ebuild
@@ -0,0 +1,122 @@
+# 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.1 2014/02/06 23:30:54 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="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
+}