Add lcdfilter USE flag to apply patch from Ubuntu (takes precedence over cleartype USE flag), fixes bug 303421.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 140 insertions, 3 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 1b94c2ad8fca..ce03914adc43 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.237 2010/03/08 09:00:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.238 2010/03/26 22:34:15 spatz Exp $
+
+*cairo-1.8.8-r1 (26 Mar 2010)
+
+  26 Mar 2010; Dror Levin <spatz@gentoo.org> +cairo-1.8.8-r1.ebuild,
+  metadata.xml:
+  Add lcdfilter USE flag to apply patch from Ubuntu (takes precedence over
+  cleartype USE flag), fixes bug 303421.
 
   08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> cairo-1.8.8.ebuild,
   +files/cairo-1.8.8-libpng14.patch:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b8e3cda849a7..d2e07c00bd25 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,7 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
 AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299
 AUX cairo-1.8.8-libpng14.patch 461 RMD160 e6676e89f64ae2c1390315ad58d0c697acf66e9d SHA1 0a900ceb2b5fa9721687dc670a1b582fa6c59341 SHA256 d4391514334809b6a13c644d7655c02e5d1070d61653452ff93fcc44bf904fb6
+DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
+EBUILD cairo-1.8.8-r1.ebuild 3575 RMD160 8b403c4f3ef1d7c11ca5eea1a411ab5268f361c1 SHA1 2ba2c61a8b9934b0e019ef6b2089d8a7e4660eb5 SHA256 73086488637ad12e996059f7ea1cf4f0fdb6675deeb832f98012811761114e84
 EBUILD cairo-1.8.8.ebuild 3268 RMD160 93e9229cfa92173c2941f22a59960b52f3841cbc SHA1 f505952d4df79f73f95e90c0415c1bd58f51df10 SHA256 c50936f777d7a29b223ed4f80e192e11759c6a0f35779e2eaaa18aa9bbf89bbc
-MISC ChangeLog 33130 RMD160 2014f29182553b4370e145fff889f348065847a5 SHA1 7f874d4484014e2bd501e30dcb6d92708720be18 SHA256 9756414450c4b9a27edd172157dad45c2811fc4166c6a5d086a00b96573b11d7
-MISC metadata.xml 628 RMD160 589b0a5e55683527204892191462856d90661d4e SHA1 b0f6e67dffc97e5c0ed9acea7448cd5f92e36c41 SHA256 802fcf2d639a4125475acd325ebfa874ef3e89055e02636968baa9fa6fc5e406
+MISC ChangeLog 33359 RMD160 2cef6066077ec3f1286580552b20e7599de551ff SHA1 2daf57c005b2f4416033fa48ebe2a67650f1ad55 SHA256 0d7003c2e1d7a64c36eb6d31ba499a948665d6cc2e9cd004db31530e4e31c42b
+MISC metadata.xml 880 RMD160 e438a6b32c150ad5bc85b6af589332348b163ce3 SHA1 4eaefef9d254e085d8438768202d4aa947814802 SHA256 3f735384598141c1905cd1e260e6392dbe8618aea2a173743fbbfe267c38ea5d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLrTZvAAoJEAWF714uGAc61GQH/RGzdEIfAQwqQCbOGWAM4GHI
+RcN4yphkHLZwj0KF2MdUU5yqhjiV8iwof1q2kLGTgcB6sR83tIaftIPUxegOu4D3
+VOp/fTM3j/JAOt8VEixcnk79XwcDVnyRJ6YGIovIh4KJaO8Tp5TCFjuDWItT2mA1
+mH/WUn6dtBG+WUf1ISojQOhCQ4GsqJn79wlf33OMWotVmrGoPgTJ5+3Jhyb6VlCh
+crqE6vpPv5bmyatcguiHCqMsdLJhLTynacY5SA2akXgKaetZ+upj3GMDPHNsRyXl
+G6NorOUm06ydu3l/zt4w7xl+HvZ+z0sO3cmo/9lq3rxXhnFR3po/AZPqcZMkkuo=
+=3AJl
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.8.8-r1.ebuild b/x11-libs/cairo/cairo-1.8.8-r1.ebuild
new file mode 100644
index 000000000000..6f9b5b4c3cb3
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.8.8-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8-r1.ebuild,v 1.1 2010/03/26 22:34:15 spatz Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz
+	mirror://gentoo/${PN}-1.8-lcd_filter.patch.bz2"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cleartype debug directfb doc glitz lcdfilter opengl +svg X 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.1.9
+	sys-libs/zlib
+	media-libs/libpng
+	>=x11-libs/pixman-0.12.0
+	directfb? ( >=dev-libs/DirectFB-0.9.24 )
+	glitz? ( >=media-libs/glitz-0.5.1 )
+	svg? ( dev-libs/libxml2 )
+	X? ( 	>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft )
+	xcb? (	>=x11-libs/libxcb-0.92
+		x11-libs/xcb-util )"
+#	test? (
+#	pdf test
+#	x11-libs/pango
+#	>=x11-libs/gtk+-2.0
+#	>=app-text/poppler-bindings-0.9.2[gtk]
+#	ps test
+#	app-text/ghostscript-gpl
+#	svg test
+#	>=x11-libs/gtk+-2.0
+#	>=gnome-base/librsvg-2.15.0
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	>=sys-devel/libtool-2
+	doc? (	>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2 )
+	X? ( x11-proto/renderproto )"
+
+src_prepare() {
+	if use lcdfilter; then
+		# LCD filter patch from Ubuntu, taken from:
+		# http://bazaar.launchpad.net/%7Eubuntu-branches/ubuntu/lucid/cairo/lucid/files/head%3A/debian/patches/
+		epatch "${WORKDIR}"/${PN}-1.8-lcd_filter.patch
+	elif use cleartype; then
+		# ClearType-like patches applied by ArchLinux
+		epatch "${FILESDIR}"/${PN}-1.2.4-lcd-cleartype-like.diff
+	fi
+
+	epatch "${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${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
+
+	if use glitz && use opengl; then
+		export glitz_LIBS=$(pkg-config --libs glitz-glx)
+	fi
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) $(use_enable xcb) \
+		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-ft --enable-ps \
+		$(use_enable aqua quartz) $(use_enable aqua quartz-image) \
+		|| die "configure failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	if use xcb; then
+		ewarn "You have enabled the Cairo XCB backend which is used only by"
+		ewarn "a select few apps. The Cairo XCB backend is presently"
+		ewarn "un-maintained and needs a lot of work to get it caught up"
+		ewarn "to the Xrender and Xlib backends, which are the backends used"
+		ewarn "by most applications. See:"
+		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
+	fi
+}
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 71ba7340209d..c6767c474816 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -6,11 +6,18 @@
   <email>cardoe@gentoo.org</email>
   <name>Doug Goldstein</name>
 </maintainer>
+<maintainer>
+  <email>spatz@gentoo.org</email>
+  <name>Dror Levin</name>
+</maintainer>
 <use>
 	<flag name='cleartype'>Add ClearType-style behavior for sub-pixel hinting.
 		Patch taken from Arch Linux</flag>
 	<flag name='glitz'>Build with glitz support, which replaces some software
 		render operations with Mesa OpenGL operations</flag>
+	<flag name='lcdfilter'>Add FreeType LCD filtering, ClearType-style behavior
+		for sub-pixel-hinting. Overrides cleartype USE flag. Patch taken from
+		Ubuntu</flag>
 	<flag name='opengl'>When used along with USE=glitz, enables glitz-glx usage.
 		Requires hardware OpenGL support</flag>
 </use>