2004-05-21 Brian Cameron <[email protected]>
authorbc99092
Fri, 21 May 2004 17:16:25 +0000
changeset 2841 50bb1b73d046
parent 2840 267ab3c7f61f
child 2842 f1d06545f833
2004-05-21 Brian Cameron <[email protected]> * gimp.spec, patches/gimp-04-solx86.diff: Migrated patch from old Metropolis build that allows gimp to compile on x86 Solaris.
gimp.spec
patches/gimp-04-solx86.diff
--- a/gimp.spec	Fri May 21 16:52:43 2004 +0000
+++ b/gimp.spec	Fri May 21 17:16:25 2004 +0000
@@ -14,6 +14,7 @@
 Patch1:       gimp-01-menu-entry.diff
 Patch2:       gimp-02-enable-deprecated-stuff.diff
 Patch3:       gimp-03-remove-keys.diff
+Patch4:       gimp-04-solx86.diff
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -80,6 +81,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"			\
@@ -188,6 +190,9 @@
 %{_mandir}/man1/gimptool-%{subver}.1*
 
 %changelog
+* Fri May 21 2004 - [email protected]
+- Added patch 4 to support building on x86 Solaris.
+
 * Wed May 12 2004 - [email protected]
 - Updated l10n content to gimp-l10n-po-1.1.tar.bz2
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-04-solx86.diff	Fri May 21 17:16:25 2004 +0000
@@ -0,0 +1,19 @@
+--- gimp-1.3.18/app/base/cpu-accel.c-orig	Fri May 21 10:48:24 2004
++++ gimp-1.3.18/app/base/cpu-accel.c	Fri May 21 10:51:57 2004
+@@ -42,6 +42,8 @@
+   gint    AMD;
+   guint32 caps = 0;
+ 
++#ifdef __GNUC__
++
+ #define cpuid(op,eax,ebx,ecx,edx)  \
+      asm ("pushl %%ebx\n\t"        \
+           "cpuid\n\t"              \
+@@ -104,6 +106,7 @@
+     caps |= CPU_ACCEL_X86_MMXEXT;
+ #endif /* USE_SSE */
+ #endif /* USE_MMX */
++#endif /* __GNUC__ */
+ 
+   return caps;
+ }