summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2008-07-21 14:44:21 +0000
committerDoug Goldstein <cardoe@gentoo.org>2008-07-21 14:44:21 +0000
commit34519257f1a6d94f929c86a858daa0e4e20d4e1a (patch)
treeab0780d0101ff6679024d09524bc6a045811265e /x11-libs/pixman
parentVersion bump and removed old ebuilds. (diff)
downloadhistorical-34519257f1a6d94f929c86a858daa0e4e20d4e1a.tar.gz
historical-34519257f1a6d94f929c86a858daa0e4e20d4e1a.tar.bz2
historical-34519257f1a6d94f929c86a858daa0e4e20d4e1a.zip
Add pkg_setup() checks for SSE & SSE2 use flags as well as SSE2 and GCC 4.2
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64
Diffstat (limited to 'x11-libs/pixman')
-rw-r--r--x11-libs/pixman/ChangeLog6
-rw-r--r--x11-libs/pixman/Manifest14
-rw-r--r--x11-libs/pixman/pixman-0.11.8.ebuild16
3 files changed, 32 insertions, 4 deletions
diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index d36c85d03fc0..23eb348ee8d4 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/pixman
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.17 2008/07/20 14:01:57 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.18 2008/07/21 14:44:21 cardoe Exp $
+
+ 21 Jul 2008; Doug Goldstein <cardoe@gentoo.org> pixman-0.11.8.ebuild:
+ Add pkg_setup() checks for SSE & SSE2 use flags as well as SSE2 and GCC
+ 4.2
20 Jul 2008; Ben de Groot <yngwin@gentoo.org>
+files/pixman-0.11.8-sse.patch, pixman-0.11.8.ebuild:
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 8f6803adb426..66a2d1c61fba 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX pixman-0.11.4-memleak.patch 1460 RMD160 02ff324f7257e762543c48469ef2c875551bdfb2 SHA1 de6efadd1cd0d574926cc833401c527b2a73ade5 SHA256 ad698e59072c096bcad22a9262ce4de566b0c37e8c5036658505d1133f599eda
AUX pixman-0.11.8-sse.patch 415 RMD160 2b60b366b411d5b7c504673b0c7ed7bc24e65337 SHA1 3902c85a84dc70a6664cb259f2f40935787fc994 SHA256 053d053e371b53c0dd4bba012a534607a00069dfd8f93be3f4aa75a8789e2539
AUX pixman-0.11.8-sse2-intrinsics-check.patch 628 RMD160 e804187cc82f8f802f20037052dfbfe8ae0b517a SHA1 c151e3d4833a6be3768f7d87c2287d4b9d295e91 SHA256 845328bc17aaea91ac079f45ecc56a25519007bcba109130c87cebead75c1dc6
@@ -7,7 +10,14 @@ DIST pixman-0.11.8.tar.bz2 360229 RMD160 c1a69a2110b09c0af2bbc05637e74eebdfa7a12
DIST pixman-0.9.6.tar.bz2 290399 RMD160 3cde968776ea75ed8efd4b5c126238fd2a9817cb SHA1 d31ea97176e475b47bcc9c0ad4813859857fb061 SHA256 c504db9338d67c388824ebbf805a424d2cc0fab681e33bff6733603539d6335b
EBUILD pixman-0.10.0.ebuild 435 RMD160 40721f1458ae9ec1514880c9078c6a35223a6fbe SHA1 5362a8825583d296a72f61336d523d66ad804d82 SHA256 8361ca4d41d27863edf65e9440ffa0160a291e54598f0fe3ec951f57d3db0c08
EBUILD pixman-0.11.6.ebuild 564 RMD160 a9dc31ef7bfb1acf05d49ede774463c3f25b61a4 SHA1 3a8a0b9efe4b0ec0b21b729ffeb86afec7aa87ac SHA256 092c22952852f11d3ed627e7d62c99aef7755f7fb11c4753c57c6dc2cf02e401
-EBUILD pixman-0.11.8.ebuild 748 RMD160 21ed459e9c7e72b8a89da43146c92cc62be09c8c SHA1 a04dcd5bcad331ccfaab7eb77432fe65c5f1e450 SHA256 9f1a1ac8bb23e2303ce291f2b1715b2011b6140b7bf7e2cc3b1ae76168054616
+EBUILD pixman-0.11.8.ebuild 1204 RMD160 a0c55bfb9bdf221863264970e46e2e98fbdad40e SHA1 a018b8f6e3b974ab5ef896ca67d17a913f546b0d SHA256 b77e74437a4c2c88023c85d8694e61a916e6a6806a344e353502685f2d79f248
EBUILD pixman-0.9.6.ebuild 442 RMD160 07024b70d9d7c77d2a4e4a9e0bc7e8ec3a1002b7 SHA1 3ee1dc9ba7bbf5724f64099842a2ef3c643539c7 SHA256 b3fe59dac23feaea1b7c7f04235f1281721474e66511e4e5fb51af244804a728
-MISC ChangeLog 3236 RMD160 2635b23bed382e57875e6bf4acf6eea29109a551 SHA1 c5e3ea907611227a442d40704db3f477996c7760 SHA256 6a80f0301d60a9557c9cbcc7b2e199b004c75b122f036983fac69cb9dae388aa
+MISC ChangeLog 3389 RMD160 cf5f49d40539c9d2d23c8c510b73814fac34cc3a SHA1 5c61151a0dd9613d913e64038202a89340971546 SHA256 ee285cc131777ca0e51aa87c0d226083ee1ad027d78152864820e96df2e37ba9
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiEoNkACgkQoeSe8B0zEfyEegCfaqASJgFfaeE8wXxLZXDrySqD
+1fkAnjdZ/9fmkpaUi5MtRUZD7hwZLvWl
+=bVD4
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/pixman/pixman-0.11.8.ebuild b/x11-libs/pixman/pixman-0.11.8.ebuild
index d37412d5399d..7e540888d9c7 100644
--- a/x11-libs/pixman/pixman-0.11.8.ebuild
+++ b/x11-libs/pixman/pixman-0.11.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.8.ebuild,v 1.3 2008/07/20 14:01:57 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.8.ebuild,v 1.4 2008/07/21 14:44:21 cardoe Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -14,6 +14,20 @@ IUSE="altivec mmx sse sse2"
CONFIGURE_OPTIONS="$(use_enable altivec vmx) $(use_enable mmx) \
$(use_enable sse2) --disable-gtk"
+pkg_setup() {
+ if use sse2 && ! use sse; then
+ eerror "You enabled SSE2 but have SSE disabled. This is an invalid"
+ eerror "configuration. Either do USE='sse' or USE='-sse2'"
+ die "SSE2 selected without SSE"
+ fi
+
+ if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
+ eerror "SSE2 instructions require GCC 4.2 or higher. Either use"
+ eerror "GCC 4.2 or higher or USE='-sse2'"
+ die "SSE2 instructions require GCC 4.2 or higher"
+ fi
+}
+
src_unpack() {
x-modular_src_unpack
cd "${S}"