[gentoo-commits] proj/x11:master commit in: x11-libs/pixman/files/, x11-libs/pixman/, x11-libs/libX11/

[gentoo-commits] proj/x11:master commit in: x11-libs/pixman/files/, x11-libs/pixman/, x11-libs/libX11/

[Tomas Chvatal]

commit:     5ffbf43d8d3c7f63e63632dad624d2d6feedfce6
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 17:24:38 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 17:24:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5ffbf43d

Sync from main tree.

---
 x11-libs/libX11/libX11-9999.ebuild            |   13 +++++++++----
 x11-libs/pixman/files/pixman-0.12.0-sse.patch |   14 --------------
 x11-libs/pixman/pixman-9999.ebuild            |    3 ++-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 33e260b..323488f 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.2.ebuild,v 1.2 2011/03/21 14:05:45 flameeyes Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
@@ -45,6 +45,11 @@ src_configure() {
 
 src_compile() {
 	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
-	( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all)
+	if tc-is-cross-compiler; then
+		(
+			filter-flags -m*
+			emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die
+		)
+	fi
 	xorg-2_src_compile
 }

diff --git a/x11-libs/pixman/files/pixman-0.12.0-sse.patch b/x11-libs/pixman/files/pixman-0.12.0-sse.patch
deleted file mode 100644
index 1f6ee92..0000000
--- a/x11-libs/pixman/files/pixman-0.12.0-sse.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig	2008-09-25 20:34:22.000000000 -0700
-+++ configure.ac	2008-09-25 20:43:57.000000000 -0700
-@@ -191,10 +191,8 @@
- CFLAGS="$CFLAGS -msse2 $SSE2_CFLAGS"
- 
- AC_COMPILE_IFELSE([
--#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
--#   if !defined(__amd64__) && !defined(__x86_64__)
-+#if !defined(__GNUC__) && !(__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
- #      error "Need GCC >= 4.2 for SSE2 intrinsics on x86"
--#   endif
- #endif
- #include <mmintrin.h>
- #include <xmmintrin.h>

diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 479a7c1..03f0f82 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -9,12 +9,13 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 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 ~x86-winnt"
-IUSE="altivec mmx sse2"
+IUSE="altivec mmx neon sse2"
 
 pkg_setup() {
 	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="
 		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
 		--disable-gtk"
 
 	local enable_mmx="$(use mmx && echo 1 || echo 0)"