orion pushed to irrlicht (epel7). "more mesa 10 fixes"

[notifications at fedoraproject.org]

>From 02121d6938bd65ed4fe9a43be92a78bffdb8a691 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 30 Dec 2013 12:19:34 -0500
Subject: more mesa 10 fixes


diff --git a/irrlicht-1.8.1-mesa10.patch b/irrlicht-1.8.1-mesa10.patch
index 15baad1..ca8e4a7 100644
--- a/irrlicht-1.8.1-mesa10.patch
+++ b/irrlicht-1.8.1-mesa10.patch
@@ -1,6 +1,6 @@
 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 23:03:21.967758473 -0500
-+++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h	2013-12-13 23:05:22.067405799 -0500
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10	2013-12-13 23:05:43.208343706 -0500
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h	2013-12-13 23:05:43.213343691 -0500
 @@ -59,6 +59,9 @@
  	#endif
  	#include <GL/gl.h>
@@ -11,3 +11,16 @@ diff -up irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 irrlich
  	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
  	#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);
+diff -up irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10 irrlicht-1.8.1/source/Irrlicht/glxext.h
+--- irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10	2013-12-30 12:18:38.368368241 -0500
++++ irrlicht-1.8.1/source/Irrlicht/glxext.h	2013-12-30 12:18:54.305386790 -0500
+@@ -44,6 +44,9 @@ extern "C" {
+ #ifndef GLAPI
+ #define GLAPI extern
+ #endif
++#ifndef GLXContextID
++#define GLXContextID XID
++#endif
+ 
+ /*************************************************************/
+ 
diff --git a/irrlicht.spec b/irrlicht.spec
index d9855e0..30437f1 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -84,8 +84,6 @@ Development headers and libraries for irrXML.
 %patch5 -p1 -b .fix-locale-decimal-points
 %patch6 -p1 -b .mesa10
 
-exit 0
-
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
 mv readme.txt.iso88591 readme.txt
-- 
cgit v0.10.2


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