rpms/DevIL/devel .cvsignore, 1.5, 1.6 DevIL-1.7.5-il_endian_h.patch, 1.1, 1.2 DevIL.spec, 1.13, 1.14 sources, 1.5, 1.6

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9184

Modified Files:
	.cvsignore DevIL-1.7.5-il_endian_h.patch DevIL.spec sources 
Log Message:
* Mon Mar  9 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-1
- Update to latest upstream: 1.7.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Feb 2009 13:26:05 -0000	1.5
+++ .cvsignore	9 Mar 2009 09:25:03 -0000	1.6
@@ -1 +1 @@
-devil-1.7.7.tar.gz
+DevIL-1.7.8.tar.gz

DevIL-1.7.5-il_endian_h.patch:

Index: DevIL-1.7.5-il_endian_h.patch
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL-1.7.5-il_endian_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevIL-1.7.5-il_endian_h.patch	14 Jan 2009 10:53:07 -0000	1.1
+++ DevIL-1.7.5-il_endian_h.patch	9 Mar 2009 09:25:04 -0000	1.2
@@ -1,5 +1,6 @@
---- 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
+diff -up devil-1.7.8/src-IL/include/il_endian.h~ devil-1.7.8/src-IL/include/il_endian.h
+--- devil-1.7.8/src-IL/include/il_endian.h~	2009-03-08 08:10:08.000000000 +0100
++++ devil-1.7.8/src-IL/include/il_endian.h	2009-03-09 10:11:33.000000000 +0100
 @@ -15,6 +15,10 @@
  
  #include "il_internal.h"
@@ -8,26 +9,26 @@
 +#include <byteswap.h>
 +#endif
 +
- #ifdef WORDS_BIGENDIAN //this is defined by ./configure
+ #ifdef WORDS_BIGENDIAN  // This is defined by ./configure.
  	#ifndef __BIG_ENDIAN__
- 	#define __BIG_ENDIAN__
-@@ -101,9 +105,7 @@
+ 	#define __BIG_ENDIAN__ 1
+@@ -104,9 +108,7 @@ INLINE void iSwapUShort(ILushort *s)  {
  		}
  	#else
  	#ifdef GCC_X86_ASM
 -		asm("ror $8,%0"
--			: 
--			: "r"  (*s) );
+-			: "=r" (*s)
+-			: "0" (*s));
 +		*s = __bswap_16(*s);
  	#else
  		*s = ((*s)>>8) | ((*s)<<8);
  	#endif //GCC_X86_ASM
-@@ -124,8 +126,7 @@
+@@ -127,8 +129,7 @@ INLINE void iSwapUInt(ILuint *i) {
  		}
  	#else
  	#ifdef GCC_X86_ASM
--			asm("bswap  %0;"
--				: "=r" (*i) );
+-			asm("bswap %0;"
+-				: "+r" (*i));
 +		*i = __bswap_32(*i);
  	#else
  		*i = ((*i)>>24) | (((*i)>>8) & 0xff00) | (((*i)<<8) & 0xff0000) | ((*i)<<24);


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DevIL.spec	23 Feb 2009 20:15:50 -0000	1.13
+++ DevIL.spec	9 Mar 2009 09:25:04 -0000	1.14
@@ -1,11 +1,11 @@
 Name:           DevIL
-Version:        1.7.7
-Release:        2%{?dist}
+Version:        1.7.8
+Release:        1%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://openil.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/openil/devil-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +68,7 @@
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
+chmod -x src-IL/src/il_*.c
 
 
 %build
@@ -104,6 +105,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/ilur
 %{_libdir}/libIL.so.*
 %{_libdir}/libILU.so.*
 %doc AUTHORS ChangeLog COPYING CREDITS README TODO
@@ -136,6 +138,9 @@
 
 
 %changelog
+* Mon Mar  9 2009 Hans de Goede <hdegoede at redhat.com> 1.7.8-1
+- Update to latest upstream: 1.7.8
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Feb 2009 13:26:05 -0000	1.5
+++ sources	9 Mar 2009 09:25:04 -0000	1.6
@@ -1 +1 @@
-1951c24fe343c882c0c1ceeeb7468c7e  devil-1.7.7.tar.gz
+963ab2ef991b5921b2a981502fe43e74  DevIL-1.7.8.tar.gz