rpms/irrlicht/devel irrlicht-1.5.1-glext.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 irrlicht.spec, 1.3, 1.4 sources, 1.2, 1.3

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21358

Modified Files:
	.cvsignore irrlicht.spec sources 
Added Files:
	irrlicht-1.5.1-glext.patch 
Log Message:
update to 1.5.1

irrlicht-1.5.1-glext.patch:
 COpenGLExtensionHandler.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE irrlicht-1.5.1-glext.patch ---
diff -up irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h.glext irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h
--- irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h.glext	2009-08-01 11:01:40.000000000 -0400
+++ irrlicht-1.5.1/source/Irrlicht/COpenGLExtensionHandler.h	2009-08-19 20:51:18.891059362 -0400
@@ -53,9 +53,10 @@
 	#include <GL/gl.h>
 	#include <GL/glx.h>
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-	#include "glext.h"
+	#include <GL/glext.h>
+	typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
-	#include "glxext.h"
+	#include <GL/glxext.h>
 	#endif
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jan 2009 16:31:56 -0000	1.2
+++ .cvsignore	20 Aug 2009 00:57:53 -0000	1.3
@@ -1 +1 @@
-irrlicht-1.5.zip
+irrlicht-1.5.1.zip


Index: irrlicht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/irrlicht.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- irrlicht.spec	25 Jul 2009 03:36:58 -0000	1.3
+++ irrlicht.spec	20 Aug 2009 00:57:53 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
-Version:	1.5
-Release:	4%{?dist}
+Version:	1.5.1
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
@@ -9,14 +9,13 @@ Source0:	http://downloads.sourceforge.ne
 # Don't call ldconfig during make install.
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
 Patch0:		irrlicht-1.5-optflags.patch
-# Fix how we call libpng so we can use system libpng
-Patch1:		irrlicht-1.5-pngfix.patch 
+# Get the code compiling
+Patch1:		irrlicht-1.5.1-glext.patch
 URL:		http://irrlicht.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
 BuildRequires:	libjpeg-devel, zlib-devel
-# XXX: is libpng broken?
-BuildRequires: libpng-devel
+BuildRequires:	libpng-devel
 
 %description
 The Irrlicht Engine is an open source high performance realtime 3D engine 
@@ -38,7 +37,7 @@ Development headers and libraries for ir
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .glext
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
 mv readme.txt.iso88591 readme.txt
@@ -83,6 +82,9 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrlicht*.so
 
 %changelog
+* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.1-1
+- update to 1.5.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jan 2009 16:31:56 -0000	1.2
+++ sources	20 Aug 2009 00:57:53 -0000	1.3
@@ -1 +1 @@
-e3bc8c1074fc0ec2810dc48f94c05d5a  irrlicht-1.5.zip
+0174959bf5dc97fd645d2b714ba9bf6a  irrlicht-1.5.1.zip