x11-libs/pixman: drop the useless sse USE flag, disable mmx/sse2 instead of dying (fixes bugs #236558 and #260287 among others)

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

3 files changed, 63 insertions, 2 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index cef7bc9f220a..095dc3bf829d 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.30 2009/03/18 14:20:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.31 2009/03/24 11:20:59 remi Exp $
+
+*pixman-0.14.0-r1 (24 Mar 2009)
+
+  24 Mar 2009; Rémi Cardona <remi@gentoo.org> +pixman-0.14.0-r1.ebuild:
+  drop the useless sse USE flag, disable mmx/sse2 instead of dying (fixes
+  bugs #236558 and #260287 among others)
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> pixman-0.12.0.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index a1d80f913886..7c7dd9055f7d 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -12,7 +12,8 @@ EBUILD pixman-0.10.0.ebuild 436 RMD160 ba8b2b5f88754aba2987616edde6c335780fad98
 EBUILD pixman-0.11.6.ebuild 571 RMD160 7ba5cfe9a5b9cf3ec5a9e883914f3b00d12cd01c SHA1 86fb3ab34f160752f047f866f9af07e99df18490 SHA256 895e175cd2f5256d56ef9c89bbf23b67fd475f050f113ba2ca43bcd9c35483df
 EBUILD pixman-0.11.8.ebuild 1239 RMD160 18a075f750b7ff7a98d4a443ea19ea739235425d SHA1 c6da5c5b0750e2f79e426f6eb5b7d65a79d152f5 SHA256 be653d9c492d52a66869264c5c7d16f2ed6e41378ffa38e5c0dc73c8cef86940
 EBUILD pixman-0.12.0.ebuild 1196 RMD160 92bf46900f40162ddcda0ad013cdcb98439a38c3 SHA1 136b9e774555614174a2257b4569a6e2f35673bf SHA256 1dcaf79cf0a4f6efb49a78b0b826839580ef905169c8d48af24d3044d74c7037
+EBUILD pixman-0.14.0-r1.ebuild 1606 RMD160 348902701c4d86c5e9a76c17a4f84684047b1cfc SHA1 ba40a61f46c184a0ceae53e516277551e6a1a9bc SHA256 cb678d615cfff96e5f8c6e3dc681c0ffe2a1d8f94704c756c4f65ddf54a78bed
 EBUILD pixman-0.14.0.ebuild 1211 RMD160 95df520a7560f2e39b09511e31bef2ea32d01729 SHA1 c81419951b8e61a6f9cbffe9a5e0d06c2c3d0101 SHA256 b6538e967278a2411e97dc97b71574373e05d3bc03632ee3c142886a2bda7889
 EBUILD pixman-0.9.6.ebuild 442 RMD160 07024b70d9d7c77d2a4e4a9e0bc7e8ec3a1002b7 SHA1 3ee1dc9ba7bbf5724f64099842a2ef3c643539c7 SHA256 b3fe59dac23feaea1b7c7f04235f1281721474e66511e4e5fb51af244804a728
-MISC ChangeLog 4810 RMD160 fe406b27aefbce6d5cc37c3f77eb89e466371dee SHA1 cb936e8f2a0242e5202e12b9c4290e182eb672cc SHA256 b5ec8490df9326b0983a55054b4169e43194aba57ec8143a8c6c8c837fd67f2b
+MISC ChangeLog 5029 RMD160 9b83dce8f2f0766fc489e25badb38aee3ea39033 SHA1 d186a913d05d464ff96961c4d642325e6085ac18 SHA256 167d8a64c9ea35fa2a7566a35fbb911f60fae3f0990dd0e3287cabd851683f55
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/pixman/pixman-0.14.0-r1.ebuild b/x11-libs/pixman/pixman-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..9b3bc4679d7b
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.14.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.14.0-r1.ebuild,v 1.1 2009/03/24 11:20:59 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular toolchain-funcs versionator
+
+DESCRIPTION="Low-level pixel manipulation routines"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="altivec mmx sse2"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="
+		$(use_enable altivec vmx)
+		--disable-gtk"
+
+	local enable_mmx="$(use mmx && echo 1 || echo 0)"
+	local enable_sse2="$(use sse2 && echo 1 || echo 0)"
+
+	# this block fixes bug #260287
+	if use x86; then
+		if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
+			ewarn "SSE2 instructions require GCC 4.2 or higher."
+			ewarn "pixman will be built *without* SSE2 support"
+			enable_sse2="0"
+		fi
+	fi
+
+	# this block fixes bug #236558
+	case "$enable_mmx,$enable_sse2" in
+	'1,1')
+		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --enable-sse2" ;;
+	'1,0')
+		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --disable-sse2" ;;
+	'0,1')
+		ewarn "You enabled SSE2 but have MMX disabled. This is an invalid."
+		ewarn "pixman will be built *without* MMX/SSE2 support."
+		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
+	'0,0')
+		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
+	esac
+}
+
+src_unpack() {
+	x-modular_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}"/pixman-0.12.0-sse.patch
+
+	eautoreconf
+	elibtoolize
+}