[bolzplatz2006] Fix building with latest mesa
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Oct 24 11:13:01 UTC 2014
commit 6641d47ba4e94fe272aed12f12a072925e3b7d6d
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Oct 24 13:13:03 2014 +0200
Fix building with latest mesa
bolzplatz2006-use-system-extgl.patch | 110 ++++++++++++++++++++++++++++++++++
bolzplatz2006.spec | 9 ++-
2 files changed, 117 insertions(+), 2 deletions(-)
---
diff --git a/bolzplatz2006-use-system-extgl.patch b/bolzplatz2006-use-system-extgl.patch
new file mode 100644
index 0000000..1bbdc06
--- /dev/null
+++ b/bolzplatz2006-use-system-extgl.patch
@@ -0,0 +1,110 @@
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLDriver.h~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLDriver.h
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLDriver.h~ 2006-03-21 15:26:50.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLDriver.h 2014-10-24 13:00:37.365379552 +0200
+@@ -18,13 +18,11 @@
+ #include "IrrCompileConfig.h"
+
+ #ifdef LINUX
+-#define GL_GLEXT_LEGACY 1
+ #include <X11/Xlib.h>
+ #endif // LINUX
+
+ #ifdef _IRR_COMPILE_WITH_OPENGL_
+ #include <GL/gl.h>
+-#include "glext.h"
+
+ namespace irr
+ {
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLMaterialRenderer.h~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLMaterialRenderer.h
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLMaterialRenderer.h~ 2006-03-21 15:26:50.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLMaterialRenderer.h 2014-10-24 12:59:12.040804418 +0200
+@@ -16,10 +16,8 @@
+ #endif
+
+ #ifdef LINUX
+-#define GL_GLEXT_LEGACY 1
+ #include <GL/glx.h>
+ #include <GL/gl.h>
+-#include "glext.h"
+ #endif
+
+ #include "COpenGLDriver.h"
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLNormalMapRenderer.cpp~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLNormalMapRenderer.cpp
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLNormalMapRenderer.cpp~ 2006-03-21 15:26:52.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLNormalMapRenderer.cpp 2014-10-24 13:01:10.847481590 +0200
+@@ -10,8 +10,7 @@
+ #include "IShaderConstantSetCallBack.h"
+ #include "IVideoDriver.h"
+ #include "os.h"
+-#define GL_GLEXT_LEGACY 1
+-#include "glext.h"
++#include <GL/gl.h>
+ #include "COpenGLDriver.h"
+ #include <stdio.h>
+ #include <string.h>
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLParallaxMapRenderer.cpp~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLParallaxMapRenderer.cpp
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLParallaxMapRenderer.cpp~ 2006-03-21 15:26:50.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLParallaxMapRenderer.cpp 2014-10-24 13:01:11.167473008 +0200
+@@ -10,8 +10,7 @@
+ #include "IShaderConstantSetCallBack.h"
+ #include "IVideoDriver.h"
+ #include "os.h"
+-#define GL_GLEXT_LEGACY 1
+-#include "glext.h"
++#include <GL/gl.h>
+ #include "COpenGLDriver.h"
+ #include <stdio.h>
+ #include <string.h>
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLSLMaterialRenderer.h~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLSLMaterialRenderer.h
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLSLMaterialRenderer.h~ 2006-03-21 15:26:52.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLSLMaterialRenderer.h 2014-10-24 12:59:19.750571335 +0200
+@@ -17,10 +17,8 @@
+ #endif
+
+ #ifdef LINUX
+-#define GL_GLEXT_LEGACY 1
+ #include <GL/glx.h>
+ #include <GL/gl.h>
+-#include "glext.h"
+ #endif
+
+ #include "IMaterialRenderer.h"
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.cpp~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.cpp
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.cpp~ 2006-03-21 15:26:50.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.cpp 2014-10-24 13:01:11.503463997 +0200
+@@ -10,8 +10,7 @@
+ #include "IShaderConstantSetCallBack.h"
+ #include "IVideoDriver.h"
+ #include "os.h"
+-#define GL_GLEXT_LEGACY 1
+-#include "glext.h"
++#include <GL/gl.h>
+ #include "COpenGLDriver.h"
+ #include <stdio.h>
+ #include <string.h>
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.h~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.h
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.h~ 2006-03-21 15:26:50.000000000 +0100
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLShaderMaterialRenderer.h 2014-10-24 12:59:07.289948046 +0200
+@@ -16,10 +16,8 @@
+ #endif
+
+ #ifdef LINUX
+-#define GL_GLEXT_LEGACY 1
+ #include <GL/glx.h>
+ #include <GL/gl.h>
+-#include "glext.h"
+ #endif
+
+ #include "IMaterialRenderer.h"
+diff -up bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLTexture.cpp~ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLTexture.cpp
+--- bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLTexture.cpp~ 2006-05-22 15:13:44.000000000 +0200
++++ bolzplatz2006-1.0.3/libsrc/irrlicht-0.14-patched/COpenGLTexture.cpp 2014-10-24 13:05:04.109402026 +0200
+@@ -10,7 +10,7 @@
+ #include "IrrCompileConfig.h"
+ #ifdef _IRR_COMPILE_WITH_OPENGL_
+
+-#include "glext.h"
++#include <GL/gl.h>
+
+ namespace irr
+ {
diff --git a/bolzplatz2006.spec b/bolzplatz2006.spec
index d117b15..cd59ece 100644
--- a/bolzplatz2006.spec
+++ b/bolzplatz2006.spec
@@ -7,7 +7,7 @@
Name: bolzplatz2006
Version: 1.0.3
-Release: 27%{?dist}
+Release: 28%{?dist}
Summary: Slam Soccer 2006 is a funny football game in 3D-comic-style
Summary(fr): Coup de Foot 2006 est un jeu comique en 3D
Summary(de): Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
@@ -35,6 +35,7 @@ Patch7: %{name}-no-xrandr.patch
Patch8: %{name}-versioned-openal.patch
Patch9: %{name}-1.0.3-libpng15.patch
Patch10: %{name}-class-version15.patch
+Patch11: %{name}-use-system-extgl.patch
BuildRequires: ant sdljava dom4j vecmath1.2 swig xml-commons-apis
BuildRequires: libGLU-devel DevIL-devel libXxf86vm-devel libjpeg-devel
BuildRequires: libpng-devel libXext-devel libXrandr-devel libXcursor-devel
@@ -128,11 +129,12 @@ popd
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
cp %{SOURCE7} .
sed -i 's/\r//' license.txt
# we use the system versions of these
rm -r libsrc/irrlicht-0.14-patched/libpng libsrc/irrlicht-0.14-patched/zlib \
- libsrc/irrlicht-0.14-patched/jpeglib
+ libsrc/irrlicht-0.14-patched/jpeglib libsrc/irrlicht-0.14-patched/glext.h
%build
@@ -239,6 +241,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Oct 24 2014 Hans de Goede <hdegoede at redhat.com> - 1.0.3-28
+- Fix building with latest mesa
+
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list