orion pushed to irrlicht (epel7). "try this patch instead"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Mar 28 03:50:55 UTC 2015
>From 32abfb2cb2bda087edd80aa9dfbbe6d083379f07 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Fri, 13 Dec 2013 23:10:05 -0500
Subject: try this patch instead
diff --git a/irrlicht-1.8.1-mesa10.patch b/irrlicht-1.8.1-mesa10.patch
index 6f8d50b..15baad1 100644
--- a/irrlicht-1.8.1-mesa10.patch
+++ b/irrlicht-1.8.1-mesa10.patch
@@ -1,13 +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 @@
+--- 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
+@@ -59,6 +59,9 @@
#endif
#include <GL/gl.h>
#include <GL/glx.h>
-- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++ #ifndef PFNGLBLENDEQUATIONPROC
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
++ #endif
+ #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 30437f1..d9855e0 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -84,6 +84,8 @@ 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=32abfb2cb2bda087edd80aa9dfbbe6d083379f07
More information about the scm-commits
mailing list