Bump including all commits from 1.14 branch (fixing #481348 by Kamil Kamiński also)

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

3 files changed, 109 insertions, 5 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 0b3d3f6f6687..912b134f3de5 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2013/07/27 23:57:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.36 2013/09/01 11:10:33 pacho Exp $
+
+*cogl-1.14.1_pre20130901 (01 Sep 2013)
+
+  01 Sep 2013; Pacho Ramos <pacho@gentoo.org> +cogl-1.14.1_pre20130901.ebuild:
+  Bump including all commits from 1.14 branch (fixing #481348 by Kamil Kamiński
+  also)
 
   27 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.14.0.ebuild:
   Add missing dependency, per configure.
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 0883d7bdc788..71f69b6bf4d3 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -6,15 +6,17 @@ AUX cogl-1.12.2-dont-use-MSAA.patch 1565 SHA256 484e371b7d3b60af0c054bfe8fcd6987
 DIST cogl-1.10.4.tar.xz 1253708 SHA256 0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9 SHA512 bbff0ae9731a12b5f9e493c7dacb8d02fe3289c30c4895fe277959b3e3155095b003b03e7c46a74ed0152916758484e3c305c599e73ceb81fd912ba491dda0ae WHIRLPOOL 65c11ee6eda657add0e0d5068cf8c055202901cb8bb19055d1f7bbe72c54373c3bed83ee3fb84edf6e0a37618d7517f3a38c3e521003c638e9850b09bdc39e82
 DIST cogl-1.12.2.tar.xz 1301108 SHA256 31971d4c6543c589f6fc49ab1724dfbdc7062c58a7da842cb1935e32ca6e1d7e SHA512 5bf43434814be4d7beae9dedc0d2d8bc31c174a82386f581d705e2586da93cea930b5b66bb707036a8ed7b49147af003ab7dda125e86098fe3433e9418001b2d WHIRLPOOL f2c6e768f874c06e95c352fa23a3b7d8bacf3a0e05466cc508e690adfc97b9dc1c627f494078a76b883428d1b8b58cd5930be49385ad4c3867843bfe6a0e4b46
 DIST cogl-1.14.0.tar.xz 1656520 SHA256 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 SHA512 9e9f34d6dd9954512322ad2478a6ca9bdad60462b1930b39421fdb5f10d3a71ef62ac70d58929fd8448d39dc5a6227f0a895a6f9113bc0ecc83b6c0f26bfb3cb WHIRLPOOL a4f550f722e3c8d748b7008f09d02de5647bcf2f261983ec0cc05eb63dedb8e4950b11ce141ada88506225ad4b4007b1a54e83f972fb80c297411affa7c6f9b5
+DIST cogl-1.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9699a1da21c60fd4c17ff2858060f24642af SHA512 528c799398920804c8f9e7b649822a0b2af7e34ef6ab884be000d7e32d0b1d1134ccbbc824c712b4a1457249bcdf73abe3c6196858be1008b1536447d907bb3e WHIRLPOOL e35ac2db1f16a20f5b6fb125c603587bd217247a0c5971464619434195c1f61e5eafde778931761a68b7abc25c5ed23fddda2e2b6ae0e9354431a65f66bcfc5a
 EBUILD cogl-1.10.4.ebuild 2686 SHA256 01f3d78f7d9923c75a92b4b80646ed94baa58e044c01eaacb69a73461a9c2080 SHA512 f09233c6605cf2a75b3264c25ea0accfaf1be5715d90d17637bf721bde2fdd73791fb4dbaf589b3d48c8a92f0de299a8f5f52a03615b9148553d3b704b50a6da WHIRLPOOL 602db82a478d0010543d4930d5c77438f0d0d4594d3661895862b67cfed993e940ee0b5a7bb8bad6d1fa6ab2267b3914ee26396c4e35a24d10b7e906b103c5ab
 EBUILD cogl-1.12.2-r1.ebuild 3307 SHA256 2ad87b95ab76240ec2e825967f7bd9dff601c621276ef759981ab090e2fa688f SHA512 16f605cfc979e50d6fcd71443dee46222b63cfe0cd3bd9a0916acf3bcc5f8770ab670914c2fc9cbdc658f8baeda3bf7aee9e9f4d19fc9cc67c36da14a63c854f WHIRLPOOL 630ae3ecafa72e2e965383afb77c1ca25e41b2bca740591029037f3c0cfcb857ae98ab60c394d8414d10821f4ba4f951676ce7994e9f624fcb7dbe025ddb4e54
 EBUILD cogl-1.14.0.ebuild 2832 SHA256 6c59424dc5a3a663a5e7d777793429ee631d7822fb5bce38b208aafba6b55dbb SHA512 dbea28d6816eea7862ea4710740f7e89af97bcde24228dc0bf1d2f9543765acf776119b41e44e07393f4beeefe2fdb8d4e2119992e31afb96eb81ff42eef18db WHIRLPOOL 83a8ff186fec083d12270ba8c3490f2c6e7aa08789ac3bd97fc3bb5db5dcfd82e84463964abcd85c35be0aac12120f66a528b7e35bb3696ff00e26326011ffc9
-MISC ChangeLog 5385 SHA256 38a2ac5252b37c349445bc13e10f2ab6ce93baa5a318ae092a4c722d73bcea04 SHA512 7dc158bc0815b076180dcec9de142fd2dafc83b25fda9cd945aee0e348d0e4eecdd04aa481025f30eeacc69c46da893cdf2cfe620b50864770367c5fccfff080 WHIRLPOOL 1c7733613c1ea2ad7cd8732e897caf7ca467d184ff860f74579d00c83b0c60fe90a99aca1b69077bc942db0747d2602418f5e78974f236ae5b7c35bd4e5774b7
+EBUILD cogl-1.14.1_pre20130901.ebuild 2944 SHA256 6f127f6194f1eeadcfb6704324dc49fbd5b6f26e21165288fd086f25f4e1374a SHA512 2112348147ba705567486aec9da6272974400da5b2c2dad8017cd22bedd0008d9d867e29789e1615e948fd13de91fc79279c16cd5b18a80459c006d7a3a8f98e WHIRLPOOL bbc87fc7c269ed115a087163305a640f96dbf045d2fedf34e17291eaed1918d0d667d078d5cc51d711d1ced3ed23854e5f0e7de56d7dc1469d63bacfd756ba90
+MISC ChangeLog 5596 SHA256 fd50bb4ac8c14f59e9faac64feeba0f6c683fb0c7ace32558f46fe31c7e6d80e SHA512 acb42594b348a7d6747f4251cc0aa34c74785a487462b5b038e8a924c2cacea09cb3d86a9260a512a424edcf8dc5db7ff247186a154c572c2d82559ecd6f9ce9 WHIRLPOOL a98ce7fc305b98a4866245113072554e78ff6ed58f4c5c8bda2522e855b06c4df60ded12a67841235262d3290713a52a3beb6234611129f96e60ee42dba66d94
 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH0XmkACgkQ1fmVwcYIWAYZAwCgglFQl6Z2nRGvkaOSjPe8mHG3
-wIsAniMMm4bvk8+yT4KHveucvLN9qBC8
-=57Gd
+iEYEAREIAAYFAlIjIKoACgkQCaWpQKGI+9TKIgCdEk/CsFdozQ5h1CZLmICSaftN
+6NEAnj2JHK8GNn+fj7MX7xRkkTxAKtDe
+=SS2V
 -----END PGP SIGNATURE-----
diff --git a/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild b/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild
new file mode 100644
index 000000000000..11b127156a89
--- /dev/null
+++ b/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild
@@ -0,0 +1,96 @@
+# 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.1 2013/09/01 11:10:33 pacho 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/"
+
+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
+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
+
+S="${WORKDIR}/${PN}-1.14.1"
+
+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
+}