orion pushed to irrlicht (epel7). "update to 1.5.1"

[notifications at fedoraproject.org]

>From 449e124f00aa94dd5fda62871f651451abdc4be6 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Thu, 20 Aug 2009 00:57:53 +0000
Subject: update to 1.5.1


diff --git a/.cvsignore b/.cvsignore
index 5b79e6d..bef7c40 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-irrlicht-1.5.zip
+irrlicht-1.5.1.zip
diff --git a/irrlicht-1.5.1-glext.patch b/irrlicht-1.5.1-glext.patch
new file mode 100644
index 0000000..c9f3e94
--- /dev/null
+++ b/irrlicht-1.5.1-glext.patch
@@ -0,0 +1,16 @@
+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
+ 
diff --git a/irrlicht.spec b/irrlicht.spec
index 5ae1f83..b219e09 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -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.net/irrlicht/%{name}-%{version}.zip
 # 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 irrlicht.
 %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
 
diff --git a/sources b/sources
index 583d464..af208a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3bc8c1074fc0ec2810dc48f94c05d5a  irrlicht-1.5.zip
+0174959bf5dc97fd645d2b714ba9bf6a  irrlicht-1.5.1.zip
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/irrlicht.git/commit/?h=epel7&id=449e124f00aa94dd5fda62871f651451abdc4be6