Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5437/common/main/finkinfo/libs
Modified Files:
liboil-0.3.patch
Log Message:
10.3 liboil fixes
Index: liboil-0.3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/liboil-0.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- liboil-0.3.patch 6 May 2006 19:13:35 -0000 1.1
+++ liboil-0.3.patch 6 May 2006 20:00:30 -0000 1.2
@@ -1,5 +1,24 @@
---- liboil-0.3.8/liboil/i386/copy8x8_i386.c 2005-08-02 16:59:46.000000000
-0400
-+++ liboil-0.3.8-new/liboil/i386/copy8x8_i386.c 2006-05-06
10:49:28.000000000 -0400
+diff -uNr liboil-0.3.8/configure liboil-0.3.8-new/configure
+--- liboil-0.3.8/configure Tue Mar 21 15:37:46 2006
++++ liboil-0.3.8-new/configure Sat May 6 15:52:34 2006
+@@ -19294,14 +19294,6 @@
+
+
+ case "x${host_cpu}" in
+- xi?86 | k?)
+- HAVE_I386=yes
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_I386 1
+-_ACEOF
+-
+- ;;
+ xx86_64|xamd64)
+ HAVE_AMD64=yes
+
+diff -uNr liboil-0.3.8/liboil/i386/copy8x8_i386.c
liboil-0.3.8-new/liboil/i386/copy8x8_i386.c
+--- liboil-0.3.8/liboil/i386/copy8x8_i386.c Tue Aug 2 16:59:46 2005
++++ liboil-0.3.8-new/liboil/i386/copy8x8_i386.c Sat May 6 15:52:34 2006
@@ -37,7 +37,11 @@
copy8x8_u8_mmx (uint8_t *dest, int dstr, uint8_t *src, int sstr)
{
@@ -12,8 +31,9 @@
" lea (%2, %2, 2), %%edi \n\t"
---- liboil-0.3.8/liboil/i386/diff8x8_i386.c 2005-10-28 13:05:33.000000000
-0400
-+++ liboil-0.3.8-new/liboil/i386/diff8x8_i386.c 2006-05-06
12:49:55.000000000 -0400
+diff -uNr liboil-0.3.8/liboil/i386/diff8x8_i386.c
liboil-0.3.8-new/liboil/i386/diff8x8_i386.c
+--- liboil-0.3.8/liboil/i386/diff8x8_i386.c Fri Oct 28 13:05:33 2005
++++ liboil-0.3.8-new/liboil/i386/diff8x8_i386.c Sat May 6 15:52:34 2006
@@ -40,7 +40,11 @@
diff8x8_s16_u8_mmx (int16_t *dest, uint8_t *src1, int ss1, uint8_t *src2, int
ss2)
{
@@ -54,8 +74,9 @@
" pxor %%mm7, %%mm7 \n\t"
---- liboil-0.3.8/liboil/i386/error8x8_i386.c 2005-12-21 16:46:59.000000000
-0500
-+++ liboil-0.3.8-new/liboil/i386/error8x8_i386.c 2006-05-06
10:51:27.000000000 -0400
+diff -uNr liboil-0.3.8/liboil/i386/error8x8_i386.c
liboil-0.3.8-new/liboil/i386/error8x8_i386.c
+--- liboil-0.3.8/liboil/i386/error8x8_i386.c Wed Dec 21 16:46:59 2005
++++ liboil-0.3.8-new/liboil/i386/error8x8_i386.c Sat May 6 15:52:34 2006
@@ -42,7 +42,11 @@
uint32_t xxsum;
@@ -104,8 +125,9 @@
" pxor %%mm4, %%mm4 \n\t"
" pxor %%mm5, %%mm5 \n\t"
---- liboil-0.3.8/liboil/i386/recon8x8_i386.c 2005-12-22 03:04:08.000000000
-0500
-+++ liboil-0.3.8-new/liboil/i386/recon8x8_i386.c 2006-05-06
10:52:18.000000000 -0400
+diff -uNr liboil-0.3.8/liboil/i386/recon8x8_i386.c
liboil-0.3.8-new/liboil/i386/recon8x8_i386.c
+--- liboil-0.3.8/liboil/i386/recon8x8_i386.c Thu Dec 22 03:04:08 2005
++++ liboil-0.3.8-new/liboil/i386/recon8x8_i386.c Sat May 6 15:52:34 2006
@@ -44,7 +44,11 @@
recon8x8_intra_i386_mmx (uint8_t *dest, int ds, int16_t *change)
{
@@ -142,8 +164,9 @@
" pxor %%mm0, %%mm0 \n\t"
" lea 128(%1), %%edi \n\t"
---- liboil-0.3.8/liboil/i386/rowcolsad8x8_i386.c 2005-08-02
21:25:11.000000000 -0400
-+++ liboil-0.3.8-new/liboil/i386/rowcolsad8x8_i386.c 2006-05-06
10:53:14.000000000 -0400
+diff -uNr liboil-0.3.8/liboil/i386/rowcolsad8x8_i386.c
liboil-0.3.8-new/liboil/i386/rowcolsad8x8_i386.c
+--- liboil-0.3.8/liboil/i386/rowcolsad8x8_i386.c Tue Aug 2 21:25:11 2005
++++ liboil-0.3.8-new/liboil/i386/rowcolsad8x8_i386.c Sat May 6 15:52:34 2006
@@ -40,7 +40,11 @@
uint32_t MaxSad;
@@ -192,8 +215,9 @@
" pxor %%mm3, %%mm3 \n\t" /* zero out mm3 for unpack */
" pxor %%mm4, %%mm4 \n\t" /* mm4 low sum */
---- liboil-0.3.8/liboil/i386/sad8x8_i386.c 2005-08-02 21:28:44.000000000
-0400
-+++ liboil-0.3.8-new/liboil/i386/sad8x8_i386.c 2006-05-06 10:53:33.000000000
-0400
+diff -uNr liboil-0.3.8/liboil/i386/sad8x8_i386.c
liboil-0.3.8-new/liboil/i386/sad8x8_i386.c
+--- liboil-0.3.8/liboil/i386/sad8x8_i386.c Tue Aug 2 21:28:44 2005
++++ liboil-0.3.8-new/liboil/i386/sad8x8_i386.c Sat May 6 15:52:34 2006
@@ -40,7 +40,11 @@
uint32_t diff;
@@ -218,8 +242,9 @@
" pxor %%mm7, %%mm7 \n\t" /* mm7 contains the result */
".rept 7 \n\t"
---- liboil-0.3.8/liboil/i386/sad8x8avg_i386.c 2005-12-21 16:35:08.000000000
-0500
-+++ liboil-0.3.8-new/liboil/i386/sad8x8avg_i386.c 2006-05-06
10:53:45.000000000 -0400
+diff -uNr liboil-0.3.8/liboil/i386/sad8x8avg_i386.c
liboil-0.3.8-new/liboil/i386/sad8x8avg_i386.c
+--- liboil-0.3.8/liboil/i386/sad8x8avg_i386.c Wed Dec 21 16:35:08 2005
++++ liboil-0.3.8-new/liboil/i386/sad8x8avg_i386.c Sat May 6 15:52:34 2006
@@ -39,7 +39,11 @@
uint32_t diff;
@@ -244,8 +269,47 @@
" pxor %%mm7, %%mm7 \n\t" /* mm7 contains the result */
" mov $0x01010101, %%eax \n\t"
" movd %%eax, %%mm6 \n\t"
---- liboil-0.3.8/unroll-rept.pl 1969-12-31 19:00:00.000000000 -0500
-+++ liboil-0.3.8-new/unroll-rept.pl 2006-05-06 12:32:00.000000000 -0400
+diff -uNr liboil-0.3.8/liboil/liboilprofile.c
liboil-0.3.8-new/liboil/liboilprofile.c
+--- liboil-0.3.8/liboil/liboilprofile.c Mon Mar 20 17:20:59 2006
++++ liboil-0.3.8-new/liboil/liboilprofile.c Sat May 6 15:53:27 2006
+@@ -158,7 +158,7 @@
+ }
+ #endif
+
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__PPC__) || defined(__ppc__)
+ static unsigned long
+ oil_profile_stamp_tb(void)
+ {
+@@ -274,7 +274,7 @@
+ #if defined(__amd64__)
+ _oil_profile_stamp = oil_profile_stamp_tsc;
+ #endif
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__PPC__) || defined(__ppc__)
+ _oil_profile_stamp = oil_profile_stamp_tb;
+ #endif
+ #if defined(__alpha__)
+diff -uNr liboil-0.3.8/liboil/powerpc/md5.c
liboil-0.3.8-new/liboil/powerpc/md5.c
+--- liboil-0.3.8/liboil/powerpc/md5.c Thu Nov 3 02:01:27 2005
++++ liboil-0.3.8-new/liboil/powerpc/md5.c Sat May 6 15:52:49 2006
+@@ -25,6 +25,8 @@
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#if 0
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+@@ -510,3 +512,4 @@
+
+ OIL_DEFINE_IMPL_ASM (md5_asm3, md5);
+
++#endif
+diff -uNr liboil-0.3.8/unroll-rept.pl liboil-0.3.8-new/unroll-rept.pl
+--- liboil-0.3.8/unroll-rept.pl Wed Dec 31 19:00:00 1969
++++ liboil-0.3.8-new/unroll-rept.pl Sat May 6 15:52:34 2006
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+
@@ -292,20 +356,3 @@
+ system("/bin/mv", "${file}.unrolled", $file);
+ }
+}
---- liboil-0.3.8/configure 2006-03-21 15:37:46.000000000 -0500
-+++ liboil-0.3.8-new/configure 2006-05-06 13:48:02.000000000 -0400
-@@ -19294,14 +19294,6 @@
-
-
- case "x${host_cpu}" in
-- xi?86 | k?)
-- HAVE_I386=yes
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_I386 1
--_ACEOF
--
-- ;;
- xx86_64|xamd64)
- HAVE_AMD64=yes
-
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
