summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Hale <tseng@gentoo.org>2004-02-01 07:03:15 +0000
committerBrandon Hale <tseng@gentoo.org>2004-02-01 07:03:15 +0000
commit174dd502b34d7fdaa85dbffe4c0eedf90597b8a9 (patch)
tree1a17d87ded1aae4f61621f69dc98b69ae5206228 /media-gfx/gimp
parentinitial commit (diff)
downloadhistorical-174dd502b34d7fdaa85dbffe4c0eedf90597b8a9.tar.gz
historical-174dd502b34d7fdaa85dbffe4c0eedf90597b8a9.tar.bz2
historical-174dd502b34d7fdaa85dbffe4c0eedf90597b8a9.zip
Small fix to gimp-2.0_pre2-cpuaccel-pic.patch for amd64.
Diffstat (limited to 'media-gfx/gimp')
-rw-r--r--media-gfx/gimp/ChangeLog6
-rw-r--r--media-gfx/gimp/Manifest4
-rw-r--r--media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch2
3 files changed, 8 insertions, 4 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index a88012261ff7..53fb084ea4eb 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
# 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.67 2004/01/31 14:02:07 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.68 2004/02/01 07:03:15 tseng Exp $
+
+ 01 Feb 2004; Brandon Hale <tseng@gentoo.org>
+ files/gimp-2.0_pre2-cpuaccel-pic.patch:
+ Small fix to gimp-2.0_pre2-cpuaccel-pic.patch for amd64.
31 Jan 2004; Brandon Hale <tseng@gentoo.org> gimp-2.0_pre2.ebuild,
files/gimp-2.0_pre2-cpuaccel-pic.patch:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 618cc898c225..b8d3b2599c45 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,4 @@
-MD5 e9c5dc05e93fcdb652deee067cf7d53c ChangeLog 10636
+MD5 a87a7e9cdb71dbc5caba06965f20e190 ChangeLog 10785
MD5 79946d76b127a835c8c16d552add5cab gimp-1.2.3-r3.ebuild 4690
MD5 94d6af458cd63b08afdecab7cce057ee gimp-1.2.4.ebuild 3079
MD5 f2435ea78fe2898d558c4e427e2d2c28 gimp-1.2.5.ebuild 3220
@@ -19,4 +19,4 @@ MD5 c73865fe1298b84c685ee1314093c7bd files/gimp-2.0_pre2-remote_new_behaviour.pa
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
+MD5 945091d07e44e026c8e5fb5c01014873 files/gimp-2.0_pre2-cpuaccel-pic.patch 2524
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
index 3aa96bd839ed..b1bc32c04ed3 100644
--- a/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch
+++ b/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch
@@ -24,7 +24,7 @@
- "=c" (ecx), \
- "=d" (edx) \
- : "0" (op))
-+#if !defined(ARCH_X86_64) && defined(PIC)
++#if !defined(ARCH_X86_64) && (defined(__PIC__) || defined(__pic__) || defined(PIC))
+#define cpuid(op,eax,ebx,ecx,edx) \
+ __asm__ ("movl %%ebx, %%esi\n\t" \
+ "cpuid\n\t" \