From: Luca Barbato <lu_zero@gentoo.org>
Date: Sat, 27 Nov 2004 17:34:18 +0000 (+0000)
Subject: ppc fix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6967f07ab912d3137a383c68bae89776702c7c29;p=gentoo.git

ppc fix
---

diff --git a/dev-libs/liboil/ChangeLog b/dev-libs/liboil/ChangeLog
index d91fcab40ecd..b8cf296517a7 100644
--- a/dev-libs/liboil/ChangeLog
+++ b/dev-libs/liboil/ChangeLog
@@ -1,17 +1,21 @@
 # ChangeLog for dev-libs/liboil
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.6 2004/11/23 18:56:35 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.7 2004/11/27 17:34:18 lu_zero Exp $
 
-*liboil-0.2.1 (20 Nov 2004)
-
-  20 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +liboil-0.2.1.ebuild:
-  New version, ppc issues are eventually fixed
+  27 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/liboil-0.2.2-clobber-list.patch, liboil-0.2.2.ebuild:
+  Another fix for ppc
 
 *liboil-0.2.2 (23 Nov 2004)
 
   23 Nov 2004; Don Seiler <rizzo@gentoo.org> +liboil-0.2.2.ebuild:
   Version bump, should work with gcc 3.4.x now
 
+*liboil-0.2.1 (20 Nov 2004)
+
+  20 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +liboil-0.2.1.ebuild:
+  New version, ppc issues are eventually fixed
+
   20 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> liboil-0.2.0.ebuild:
   Keyworded ~amd64, bug #71270
 
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index ab41dc60bcb2..9743dd09f576 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,7 +1,8 @@
-MD5 21ffb87ce74550dbee3fb76d01e8c942 ChangeLog 980
-MD5 c9b93e37d10e75199bc29cccd6f11ebe liboil-0.2.0.ebuild 822
+MD5 b9dee77559c471a2678c247c1689463b ChangeLog 1117
 MD5 daa5b5804d181bac157ac3a6939bb152 metadata.xml 221
-MD5 ba128d60578c51aa0f47604278562e39 liboil-0.2.2.ebuild 819
+MD5 90ae12b84c8f2c01836edca14e56783e liboil-0.2.2.ebuild 825
+MD5 c9b93e37d10e75199bc29cccd6f11ebe liboil-0.2.0.ebuild 822
 MD5 9224d2f16c82093310f3ec19f52c3ef3 files/digest-liboil-0.2.0 64
+MD5 a351705a87fb81151843b4e0fbc92862 files/liboil-0.2.2-clobber-list.patch 972
 MD5 5d5ac560f35118a370bed2a7a948341c files/liboil-0.2.0-altivec.patch 4732
 MD5 d136c393a4dd1c5b99a077392d18a736 files/digest-liboil-0.2.2 64
diff --git a/dev-libs/liboil/files/liboil-0.2.2-clobber-list.patch b/dev-libs/liboil/files/liboil-0.2.2-clobber-list.patch
new file mode 100644
index 000000000000..26579a831331
--- /dev/null
+++ b/dev-libs/liboil/files/liboil-0.2.2-clobber-list.patch
@@ -0,0 +1,31 @@
+diff -ruN liboil-0.2.2.orig/liboil/simdpack/clip_s16.c liboil-0.2.2/liboil/simdpack/clip_s16.c
+--- liboil-0.2.2.orig/liboil/simdpack/clip_s16.c	2004-11-27 17:53:05.119303856 +0100
++++ liboil-0.2.2/liboil/simdpack/clip_s16.c	2004-11-27 17:54:14.500756272 +0100
+@@ -163,15 +163,15 @@
+ 		"	srawi 0,10,31		\n"
+ 		"	 subfc 18,19,%3		\n"
+ 		"	srawi 11,8,31		\n"
+-		"	 srawi 30,20,31		\n"
++		"	 srawi 29,20,31		\n"
+ 		"	and 0,0,10		\n"
+ 		"	 srawi 21,18,31		\n"
+ 		"	and 11,11,8		\n"
+-		"	 and 30,30,20		\n"
++		"	 and 29,29,20		\n"
+ 		"	subf 9,0,9		\n"
+ 		"	 and 21,21,18		\n"
+ 		"	add 9,9,11		\n"
+-		"	 subf 19,30,19		\n"
++		"	 subf 19,29,19		\n"
+ 		"	sthu 9,2(%0)		\n"
+ 		"	 add 19,19,21		\n"
+ 		"	 sthu 19,2(%0)		\n"
+@@ -179,7 +179,7 @@
+ 	: "+b" (dest), "+b" (src), "+b" (low), "+b" (hi), "+b" (n)
+ 	: 
+ 	: "8", "9", "10", "11", "0",
+-	  "18", "19", "20", "21", "30", "ctr");
++	  "18", "19", "20", "21", "29", "ctr");
+ }
+ OIL_DEFINE_IMPL (clip_s16_ppcasm3, clip_s16);
+ #endif
diff --git a/dev-libs/liboil/liboil-0.2.2.ebuild b/dev-libs/liboil/liboil-0.2.2.ebuild
index 6e364d217ba9..3dbc665b0bf2 100644
--- a/dev-libs/liboil/liboil-0.2.2.ebuild
+++ b/dev-libs/liboil/liboil-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.2.2.ebuild,v 1.1 2004/11/23 18:56:35 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.2.2.ebuild,v 1.2 2004/11/27 17:34:18 lu_zero Exp $
 
 inherit eutils
 DESCRIPTION="Liboil is a library of simple functions that are optimized for various CPUs."
@@ -18,7 +18,7 @@ DEPEND="=dev-libs/glib-2*"
 
 src_unpack() {
 	unpack ${A}
-	#epatch ${FILESDIR}/${P}-altivec.patch
+	epatch ${FILESDIR}/${P}-clobber-list.patch
 }
 
 src_compile() {