rpms/cegui/devel cegui-0.6.2-new-DevIL.patch, NONE, 1.1 cegui.spec, 1.18, 1.19

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	cegui.spec 
Added Files:
	cegui-0.6.2-new-DevIL.patch 
Log Message:
* Sat Feb 21 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-2
- Fix building with latest DevIL


cegui-0.6.2-new-DevIL.patch:

--- NEW FILE cegui-0.6.2-new-DevIL.patch ---
diff -up CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp~ CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp
--- CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp~	2008-06-14 20:17:47.000000000 +0200
+++ CEGUI-0.6.2/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp	2009-02-21 10:55:01.000000000 +0100
@@ -58,7 +58,7 @@ Texture* DevILImageCodec::load(const Raw
     ilGenImages(1, &imgName);
     ilBindImage(imgName);
 
-    if (ilLoadL(IL_TYPE_UNKNOWN, (ILvoid*)data.getDataPtr(), data.getSize()) != IL_FALSE)
+    if (ilLoadL(IL_TYPE_UNKNOWN, (void*)data.getDataPtr(), data.getSize()) != IL_FALSE)
     {
         // get details about size of loaded image
         ILinfo imgInfo;
@@ -85,7 +85,7 @@ Texture* DevILImageCodec::load(const Raw
             cefmt = Texture::PF_RGB;
             break;
         };
-        ilCopyPixels(0, 0, 0, width, height, 1, ilfmt, IL_UNSIGNED_BYTE, (ILvoid*)tmpBuff);
+        ilCopyPixels(0, 0, 0, width, height, 1, ilfmt, IL_UNSIGNED_BYTE, (void*)tmpBuff);
 
         // delete DevIL image
         ilDeleteImages(1, &imgName);


Index: cegui.spec
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/cegui.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cegui.spec	3 Dec 2008 12:46:02 -0000	1.18
+++ cegui.spec	21 Feb 2009 10:00:38 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           cegui
 Version:        0.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
 Group:          System Environment/Libraries
 License:        MIT
@@ -15,6 +15,8 @@
 # Both submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=197
 Patch1:         cegui-0.6.0-release-as-so-ver.patch
 Patch2:         cegui-0.6.0-userverso.patch
+# TODO: submit upstream
+Patch3:         cegui-0.6.2-new-DevIL.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  DevIL-devel
 BuildRequires:  expat-devel
@@ -64,6 +66,7 @@
 %setup -qb1 -qn CEGUI-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Permission fixes for debuginfo RPM
 chmod -x include/falagard/*.h
@@ -135,6 +138,9 @@
 
 
 %changelog
+* Sat Feb 21 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-2
+- Fix building with latest DevIL
+
 * Wed Dec  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.2-1
 - New upstream release 0.6.2