Version bump.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

2 files changed, 57 insertions, 1 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 8d96bff84e4b..3a047e730be7 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.101 2011/06/28 21:28:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.102 2011/07/06 20:50:15 chithanh Exp $
+
+*pixman-0.22.2 (06 Jul 2011)
+
+  06 Jul 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +pixman-0.22.2.ebuild:
+  Version bump.
 
   28 Jun 2011; Brent Baude <ranger@gentoo.org> pixman-0.22.0.ebuild:
   Marking pixman-0.22.0 ppc stable for bug 371857
diff --git a/x11-libs/pixman/pixman-0.22.2.ebuild b/x11-libs/pixman/pixman-0.22.2.ebuild
new file mode 100644
index 000000000000..5eb5b847622c
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.22.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.22.2.ebuild,v 1.1 2011/07/06 20:50:15 chithanh Exp $
+
+EAPI=4
+inherit xorg-2 toolchain-funcs versionator
+
+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 neon sse2"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	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
+
+	local confadd
+	# this block fixes bug #236558
+	case "$enable_mmx,$enable_sse2" in
+	'1,1')
+		confadd=(--enable-mmx --enable-sse2) ;;
+	'1,0')
+		confadd=(--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."
+		confadd=(--disable-mmx --disable-sse2) ;;
+	'0,0')
+		confadd=(--disable-mmx --disable-sse2) ;;
+	esac
+
+	XORG_CONFIGURE_OPTIONS=(
+		"${confadd[@]}"
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		--disable-gtk
+	)
+}