Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 131 insertions, 5 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 2502f133b319..632bce8312b7 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.49 2014/04/27 17:30:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.50 2014/07/05 14:31:09 pacho Exp $
+
+*cogl-1.18.2 (05 Jul 2014)
+
+  05 Jul 2014; Pacho Ramos <pacho@gentoo.org> +cogl-1.18.2.ebuild:
+  Version bump
 
 *cogl-1.18.0 (27 Apr 2014)
 
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 4c98f0d90510..ce70ae4f4be4 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -5,14 +5,16 @@ AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24
 AUX cogl-1.14.1-framebuffer-allocate.patch 1262 SHA256 ff62c540091022aacf65ef65c06c9a93a64a4e2ef0c4b37794e418e108f28a85 SHA512 0738dbad6a88cafa3ea8f500ae424946ac6f78fb4e25f0691eee2a25d7732a5f628de8348a7124cc875a23fe0d6e8c0635f1da07f9340d8a698639024c3288b9 WHIRLPOOL 9346e381d53bbb2c105a66cafef2497d48c4e04bdc138e9ebe192c0758c1e2370db11c07a53412e3183e39d8bad6eef6d3f5b8a7d1215d9b5ae441ba8c3faf4d
 DIST cogl-1.16.2.tar.xz 1647192 SHA256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7 SHA512 638aea5a12d5f33d481ac6af767af74acdfcbb3512e38740847f385b38b665a108ae616c5971a38f0055cae5b7d9054075f97e4b18af0464c1a5553c6bc3e815 WHIRLPOOL 7eee8f5dd6cd642d02014950d7263ff8cd766e80abef386f771833c017cd699dceb3cd9f2381a6a861048050ef86747d0bfcb7fe74c2a73f9e594b4e24ec7dbf
 DIST cogl-1.18.0.tar.xz 1665100 SHA256 a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e SHA512 2f338d4028f61038cf90f6f1fbe71c4c090084bb5598f9e70c7c46fa905f20c883bcf0522848f3a188187b6202ed496a8aa712276be0768a795a47c7ef1a6b2d WHIRLPOOL a5a051b7c8bd7dca99aff35a7452dcd9111be9c74d93141c62295558768fce155f07993e0020fb617942aae12762f892fe6e7e1ac39f891083c5993165f911c9
+DIST cogl-1.18.2.tar.xz 1635384 SHA256 9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa SHA512 c8903a10c476850c77f71eba584854bccf26adae6f62a9232adf8baf728fe2b69273bd5cd5418e7cd72801a2c0e4c85ef8afc08e28ebd5016b81693aef2ecab8 WHIRLPOOL e7538b92af2efe2f3845fde5c97ba9744d53ddb7a05eadb3cf310c43a3536a41001e4a0596a593ae3cfede4a02115a1d9be8aa423e9c814675059f0f777ec4a5
 EBUILD cogl-1.16.2.ebuild 3774 SHA256 9e52a172bc5e918162ada9ac682dc4aaf9d8aac02936b636226304abb312a11f SHA512 9afd67d19f1e6a7dffe7a324dde22416e377e4d5fd546520dd1d275448d1de182b83314d2518557f3e596b7f30ec69d5fcec3a9ea7f3a8d04c628229833aad33 WHIRLPOOL 07a92d1ef6dc53bc37c4e5bac892dee758b59a69b559272a3a107063d9d080fbf5fe0e1ee492523496177e36a1aeae0e9a757b0bbb3579eab983b7dcbf99f608
 EBUILD cogl-1.18.0.ebuild 3728 SHA256 c4c2a6d107ff30791717eb3e247aa8ee030f7d22b058436172ff0fc633e12fe0 SHA512 c9d98449ce63fa7faa16fef454be918697ca79bb402724a04bef3be4f08d53bf69f18ab46d6a284ad4dd27f0bcdbc3ff2b0c30a7f6cdeecd15f06b4fd795fbaf WHIRLPOOL cc9bafef4b5890afd119eaa6c74b1d7d54b4c619a442fab5f445885e054cb57d431a25e9699ee26a17a848bc6a51e4abed88535ba58fe9bf7e1e5690825b01f2
-MISC ChangeLog 7510 SHA256 3979da90f774993745548d280d1a40a42beec1e510765f68b4513aa57fed39c6 SHA512 2b6161fea725d1e95bbc573926572288aa82f2a719051f86449e3f808786d20569cb8458b95bfd61d5785c573b51375a41108405603fe5fff7342860de34a4b9 WHIRLPOOL afcd4dee59fb061430a0ae124902bace73ebeab7f01d7cab43d16d08c4248c334d18099fb61a21eae179cfeaf3f116092192ed321826efe015be6e58184800be
+EBUILD cogl-1.18.2.ebuild 3658 SHA256 3475dc9917f8acb0c36350a7c41fab9245b368b50f3446fdc513e0e60827d420 SHA512 9a74cfe5a586d8b7714289afb030f8850ce565eb09160fc695083e4745e73626f68be83c9baa9bfff886b677b98fea65766393f8dbeadd567939256d9bc194e8 WHIRLPOOL 200e7215f0c3cdf37a5f899ef5b70a741f023578071b63fc665712e826adfacfab5d8c6859190868642e3ecf7dd60fc9161cc92900b03fa191c43ca026175240
+MISC ChangeLog 7623 SHA256 67171f78bbad1fbb3c7057750374ee3d5339add7338782ce7c9b6ca71677dfb8 SHA512 907bf26afb0381181b7e8c342d2c9fe1a8175f77da1ea95703fcc75d2959dc08145faf37b0fc448d2d9b6fea4f3609aee5d2ae9cc635ce0c6f4765af9b7bdc15 WHIRLPOOL 462b7b0e8244660ffa4008306f9e019bc10900fc6e567ead0dcfd41ceabc3b1f71a385e273410aecc0f77e41fca967c517045dd077b0f45424d142583b395c13
 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNdPsEACgkQ1fmVwcYIWAYUPACgiWX7ifm5QnVxuDhK3sYNgYQd
-EyMAn3lFkdAAzE8yVgt1qSK9TL7aapAJ
-=IBeQ
+iEYEAREIAAYFAlO4DC8ACgkQCaWpQKGI+9SIgQCfd2Ev1X8KaBbtFphS4LSfYKE4
+JPEAnRDDfKa7Ht/7gxGQ/H2phBA7B5ui
+=+2RN
 -----END PGP SIGNATURE-----
diff --git a/media-libs/cogl/cogl-1.18.2.ebuild b/media-libs/cogl/cogl-1.18.2.ebuild
new file mode 100644
index 000000000000..f9e8720d0aa8
--- /dev/null
+++ b/media-libs/cogl/cogl-1.18.2.ebuild
@@ -0,0 +1,119 @@
+# 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.2.ebuild,v 1.1 2014/07/05 14:31:09 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.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
+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              \
+		$(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 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
+}