Apply patch from Gimp cvs to allow for PIC-safe building. (http://bugs.gnome.org/show_bug.cgi?id=132999)

4 files changed, 125 insertions, 15 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index f1adb1384712..a88012261ff7 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.66 2004/01/21 13:53:13 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.67 2004/01/31 14:02:07 tseng Exp $
+
+  31 Jan 2004; Brandon Hale <tseng@gentoo.org> gimp-2.0_pre2.ebuild,
+  files/gimp-2.0_pre2-cpuaccel-pic.patch:
+  Apply patch from Gimp CVS to allow for PIC-safe building.
+  (http://bugs.gnome.org/show_bug.cgi?id=132999)
 
 *gimp-2.0_pre2 (21 Jan 2004)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 81697ee85357..618cc898c225 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,21 +1,22 @@
-MD5 66bc396ec3b6b6019110843d4f0c5d6a gimp-2.0_pre2.ebuild 2833
-MD5 f2435ea78fe2898d558c4e427e2d2c28 gimp-1.2.5.ebuild 3220
-MD5 364ae94b69b27bb995c2d510214ab40e gimp-2.0_pre1.ebuild 3415
+MD5 e9c5dc05e93fcdb652deee067cf7d53c ChangeLog 10636
 MD5 79946d76b127a835c8c16d552add5cab gimp-1.2.3-r3.ebuild 4690
 MD5 94d6af458cd63b08afdecab7cce057ee gimp-1.2.4.ebuild 3079
-MD5 09a61542da76e6bd9589524e6ba4cd27 ChangeLog 10415
+MD5 f2435ea78fe2898d558c4e427e2d2c28 gimp-1.2.5.ebuild 3220
+MD5 364ae94b69b27bb995c2d510214ab40e gimp-2.0_pre1.ebuild 3415
+MD5 b8ac622ffb97f5e755f1c2aa9064366f gimp-2.0_pre2.ebuild 2877
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 c73865fe1298b84c685ee1314093c7bd files/gimp-2.0_pre2-remote_new_behaviour.patch 11818
+MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 MD5 306a002fbdf9b01208b181663474dbe4 files/digest-gimp-2.0_pre1 67
 MD5 d75b2f3860a49663eec5ad4a3a1aae07 files/digest-gimp-2.0_pre2 67
+MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
 MD5 f8c14ef5c45d029ac5abc6c614701d5e files/gimp-1.3.20-screenshot_fix.patch 20024
-MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 c73865fe1298b84c685ee1314093c7bd files/gimp-2.0_pre2-remote_new_behaviour.patch 11818
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
+MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 10acea3a20366b441cd711d7b4b0bd39 files/gimp-2.0_pre2-cpuaccel-pic.patch 2482
diff --git a/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch b/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch
new file mode 100644
index 000000000000..3aa96bd839ed
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch
@@ -0,0 +1,103 @@
+--- gimp-2.0pre2/app/base/cpu-accel.c	2003-09-07 15:56:51.000000000 -0400
++++ gimp-cvs/app/base/cpu-accel.c	2004-01-31 04:01:34.000000000 -0500
+@@ -40,11 +40,6 @@
+ 
+ #ifdef ARCH_X86
+ 
+-#if GLIB_SIZEOF_LONG == 8
+-#define ARCH_X86_64 1
+-#endif
+-
+-
+ typedef enum
+ {
+   ARCH_X86_VENDOR_NONE,
+@@ -78,14 +73,25 @@
+   ARCH_X86_CYRIX_FEATURE_MMXEXT   = 1 << 24
+ };
+ 
+-/* FIXME: This should save off ebx/rbx if compiled for PIC */
+-#define cpuid(op,eax,ebx,ecx,edx) \
+-  asm ("cpuid\n\t"                \
+-       : "=a" (eax),             \
+-         "=b" (ebx),             \
+-         "=c" (ecx),             \
+-         "=d" (edx)              \
+-       : "0" (op))
++#if !defined(ARCH_X86_64) && defined(PIC)
++#define cpuid(op,eax,ebx,ecx,edx)  \
++  __asm__ ("movl %%ebx, %%esi\n\t" \
++           "cpuid\n\t"             \
++           "xchgl %%ebx,%%esi"     \
++           : "=a" (eax),           \
++             "=S" (ebx),           \
++             "=c" (ecx),           \
++             "=d" (edx)            \
++           : "0" (op))
++#else
++#define cpuid(op,eax,ebx,ecx,edx)  \
++  __asm__ ("cpuid"                 \
++           : "=a" (eax),           \
++             "=b" (ebx),           \
++             "=c" (ecx),           \
++             "=d" (edx)            \
++           : "0" (op))
++#endif
+ 
+ 
+ static X86Vendor
+@@ -96,22 +102,22 @@
+ 
+ #ifndef ARCH_X86_64
+   /* Only need to check this on ia32 */
+-  asm ("pushfl\n\t"
+-       "pushfl\n\t"
+-       "popl %0\n\t"
+-       "movl %0,%1\n\t"
+-       "xorl $0x200000,%0\n\t"
+-       "push %0\n\t"
+-       "popfl\n\t"
+-       "pushfl\n\t"
+-       "popl %0\n\t"
+-       "popfl\n\t"
+-       : "=a" (eax),
+-         "=b" (ebx)
+-       :
+-       : "cc");
++  __asm__ ("pushfl\n\t"
++           "pushfl\n\t"
++           "popl %0\n\t"
++           "movl %0,%1\n\t"
++           "xorl $0x200000,%0\n\t"
++           "pushl %0\n\t"
++           "popfl\n\t"
++           "pushfl\n\t"
++           "popl %0\n\t"
++           "popfl"
++           : "=a" (eax),
++             "=c" (ecx)
++           :
++           : "cc");
+ 
+-  if (eax == ebx)
++  if (eax == ecx)
+     return ARCH_X86_VENDOR_NONE;
+ #endif
+ 
+@@ -385,7 +391,6 @@
+   accel = arch_accel ();
+ 
+ #ifdef USE_SSE
+-
+   /* test OS support for SSE */
+   if (accel & CPU_ACCEL_X86_SSE)
+     {
+@@ -396,7 +401,7 @@
+       else
+ 	{
+ 	  signal (SIGILL, sigill_handler);
+-	  __asm __volatile ("xorps %xmm0, %xmm0");
++	  __asm__ __volatile__ ("xorps %xmm0, %xmm0");
+ 	  signal (SIGILL, SIG_DFL);
+ 	}
+     }
diff --git a/media-gfx/gimp/gimp-2.0_pre2.ebuild b/media-gfx/gimp/gimp-2.0_pre2.ebuild
index beda506a98e7..db8289bb20d6 100644
--- a/media-gfx/gimp/gimp-2.0_pre2.ebuild
+++ b/media-gfx/gimp/gimp-2.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0_pre2.ebuild,v 1.1 2004/01/21 13:53:13 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0_pre2.ebuild,v 1.2 2004/01/31 14:02:07 tseng Exp $
 
 inherit debug flag-o-matic libtool
 
@@ -57,6 +57,7 @@ src_unpack() {
 	cd ${S}
 	# fix gimp-remote behavior
 	epatch ${FILESDIR}/${P}-remote_new_behaviour.patch
+	epatch ${FILESDIR}/${P}-cpuaccel-pic.patch
 
 }