Make xlib-xcb backend optional, this might address all of bugs #441878 #476306 #477444 and #477530. Also require gles2 or opengl for openvg, bug #447294.

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

4 files changed, 152 insertions, 3 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 55e63c6094b1..b36e5a910ffa 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.341 2013/07/18 12:16:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.342 2013/07/22 01:19:31 chithanh Exp $
+
+*cairo-1.12.14-r4 (22 Jul 2013)
+
+  22 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +cairo-1.12.14-r4.ebuild, metadata.xml:
+  Make xlib-xcb backend optional, this might address all of bugs #441878 #476306
+  #477444 and #477530. Also require gles2 or opengl for openvg, bug #447294.
 
   18 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   cairo-1.12.14-r3.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index f2dc65c56709..1fb1bf053519 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -20,7 +20,8 @@ EBUILD cairo-1.12.12-r1.ebuild 4064 SHA256 d10f80a855542c6a22c6399aa6e18c91a10d6
 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 3726 SHA256 8bd7c91a3981fd50002384de4155adda883ec5a9cbb96f0052f08530724455d4 SHA512 25e3e30c5a94d7c04c610de720e14e03453e486551e939b26c7ff8fb9b0bc90d20c7572e117a4aa812935d57b2f9223cdf626bb5d041c2c12c65c95fc07611d2 WHIRLPOOL be65eb62f6f37176a520b33536f677aa347100f829778b8c3e7a8401e8f9c5eaabe4e3dc87bf1f7741e928a6656f361170efba5e250a34c9ec0ab622ddce9f9b
+EBUILD cairo-1.12.14-r4.ebuild 3782 SHA256 987b77076913177f1760c1d65d1b12b8aa62078446af771239b267f122d550e5 SHA512 55d3555c4112c64078f79db1845ce7f29c019026a6360e0554e3f2edf0cddd6a47188b858f20a5bbd4d76c1e8e3de0725062b892107fc5cb87ca902ba5dd15b6 WHIRLPOOL ac8b1c91dd0a0212aaf54e64eaa2988e52db367b51cb7a66e3935436e91c0a85d0bc7eb536ec0bc84dfa42584936e0d845f67627dadf92b1389a7ca0cb5e5477
 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 50169 SHA256 26677e34a07f5ed242c75e932749434e5dd9aaf84c706da54fffccdeb8300076 SHA512 7548c4b6146ba3d00f4e41d75a9edc55f254b84449824c9fa518164ac6ce8e2193ad4a72c10eac0f4d217a1b65e0af7369bec50ed7b19236e47c0cb56a16df94 WHIRLPOOL b4e32b5a5ab0da312fc9e033ca603a87e6f0de465bb3130b01fbd8208c6d76e061cd6f66d4efc2d9ab194042d334386bfa25d8dee2b69898cfde2b4338d963a1
-MISC metadata.xml 1035 SHA256 d3f855799983c24990680017ca2709eaf29dba81255ebd2a6aa0b30e163b02b0 SHA512 f39b7e8c926b93c083af131c87a28781430290f826dfbea0aadf6617caa0db8f7a2632382779d54f94e3895c9aa4a89a8de1a898953e005134feb9961bbc987a WHIRLPOOL 3521818e03e07ff23f5591d7480ce2696e9540f5712f772d874ec29e64247704e867c18b9670e794792b58fe23c9345540e1686605ecc3c17c831aba9acd8120
+MISC ChangeLog 50472 SHA256 3501be7b2a86283b169cc1163e9f900b26b61758c4aac51d48d29e48e989ed91 SHA512 d3d8f71be4692f0547e4b3c9e6b64f04c64d5829193c721e1a55b6b036687cbcf1c924d0b3f191dac0ee7266961436416d538e936923a5fe647c2f221164a112 WHIRLPOOL 1264f1d550e37902001d722b1d76e6cfb35682402b1416461acfd44d58b1b35da9cbccc4e6756ed402bb532e4ad32723b92d4836e86ddd86b6024c1fd75f3971
+MISC metadata.xml 1120 SHA256 739fdd3c6c11e95820f728b2bae026e2370e84e3acdc86f36d958bc80f6b2744 SHA512 e50a851393522b2abbe04ded156c6c0eecf43cbb8ee4225df1a3e3a86b79c3fbb052f2893db63c6d7764308f2cca5d6a15fad83fae3275fb9778e91b05b1e0f1 WHIRLPOOL 7243b6f542f372a880aefca5c787a21b35947c9ecbcd9dd9e7f3f788104c82523793d423b2355e15f646114300ee62d149f47ed5ee444bc26edec526e2d545e6
diff --git a/x11-libs/cairo/cairo-1.12.14-r4.ebuild b/x11-libs/cairo/cairo-1.12.14-r4.ebuild
new file mode 100644
index 000000000000..60d32b8f44b5
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.14-r4.ebuild
@@ -0,0 +1,140 @@
+# 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-r4.ebuild,v 1.1 2013/07/22 01:19:31 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 xlib-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="
+	drm? ( X )
+	gallium? ( drm )
+	gles2? ( !opengl )
+	openvg ( || ( gles2 opengl ) )
+	xlib-xcb? ( xcb )
+"
+
+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"
+
+	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 xlib-xcb) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		${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 110144239960..348bc073bbc0 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -16,6 +16,7 @@
     <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>
+    <flag name='xlib-xcb'>Use XCB renderer backend for acceleration over xlib</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>