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

Package-Manager: portage-2.1.3.12

5 files changed, 110 insertions, 5 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/Manifest b/x11-libs/pixman/Manifest
index 26e26d5d24d1..734ed1130261 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.9.5-pixman-compose-fix.patch 2054 RMD160 740a7d75c93fd87c0f0e6232afe547260feacd1c SHA1 fa9c7027b5764abd5198ec6eaa47cb81bbb62f86 SHA256 c3b6890c8cea4cb0ed7f3d2a2ca5abbbe225e80dc70d2b68d7e1f6147fdf5abf
+MD5 9b7f9164d677b5bf794de73ea99124b4 files/0.9.5-pixman-compose-fix.patch 2054
+RMD160 740a7d75c93fd87c0f0e6232afe547260feacd1c files/0.9.5-pixman-compose-fix.patch 2054
+SHA256 c3b6890c8cea4cb0ed7f3d2a2ca5abbbe225e80dc70d2b68d7e1f6147fdf5abf files/0.9.5-pixman-compose-fix.patch 2054
 DIST pixman-0.9.5.tar.bz2 290622 RMD160 0be634d8985eb2348b8dcbfbb8663b34025d5979 SHA1 8aefe6f52eacb7d3283e2312783a4b80b2ba8324 SHA256 a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
+EBUILD pixman-0.9.5-r1.ebuild 499 RMD160 3422339b17c28e11338b45e8be485265eebc166e SHA1 10685660d4f0172b9eecccf177adbab2e2054170 SHA256 e5fab7d1255c0e34f44dfd1e733fbfd82883ef6dc2e47dc8c6cd42a12638dede
+MD5 47a5ddc1c849709fbe094dd0e2c22e74 pixman-0.9.5-r1.ebuild 499
+RMD160 3422339b17c28e11338b45e8be485265eebc166e pixman-0.9.5-r1.ebuild 499
+SHA256 e5fab7d1255c0e34f44dfd1e733fbfd82883ef6dc2e47dc8c6cd42a12638dede pixman-0.9.5-r1.ebuild 499
 EBUILD pixman-0.9.5.ebuild 442 RMD160 73dd0aafe607cded184858bff87f17f728b3def3 SHA1 38b326a20a9bc32d5d641c8062472cb08bfe2fb7 SHA256 c5b140c4fd7393aca8aee2e79f977114960acce21282f2b4e79bb498ae27264a
 MD5 c1c1c1d4283399efcffab9c5c1065d38 pixman-0.9.5.ebuild 442
 RMD160 73dd0aafe607cded184858bff87f17f728b3def3 pixman-0.9.5.ebuild 442
 SHA256 c5b140c4fd7393aca8aee2e79f977114960acce21282f2b4e79bb498ae27264a pixman-0.9.5.ebuild 442
-MISC ChangeLog 491 RMD160 6dfbc063ed924f88436a1db331d8ae6dd898bdaa SHA1 b6a041cbf9637df7191726e0ef7987fd56156889 SHA256 874194a28ddb8cdbef99ed1e4823038461f01f5cfcb8f0a19a7d28fd6bc5415e
-MD5 a8486b2098a30f1afb92a6c67770b77c ChangeLog 491
-RMD160 6dfbc063ed924f88436a1db331d8ae6dd898bdaa ChangeLog 491
-SHA256 874194a28ddb8cdbef99ed1e4823038461f01f5cfcb8f0a19a7d28fd6bc5415e ChangeLog 491
+MISC ChangeLog 695 RMD160 f0975b9b90efbdb38ed49dad3cee785d15a05661 SHA1 ceafe84aff0b7100dab6c262966e0cee0d30e03e SHA256 26fdb2e5af1134720d8322072b7d8e6b325087d2d0cf411144c1f63c6bf68272
+MD5 10f91dc5f6b751cc2a9a8b0ad5864d98 ChangeLog 695
+RMD160 f0975b9b90efbdb38ed49dad3cee785d15a05661 ChangeLog 695
+SHA256 26fdb2e5af1134720d8322072b7d8e6b325087d2d0cf411144c1f63c6bf68272 ChangeLog 695
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -14,3 +25,13 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 31c7cf1848c8dda4d8e0a8cbdbf818a3 files/digest-pixman-0.9.5 241
 RMD160 c55f96bc337c96143af18c8e67ea08f707c5a540 files/digest-pixman-0.9.5 241
 SHA256 99e99f7b76857f1b4c115d436de466a261996f68282bf2db02ee55acd0de4b3d files/digest-pixman-0.9.5 241
+MD5 31c7cf1848c8dda4d8e0a8cbdbf818a3 files/digest-pixman-0.9.5-r1 241
+RMD160 c55f96bc337c96143af18c8e67ea08f707c5a540 files/digest-pixman-0.9.5-r1 241
+SHA256 99e99f7b76857f1b4c115d436de466a261996f68282bf2db02ee55acd0de4b3d files/digest-pixman-0.9.5-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHEbWsXVaO67S1rtsRAlolAJ4rw2wkG0enrPp32enKbZbJZwvq6QCghfMO
+Kr8hQsTkEg4ZSPqH+Sbp7QI=
+=RSoP
+-----END PGP SIGNATURE-----
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"