(#12398, fd.o #12398) Add an amd64 crasher fix.

(Portage version: 2.1.3.12)

4 files changed, 85 insertions, 1 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index c4a57e6b7333..f2363fac4641 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.1 2007/09/08 08:47:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.2 2007/10/14 06:22:30 dberkholz Exp $
+
+*pixman-0.9.5-r1 (14 Oct 2007)
+
+  14 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.9.5-pixman-compose-fix.patch, +pixman-0.9.5-r1.ebuild:
+  (#12398, fd.o #12398) Add an amd64 crasher fix.
 
 *pixman-0.9.5 (08 Sep 2007)
 
diff --git a/x11-libs/pixman/files/0.9.5-pixman-compose-fix.patch b/x11-libs/pixman/files/0.9.5-pixman-compose-fix.patch
new file mode 100644
index 000000000000..cbfd2d6ce89a
--- /dev/null
+++ b/x11-libs/pixman/files/0.9.5-pixman-compose-fix.patch
@@ -0,0 +1,62 @@
+Title       : x11-libs/pixman: upstream patch for X server crashes on AMD64
+Assignee    : x11@gentoo.org
+Reported    : 2007-10-04 21:18 0000
+Updated     : 2007-10-11 09:44:44 0000
+Status      : NEW
+URL         : https://bugs.freedesktop.org/show_bug.cgi?id=12398
+Severity    : major
+Priority    : P2
+Reporter    : nihilismwow@gmail.com
+Product     : Gentoo Linux
+Component   : Library
+Keywords    : Inclusion
+CC          : aballier@gentoo.org
+Comments    : 1
+Attachments : 0
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=194740
+
+
+Title       : Random crasher in libpixman
+Assignee    : sandmann@daimi.au.dk
+Reported    : 2007-09-11 22:20 PST
+Updated     : 2007-10-12 00:59:50 PST
+Status      : NEW
+Severity    : major
+Priority    : medium
+Reporter    : amd@store20.com
+Product     : libpixman
+Component   : libpixman
+CC          : andrea.cimitan@gmail.com
+CC          : apitzsch@cs.tu-berlin.de
+CC          : brice.goglin@ens-lyon.org
+CC          : FJ.Whittle@gmail.com
+CC          : hesso@pool.math.tu-berlin.de
+CC          : ian.mcdonald@jandi.co.nz
+CC          : jan@jgc.homeip.net
+CC          : lars@heidieker.de
+Comments    : 15
+Attachments : 2
+URL         : https://bugs.freedesktop.org/show_bug.cgi?id=12398
+
+diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
+index 1e91864..027394a 100644
+--- a/pixman/pixman-compose.c
++++ b/pixman/pixman-compose.c
+@@ -3880,7 +3880,7 @@ static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uin
+ 			    idistx = 256 - distx;
+ 			    idisty = 256 - disty;
+ 			    
+-			    b = bits + (y1)*stride;
++			    b = bits + (signed)((y1)*stride);
+ 			    x_off = x1;
+ 			    
+ 			    x1_out = (x1 < box.x1) | (x1 >= box.x2);
+@@ -3946,7 +3946,7 @@ static void fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uin
+ 			    idistx = 256 - distx;
+ 			    idisty = 256 - disty;
+ 			    
+-			    b = bits + (y1)*stride;
++			    b = bits + (signed)((y1)*stride);
+ 			    x_off = x1;
+ 			    
+ 			    tl = pixman_region_contains_point(pict->common.src_clip, x1, y1, &box)
diff --git a/x11-libs/pixman/files/digest-pixman-0.9.5-r1 b/x11-libs/pixman/files/digest-pixman-0.9.5-r1
new file mode 100644
index 000000000000..7404b7731340
--- /dev/null
+++ b/x11-libs/pixman/files/digest-pixman-0.9.5-r1
@@ -0,0 +1,3 @@
+MD5 f9fea77e46ec7a3a16e925e137f146e7 pixman-0.9.5.tar.bz2 290622
+RMD160 0be634d8985eb2348b8dcbfbb8663b34025d5979 pixman-0.9.5.tar.bz2 290622
+SHA256 a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8 pixman-0.9.5.tar.bz2 290622
diff --git a/x11-libs/pixman/pixman-0.9.5-r1.ebuild b/x11-libs/pixman/pixman-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..4b93699553af
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.9.5-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.9.5-r1.ebuild,v 1.1 2007/10/14 06:22:30 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Low-level pixel manipulation routines"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+PATCHES="${FILESDIR}/${PV}-pixman-compose-fix.patch"