Add patch for bug 431014 to fix EGL surfaceless extension detection.

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

4 files changed, 211 insertions, 2 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index a9c357b2348c..fcdf8cc3821b 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.305 2012/07/30 05:59:12 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.306 2012/09/12 05:24:56 mattst88 Exp $
+
+*cairo-1.12.2-r4 (12 Sep 2012)
+
+  12 Sep 2012; Matt Turner <mattst88@gentoo.org> +cairo-1.12.2-r4.ebuild,
+  +files/cairo-1.12.2-surfaceless-extension.patch:
+  Add patch for bug 431014 to fix EGL surfaceless extension detection.
 
 *cairo-1.12.2-r3 (30 Jul 2012)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 20c44cb7d28f..239b9224cea8 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cairo-1.10.0-buggy_gradients.patch 581 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18 SHA512 c602992dd962586f9de09d2a838f828901845a02ba7afa1bc0cb434393aa05e98f02dc2342299b0b09f7cfbabb0295a22874023b68e1312982df2b71e3030442 WHIRLPOOL 55c72b55b1d378653204e1c8e0db463d12254ffa7a52e5c4b86eca9b67607bdcbb545b1589fa9a6df781d230d17264c67a018cece4030aac90eda7c68c41f5ea
 AUX cairo-1.10.2-export-symbols.patch 2072 SHA256 31df610ff96a9d04b51e9636c8566bbe35112e5e012f585199bf883ee0924b3c SHA512 c74e670a4d2e372f37fe5b9e9c3b238bbd4eaae7ed98dc5e80efebfad243d777e0f09fd376761b082c2997848b08a88043c38f077408a4cfa7aacd941b54624f WHIRLPOOL 885e16165878e5c3817ff6ae07f2cf275a70721ebe903e51d9b9eb25f4790c5c9bb432516935427911e9417440f4a054dfb13da1d74f47ad998d88a44a271c92
 AUX cairo-1.10.2-interix.patch 1235 SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea SHA512 fbc524c2f359b489dc337a2aa70fbfc21e4cea0e306d144f45f520875471a66b65cd7687730461bff16c47792a30d81ed2be48895e2809cc24996a2dc26c560e WHIRLPOOL d25a09cb9c53b553690e865385be90cd696ed6135734d4d2f3814bd30e386c5f0bff05e7cd4f34c737dd2db2e35f590023b4dd7a00e767abdad9acf60775d684
 AUX cairo-1.10.2-qt-surface.patch 2687 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd SHA512 1263f129f96ecf0277ba436cac0229b6245bed273594b2199d6b0f36711e323c966c43d9264e4cc8b69a299c8e9c1ec4af09ae2284bf5ca59a72486b31439c48 WHIRLPOOL 1ec6c56a6e1de3c838fb2dfa541e062e3f63630910a5609fe211bab8c8bbdb1968af021954020b4da208ba43cde18795e6114fccdd13ee0de2e0edd285d7996a
 AUX cairo-1.10.2-ubuntu.patch 1777 SHA256 150d5b9f7f842d574a6e10e579bc8f27ca7b2055af8e0dd455aa0832bc3f4dae SHA512 8d9144fe809c4135f0dbd271d580620da769e2f946386e345783cf2379db458ed5ef964785b66d70b4e44a007c85a9209c85366144ad057d3ac5b60ee80383bc WHIRLPOOL c0754ccdeacc91ee2d222a945d8787ae3379a2881c36d8f0f6c545262baeb8f9fc866dba657f5d706c0b658efd5834c06725c2b942473b8755af10662f8ec088
+AUX cairo-1.12.2-surfaceless-extension.patch 1517 SHA256 9d138608c609499d68f1f1c1e48a7f68c39ffffa78cac3cb197776e0e353d05f SHA512 b3bce0d67813ae412d824ed93a4d97202c57c61748307a969a3b9ab499e3acdff1ccfb4c95a4559fe6a2b98bc29682ec088195aab491087acd742de942f34619 WHIRLPOOL d4cadbef80f17edcccdcaaf5528d221f024c4505440741152bdde69be66fbe2deb1ce600385fd81133fe0bb6c88356b6e32799ae347f91ec160b0f1ea4e57fce
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a SHA512 8f431963a0d952d44921087dc4f20ccf768f24e6fa892cd07b8f93f13778617dda7aa25a7624aa9d7477cbb8655353aa6499e6086131ea4a511593d0f91acee8 WHIRLPOOL 5f13bcc937451aeb72321c02340dca148568f725054b4e4ff4c01edb27c30b6b92ad415fdfcf12de3591c38cc529ae0369e8ca4a12dd2494fcebad2d4c39fa97
 AUX cairo-1.8.10-libpng14.patch 426 SHA256 b090f829d3b9fb69b83bfa094552335b8382988d60ce7e46558c4069b8bca532 SHA512 77f5558f0b740c09b5e2b8f603e0c10aca1289aea34eb9097e548bd8f9f67bdc72b7df01ae98a3f4398ddc1136a9b16cb31585fb8db22b32c8dbb75259f54fc5 WHIRLPOOL 29cc842601c1ac9b0f0455b34705301da22959f6c2cddff57b7468298d85babea5575d2796ca003d495df04a409a85cebd8dea1137311374cdc204f5c85f332a
 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3
@@ -15,7 +19,25 @@ EBUILD cairo-1.10.2-r2.ebuild 4269 SHA256 f563b262de85b4666c67e7fddf46ceb81404d7
 EBUILD cairo-1.10.2-r3.ebuild 4394 SHA256 b311e00a61be445cd8ce7477d1b142bd0248697cba9c2c3c500137189f068b41 SHA512 ed1c5f02fc830eeec26427bc01c46e1f1e63f153c2d223f6303ac921b1371d0bba601f5b081e03ec0d28de8ea227d53069a52356aa9d18fa4111a07e71cae3b8 WHIRLPOOL 3d9816cdc1c2e8c92d547448f3b6083e8e66aba8f42c1e85f06ba59a822543c700306f25ff091069eb93ff9817430b32356c5fe12b12b390ba32d9b052c5bbdd
 EBUILD cairo-1.12.2-r2.ebuild 3794 SHA256 99cbfcfee84961942439642b61eeb213df6782d13dc583640d4cacc39df9ee30 SHA512 2dde521a5a5c20b8a657a690cd2bf52370d57147a6725b51a3aafdec86df623a81cc2737baa8cbc775b24e2f24607c0f0150aced5732a3f9bd133b027c8cee09 WHIRLPOOL b6c2e9bd425c276bfe7d15a393fbf0b1a26ca819c94916bec7e9ec630e0b9e492939d83dc618cd569ef804318faf020d6536060c2393a7fe55183335625fd82b
 EBUILD cairo-1.12.2-r3.ebuild 3851 SHA256 c0b790efb00f61bf6e13ec11be173792a0fd284b0579e5e8ed5a4051c3180200 SHA512 12acc2d63489da065611314c1b3cd34419b9a1fcd3e6e4e112bfe50405e9b6a08faadcd2b5113d073f29f6b670b27989c0761ae3bfd513a769b4a4a0b8f8f0d1 WHIRLPOOL 5ddc2cec8cbb2024773b7fc1960658bd3d910f12deea8eff73251de0f65176bb9cf6c0cc51badea49e86fd19a62831c3acca3541c3a1bb832c684c3cecbc8693
+EBUILD cairo-1.12.2-r4.ebuild 3916 SHA256 ae3c5161fb7e1ad9fe5ca9e7d4c4527dcc371496f002c92563adef0e50d947b0 SHA512 d305c935870a06e2c4ee79cbecd4ab1a97bedb8c745564ff6c594fcd884cad5d341c8cb2bbed848816c12de6c39bcfa7acc6eafa04bd8e09cc2e997efd8cf66d WHIRLPOOL 767c7197a763691bea50e32b87aa2692f21274566ee33596e7d33baac383d5ada4df254895b35f0f57482ec6649b6aa427b3a86af6651675ee6385170c912ea9
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
 EBUILD cairo-9999.ebuild 3817 SHA256 d9048b6251f2749a71a804d9a54cd985dc22aa175efc859eeec1c6dbe6a17f1c SHA512 fad64130fd5dec7b8c6bc92681b8432ac66f90eb162e96ba4bf91aac2da0abd18ca4ae050b36876ad244694362fde49c4ac7b70d501626979386468740921906 WHIRLPOOL b2aa186b014782aa973859f7a611b98f83f92db67d5ec8896cada468b5b43110db34f9c653747e3bb08ec7bdac6e502341fd85e7c16466b1fd3ea4647ecbcc1e
-MISC ChangeLog 43629 SHA256 a0a7eed6fa8160a75f3c4b02717c9b49271dc957576a4bf92936ffecbf1ceeb7 SHA512 5468a82d313d2f02fce25e21917e1de666eef37467bc5b854a632ffcfa8f4c30f9e65c079974203f2aac52a7ebb8566c0ad5f677308d5319f85afc1859860e86 WHIRLPOOL cb3a68b9867a47fc05cb7554e854c6c2b890db1319dc0875ba9660474564e256257cd0177a353f3d26f61c30c394ef8288fee2ae4eabd113c96b3132eb205e0f
+MISC ChangeLog 43860 SHA256 324b03fcf335ac4293a5fedb0ac4e6adadcce49d2571dbea0e3f50e519d504ec SHA512 949e9f72eec2d11044ea4709512c2bb885e3f577efa6bee0b38eecf5f0764bd675d91c35879a9fcea8ec8165707e850c6838d1f0f9f1c4792ba95c7763435b21 WHIRLPOOL ca536345ea3ea9372317e454bd8b280fee73171495ea813db06b794474ad6d356384163ada790ed01694e2cde91ccb0710c9d5c8f7246383c0d322db93028a06
 MISC metadata.xml 958 SHA256 34cc9c511683c03054b582ff5ce62e1a75a79cc472d83ff37f20e4d0d352064c SHA512 c541701c99a94d60f5dd22f27160ede89781411641c5772ba94fd24566b95ffc56bf90d06586d8038b4c1445f896cc295a7a03f27bc2e0e6fc9f489be678ef23 WHIRLPOOL c96181f0119d73c0084fd659d6aa3a9dd2d8ac3194d35efd23bf46e8e9f3d7aa00b11130c736f2578cfe20695fd41254dad03002db28ec6337ba57ada4aee2b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQUB0JAAoJEA/daC2XTKcqLmsP/RGG6vDMMwvla2ekgRMtQCyU
+kbknzzRzz4KWWBRjKCUYY1hO29pVfje64NmYkuwUh4NYbAEh05fUHMCCsRIZalNq
+B2XJkMAUel/I5NPvDbRIWXK5tmH5oOTmgW9ceOaQ2lmxUZ9KjXdMoOey9y6fD5Tx
+S1sDZrGgJkO6aErLTj3+fURbQ+HvyS5aOd3tSKuHpNRUqXX/Gbz4bRBz/mN4/KPD
+MKBfLpO8v2DYkybifAThonuzFMnqxzbVaP2f8/mAh9eABgbiuRGpTlm90wjQY7xR
+XS5EruSRDSeB5mzdi/0rYipuoSHnnoDCfMsXFt+tUsme3jDoFxNkrlKspSv9ET+y
+WTIwsqlan+UV9ZSWOsCdTOcKIj4Fx0n25NMuA9u71ecq/7BpU7MgWJzX+9b8lpkF
+UWKflygH5MZ5d6Gmvkz3rS4Nwq0VZWW6LY9VpPHewn0/A3eVB/FJ8DpKgj0XQ9dJ
+lSbmmwrijUDuw1TB+ubZK5qGTFP4T9iKaOtjhmFO3ZVakKpXDKR2VQIA7onvjTx9
+EB7Spxagdp/CY4B1TlmhwmWdnkVphBYG97g+QQ56ee93VI7FAdZ/MVHQE5mJVrFV
+Q6FTOMcnRBAmagQRWMLImzla4zCYGS/e2ZEOrkkOJ/aZwVAw2lVBt7TKJBG+btZY
++XGW19/zDdCCAfEzfSzD
+=cojD
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.2-r4.ebuild b/x11-libs/cairo/cairo-1.12.2-r4.ebuild
new file mode 100644
index 000000000000..8c5c8d4bc517
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.2-r4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2-r4.ebuild,v 1.1 2012/09/12 05:24:56 mattst88 Exp $
+
+EAPI=4
+
+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 ~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 +glib opengl openvg qt4 static-libs +svg 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.18.4
+	directfb? ( dev-libs/DirectFB )
+	glib? ( >=dev-libs/glib-2.28.6:2 )
+	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[openvg] )
+	qt4? ( >=x11-libs/qt-gui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libX11
+		drm? (
+			>=sys-fs/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="
+	drm? ( X )
+	gallium? ( drm )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch "${FILESDIR}"/${PN}-1.12.2-surfaceless-extension.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
+
+	# SuperH doesn't have native atomics yet
+	use sh && myopts+=" --disable-atomic"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	use X && myopts+=" --enable-tee=yes"
+
+	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 xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(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 xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable drm) \
+		$(use_enable gallium) \
+		--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/files/cairo-1.12.2-surfaceless-extension.patch b/x11-libs/cairo/files/cairo-1.12.2-surfaceless-extension.patch
new file mode 100644
index 000000000000..4222d8935ab2
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.2-surfaceless-extension.patch
@@ -0,0 +1,37 @@
+commit f59b0914f4ddbff0d116c918343a6726d5f4317b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Sat Aug 11 17:38:36 2012 +0100
+
+    egl: s/EGL_KHR_surfaceless_opengl/EGL_KHR_surfaceless_context/
+    
+    Mesa changed the name of the extension it invented, so check for the
+    real name and the old name before falling back to pbuffers which are not
+    supported by most EGL implementations.
+    
+    References: https://bugs.freedesktop.org/show_bug.cgi?id=53361
+    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/src/cairo-egl-context.c b/src/cairo-egl-context.c
+index eb1ef29..b24bc80 100644
+--- a/src/cairo-egl-context.c
++++ b/src/cairo-egl-context.c
+@@ -122,8 +122,10 @@ _egl_make_current_surfaceless(cairo_egl_context_t *ctx)
+     const char *extensions;
+ 
+     extensions = eglQueryString(ctx->display, EGL_EXTENSIONS);
+-    if (!strstr(extensions, "EGL_KHR_surfaceless_opengl"))
++    if (strstr(extensions, "EGL_KHR_surfaceless_context") == NULL &&
++	strstr(extensions, "EGL_KHR_surfaceless_opengl") == NULL)
+ 	return FALSE;
++
+     if (!eglMakeCurrent(ctx->display,
+ 			EGL_NO_SURFACE, EGL_NO_SURFACE, ctx->context))
+ 	return FALSE;
+@@ -174,7 +176,6 @@ cairo_egl_device_create (EGLDisplay dpy, EGLContext egl)
+ 	eglChooseConfig (dpy, config_attribs, &config, 1, &numConfigs);
+ 
+ 	ctx->dummy_surface = eglCreatePbufferSurface (dpy, config, attribs);
+-
+ 	if (ctx->dummy_surface == NULL) {
+ 	    free (ctx);
+ 	    return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY);