summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2008-07-20 14:01:58 +0000
committerBen de Groot <yngwin@gentoo.org>2008-07-20 14:01:58 +0000
commit5ed666bea883ea47ef9c5c7077c63922449096a3 (patch)
treee346abfbabdeb597c0a85b2fd7b7070d0d48fe09 /x11-libs
parentVersion bump (diff)
downloadgentoo-2-5ed666bea883ea47ef9c5c7077c63922449096a3.tar.gz
gentoo-2-5ed666bea883ea47ef9c5c7077c63922449096a3.tar.bz2
gentoo-2-5ed666bea883ea47ef9c5c7077c63922449096a3.zip
Fix pixman libtool failure and add sse useflag and patch from bug #232126
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-hh7 i686)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/pixman/ChangeLog7
-rw-r--r--x11-libs/pixman/files/pixman-0.11.8-sse.patch12
-rw-r--r--x11-libs/pixman/pixman-0.11.8.ebuild13
3 files changed, 28 insertions, 4 deletions
diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index bf70bac26700..d36c85d03fc0 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,11 @@
# 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.16 2008/07/19 04:02:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.17 2008/07/20 14:01:57 yngwin Exp $
+
+ 20 Jul 2008; Ben de Groot <yngwin@gentoo.org>
+ +files/pixman-0.11.8-sse.patch, pixman-0.11.8.ebuild:
+ Fixing libtool problems as reported in bug #232301 and adding sse useflag
+ and patch from bug #232126.
19 Jul 2008; Doug Goldstein <cardoe@gentoo.org>
+files/pixman-0.11.8-sse2-intrinsics-check.patch, -pixman-0.11.4.ebuild,
diff --git a/x11-libs/pixman/files/pixman-0.11.8-sse.patch b/x11-libs/pixman/files/pixman-0.11.8-sse.patch
new file mode 100644
index 000000000000..5cdb1d452ec7
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.11.8-sse.patch
@@ -0,0 +1,12 @@
+--- configure.ac.orig 2008-07-18 13:15:45.000000000 +0200
++++ configure.ac 2008-07-18 13:15:50.000000000 +0200
+@@ -187,9 +187,6 @@
+ #if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
+ #error "Need GCC >= 3.4 for SSE intrinsics"
+ #endif
+-#if !defined(__amd64__) && !defined(__x86_64__)
+-#error "Need x86-64 for SSE"
+-#endif
+ #include <mmintrin.h>
+ #include <xmmintrin.h>
+ int main () {
diff --git a/x11-libs/pixman/pixman-0.11.8.ebuild b/x11-libs/pixman/pixman-0.11.8.ebuild
index 18b3f75ef12b..d37412d5399d 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.2 2008/07/19 04:02:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.8.ebuild,v 1.3 2008/07/20 14:01:57 yngwin Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -9,9 +9,16 @@ inherit x-modular
DESCRIPTION="Low-level pixel manipulation routines"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="altivec mmx sse2"
+IUSE="altivec mmx sse sse2"
CONFIGURE_OPTIONS="$(use_enable altivec vmx) $(use_enable mmx) \
$(use_enable sse2) --disable-gtk"
-PATCHES="${FILESDIR}/pixman-0.11.8-sse2-intrinsics-check.patch"
+src_unpack() {
+ x-modular_src_unpack
+ cd "${S}"
+ use sse && epatch "${FILESDIR}"/${P}-sse.patch
+ epatch "${FILESDIR}"/${P}-sse2-intrinsics-check.patch
+ eautoreconf
+ elibtoolize
+}