[irrlicht] fix rawhide build
Tom Callaway
spot at fedoraproject.org
Sat Dec 14 03:51:04 UTC 2013
commit c562d387ee1223ba71eb4730b5d61eed53e113d6
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Dec 13 22:51:09 2013 -0500
fix rawhide build
irrlicht-1.8.1-mesa10.patch | 13 +++++++++++++
irrlicht.spec | 3 +++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/irrlicht-1.8.1-mesa10.patch b/irrlicht-1.8.1-mesa10.patch
new file mode 100644
index 0000000..6f8d50b
--- /dev/null
+++ b/irrlicht-1.8.1-mesa10.patch
@@ -0,0 +1,13 @@
+diff -up irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 2013-12-13 22:42:17.566462602 -0500
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h 2013-12-13 22:49:40.523166116 -0500
+@@ -59,8 +59,8 @@
+ #endif
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ #include <GL/glext.h>
++ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 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 <GL/glxext.h>
diff --git a/irrlicht.spec b/irrlicht.spec
index 0eedef6..30437f1 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -23,6 +23,8 @@ Patch2: irrlicht18-libaesgm.patch
Patch4: irrlicht-1.8-irrXML-shared-library.patch
# Fix issue with definition of LOCALE_DECIMAL_POINTS
Patch5: irrlicht-1.8-fix-locale-decimal-points.patch
+# Fix build with Mesa 10
+Patch6: irrlicht-1.8.1-mesa10.patch
URL: http://irrlicht.sourceforge.net/
BuildRequires: libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
@@ -80,6 +82,7 @@ Development headers and libraries for irrXML.
# %patch3 -p1 -b .fastatof
%patch4 -p1 -b .irrXML
%patch5 -p1 -b .fix-locale-decimal-points
+%patch6 -p1 -b .mesa10
sed -i 's/\r//' readme.txt
iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
More information about the scm-commits
mailing list