rpms/DevIL/FC-5 DevIL-1.6.8-rc2-il_endian_h.patch, NONE, 1.1 DevIL.spec, 1.3, 1.4

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/extras/rpms/DevIL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15197/FC-5

Modified Files:
	DevIL.spec 
Added Files:
	DevIL-1.6.8-rc2-il_endian_h.patch 
Log Message:
auto-import DevIL-1.6.8-0.11.rc2 on branch FC-5 from DevIL-1.6.8-0.11.rc2.src.rpm

DevIL-1.6.8-rc2-il_endian_h.patch:

--- NEW FILE DevIL-1.6.8-rc2-il_endian_h.patch ---
--- DevIL-1.6.8/src-IL/include/il_endian.h.orig	2006-12-21 03:40:57.000000000 +0000
+++ DevIL-1.6.8/src-IL/include/il_endian.h	2006-12-21 03:33:34.000000000 +0000
@@ -15,6 +15,10 @@
 
 #include "il_internal.h"
 
+#ifdef GCC_X86_ASM
+#include <byteswap.h>
+#endif
+
 #ifdef WORDS_BIGENDIAN //this is defined by ./configure
 	#ifndef __BIG_ENDIAN__
 	#define __BIG_ENDIAN__
@@ -101,9 +105,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-		asm("ror $8,%0"
-			: 
-			: "r"  (*s) );
+		*s = __bswap_16(*s);
 	#else
 		*s = ((*s)>>8) | ((*s)<<8);
 	#endif //GCC_X86_ASM
@@ -124,8 +126,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-			asm("bswap  %0;"
-				: "=r" (*i) );
+		*i = __bswap_32(*i);
 	#else
 		*i = ((*i)>>24) | (((*i)>>8) & 0xff00) | (((*i)<<8) & 0xff0000) | ((*i)<<24);
 	#endif //GCC_X86_ASM


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/FC-5/DevIL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DevIL.spec	7 Sep 2006 22:05:57 -0000	1.3
+++ DevIL.spec	2 Jan 2007 21:23:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.6.8
-Release:        0.10.rc2%{?dist}
+Release:        0.11.rc2%{?dist}
 Summary:        A cross-platform image library
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@
 Patch1:         DevIL-1.6.8-rc2-ilut_h.patch
 Patch2:         DevIL-1.6.8-rc2-il_wrap_h.patch
 Patch3:         DevIL-1.6.8-rc2-ilu_region.patch
+Patch4:         DevIL-1.6.8-rc2-il_endian_h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
@@ -53,6 +54,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -109,6 +111,10 @@
 
 
 %changelog
+* Tue Jan 02 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.11.rc2%{?dist}
+- Added patch to fix endian issues with some SGI files. Courtesy of Scott A.
+  Friedman (BZ #220417)
+
 * Thu Sep 07 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.10.rc2%{?dist}
 - Upgrade to 1.6.8-rc2
 - Added libICE-devel buildrequire