Add gles2 support, bug #428770. Import of Nikoli's ebuild from the x11 overlay with slight modifications.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 154 insertions, 3 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 1c423e051934..7fedeae4d3e8 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.338 2013/06/26 16:52:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.339 2013/07/17 16:19:28 chithanh Exp $
+
+*cairo-1.12.14-r3 (17 Jul 2013)
+
+  17 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +cairo-1.12.14-r3.ebuild, metadata.xml:
+  Add gles2 support, bug #428770. Import of Nikoli's ebuild from the x11 overlay
+  with slight modifications.
 
   26 Jun 2013; Luca Barbato <lu_zero@gentoo.org> cairo-9999.ebuild:
   Drop legacy-driver from the live ebuild
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 97c02ee47f22..847598202267 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -19,7 +19,8 @@ EBUILD cairo-1.12.10-r2.ebuild 4008 SHA256 2a07f7d76ab06fb01ebfeaaa6e0c06f9e3eec
 EBUILD cairo-1.12.12-r1.ebuild 4064 SHA256 d10f80a855542c6a22c6399aa6e18c91a10d6cd5eeaaed88bcb953ff41706f5c SHA512 9106521698f9c8cb003dda679d795807a742c60b3afab041df197f84a696259c01935b2613b1a8186ea98f795e4e00be860324e7bab38d6b4f6573f39a976d43 WHIRLPOOL 8d765ea2f8b74b699dd3213187ee4102688b0d4a764cbc00f6304f3a760d5bea4bd1b97f207dc28ef0a71252e05e7d751ba4fe9398146ac3ab657d2cae092cae
 EBUILD cairo-1.12.12.ebuild 3970 SHA256 4e5a30d52b663cab1a271e8c632d41587baf035f0db7a704f31d4c6ea8fce479 SHA512 e982ce45c10aee5c30f1bed54e2aa3c3b17b2a26e8dff4054955a4617a366ea01905c8d8121da8b91d57f6cdb97cad3b1edd42faf068488f40bbcb90076a1e16 WHIRLPOOL e5193d6dd6e7b52f091d08de1bfeb6e05a9d19ddccecf883a86e0dbe6a933bd2b887e289a536affdc0b4face528c47bb9052324b03eae12201f482fefb2a6101
 EBUILD cairo-1.12.14-r2.ebuild 4072 SHA256 7751da8d2c9e49d7790aa2071868d340952c744edf8f49e8b75def6a99e83049 SHA512 73b1b9f6c29969a7dc1c114c6fc143caf288468fb15ae3adb46fa33228685561596609f088e750e2dbb77478a220fca319e178ff439616d176fba95bd2837a75 WHIRLPOOL 30fb79cde036185635c939f3eb0f1064364f4c4161b27fbeb0897d283677bf8f843da370e8eeb48eed28410c395cc3d55515ae6d74770c7a69c61b20ece4d719
+EBUILD cairo-1.12.14-r3.ebuild 3841 SHA256 d0f62da9979fb1c8fa10cd497cbe50f2c5f80d928995c69759459078a2ac1cc2 SHA512 5b8ad764903f3ee9f396c3296c01ddb483dc8d4baa6e16f92c56e5508f6421902866d5d5bd91cd3afb50f1cb2005ceae2ed133e075c53162fec3f62a12865bfb WHIRLPOOL 13ce18cf1407a201ab05ae5deaaf7590ae9cf1da540a11a70dea960c3133684f9bbe32b476cc6df87eff7cab14c34d87b9668b1074f7d6f7075a957513168407
 EBUILD cairo-1.12.8.ebuild 3904 SHA256 4fe87359c63f2097c219ef1e701016516316ed05fcbb8160be940d9d9e0b7bb6 SHA512 8da56cca2a1f5348168102b4880489f5f4c9de843a5a08a035ebe3a0dab509f18ccce81eb00befedb9915070ca65c95539c32c7df7905ae08685a4c702cce53b WHIRLPOOL f7b95a469bb32c3d98989e59160c7b7fa8565625c12fe8bc64da301492f98f3e4f16741a2f8aed4a3bf4f517ab445913af0de79ee4c60f5f7684c91c7bfafe31
 EBUILD cairo-9999.ebuild 3696 SHA256 65a16c82cfaabc00a591389aa357c96ce14c57770aa79669caf022dc07daef25 SHA512 3f8ca81574469ad5d9da7b4202c0876a05fefb4d506281c2d61356e324f67775775bea892e23b03f921488b77505d49ea15287751be565a3c76e673121ca9db1 WHIRLPOOL 6d74ec128475d3d696ccfdbcdd0cb4947dde17e940f101040238887c76b70e6ae14310921acec206ed5ac85be9a2c83770dd77b7a1c7bde2a17061351505fbb6
-MISC ChangeLog 49740 SHA256 5340cb70968e5b1cfb7b24adefb8f1a2bde23eab4ca1438900e636dbbe03f67c SHA512 f53870b71cfddfb651cf46acef5d3ae3562f03dcb334c95f5a087432732f24476f0a5548037bcb3f438dd408f4b9148f348dff6a88288d35520d978dd2c0a53d WHIRLPOOL 2b59c9e8f2d144c374e9285a6c0da1262ea179f8341bc78e6df0634e42e4eb79b894067b117039a32b80468d1a6df7b983f6dfedee04a9f256c4b9ee5f562082
-MISC metadata.xml 890 SHA256 8ea53bcf8c81a13308668b89c44067c973dfcc00a60b026b16d1c67cd4714837 SHA512 cc2b7882e3c1d9a036c81528377d939e6a168c3b701af044ffaa38a5e24dd6e59ff8f68850151db865fa1543d74ea595ae920aac23b626df7728c85fc16719de WHIRLPOOL cf8a8a1833b2362e84d2f8f7df9bd3400c18f84ec62b6c38c93520c86bd877285fd3a90b58442ff7fe50f8b03aafc354d33d004a5e5961624f2e4eacd70462d8
+MISC ChangeLog 49996 SHA256 e9fad8ea433b8053ab20206b50604cd2f2d98b9543a8e78b77b4e6155ac4a3e2 SHA512 230d62011455acb33e495bc3bb47a5c8a18baacd457f9600addfe11092d76adc3ae7846a3a231c0a213170e0b07007ecb3293a5f5be81088a0decc7db60ade38 WHIRLPOOL df8758f3e51918261bdedf27005cb3fb931d45b0d099400e714a7452375de1d872dd27fa6132ceb76657ff13a92032fadf1b68624f3d2571e4625d08e797a811
+MISC metadata.xml 1035 SHA256 d3f855799983c24990680017ca2709eaf29dba81255ebd2a6aa0b30e163b02b0 SHA512 f39b7e8c926b93c083af131c87a28781430290f826dfbea0aadf6617caa0db8f7a2632382779d54f94e3895c9aa4a89a8de1a898953e005134feb9961bbc987a WHIRLPOOL 3521818e03e07ff23f5591d7480ce2696e9540f5712f772d874ec29e64247704e867c18b9670e794792b58fe23c9345540e1686605ecc3c17c831aba9acd8120
diff --git a/x11-libs/cairo/cairo-1.12.14-r3.ebuild b/x11-libs/cairo/cairo-1.12.14-r3.ebuild
new file mode 100644
index 000000000000..e779e70eee96
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.14-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.14-r3.ebuild,v 1.1 2013/07/17 16:19:28 chithanh Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb doc drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/zlib
+	>=x11-libs/pixman-0.28.0
+	directfb? ( dev-libs/DirectFB )
+	gles2? ( media-libs/mesa[gles2] )
+	glib? ( >=dev-libs/glib-2.28.6:2 )
+	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[openvg] )
+	qt4? ( >=dev-qt/qtgui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		drm? (
+			>=virtual/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	doc? (
+		>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2
+	)
+	X? (
+		x11-proto/renderproto
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	gles2? ( !opengl )
+	drm? ( X )
+	gallium? ( drm )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
+	epatch "${FILESDIR}"/${PN}-1.12.14-libpng16.patch
+	epatch_user
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable drm) \
+		$(use_enable directfb) \
+		$(use_enable gallium) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable xcb xlib-xcb) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index fc8322917fff..110144239960 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -11,9 +11,11 @@
       Use Mesa backend for acceleration</flag>
     <flag name='drm'>Use Linux DRM for backend acceleration</flag>
     <flag name='gallium'>Use Mesa's Gallium backend for acceleration</flag>
+    <flag name='gles2'>Use OpenGL ES 2 backend for acceleration.</flag>
     <flag name='glib'>Compile with GLib Object System support</flag>
     <flag name='legacy-drivers'>Include the buggy gradients patch (for legacy drivers, such as nvidia-drivers older than 304.30)</flag>
     <flag name='openvg'>Use OpenVG for backend acceleration</flag>
+    <flag name='valgrind'>Built-in support to mark memory regions</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>