commit 74943e12c0fb4ce3f28b8b19e7e8d1a15a7a8454
Author: Jakub Bogusz <[email protected]>
Date: Fri Apr 26 16:57:42 2019 +0200
- added glee patch (update glext.h/glxext.h include prevention in internal
GLee)
- completed guichan dependencies
- release 5
fife-glee.patch | 30 ++++++++++++++++++++++++++++++
fife.spec | 18 ++++++++++++------
2 files changed, 42 insertions(+), 6 deletions(-)
---
diff --git a/fife.spec b/fife.spec
index 1bde196..761f2bf 100644
--- a/fife.spec
+++ b/fife.spec
@@ -6,28 +6,33 @@ Summary: Flexible Isometric Free Engine
Summary(pl.UTF-8): Flexible Isometric Free Engine - elastyczny,
wolnodostępny silnik izometryczny
Name: fife
Version: 0.3.5
-Release: 4
+Release: 5
License: LGPL v2.1+
Group: Libraries
Source0: http://downloads.sourceforge.net/fife/%{name}_%{version}.tar.gz
# Source0-md5: 11ba50b34239535a270d442466632ef7
Patch0: %{name}-extra_libs.patch
+Patch1: %{name}-glee.patch
URL: http://fifengine.net/
BuildRequires: OpenAL-devel
+BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
BuildRequires: SDL_image-devel
BuildRequires: SDL_ttf-devel
BuildRequires: boost-devel
-BuildRequires: guichan-devel
-#BuildRequires: guichan_opengl-devel
-#BuildRequires: guichan_sdl-devel
+BuildRequires: guichan-devel >= 0.8.2
+BuildRequires: guichan-opengl-devel >= 0.8.2
+BuildRequires: guichan-sdl-devel >= 0.8.2
BuildRequires: libpng-devel
BuildRequires: libvorbis-devel
-BuildRequires: python-devel >= 2.7
-BuildRequires: scons
+BuildRequires: pkgconfig
+BuildRequires: python-devel >= 1:2.7
+BuildRequires: scons >= 2.0
BuildRequires: swig-python
BuildRequires: tinyxml-devel
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXcursor-devel
+BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -92,6 +97,7 @@ Ten pakiet zawiera moduł Pythona.
%prep
%setup -qn %{name}_%{version}
%patch0 -p1
+%patch1 -p1
%build
# force pre C++11 standard, code uses std::make_pair in a way incompatible
with rvalue refs
diff --git a/fife-glee.patch b/fife-glee.patch
new file mode 100644
index 0000000..da47441
--- /dev/null
+++ b/fife-glee.patch
@@ -0,0 +1,30 @@
+--- fife_0.3.5/engine/core/ext/glee/GLee.h.orig 2013-08-21
22:13:07.000000000 +0200
++++ fife_0.3.5/engine/core/ext/glee/GLee.h 2019-04-26 15:57:07.235931514
+0200
+@@ -40,7 +40,7 @@
+ #error gl.h included before glee.h
+ #endif
+
+-#ifdef __glext_h_
++#if defined(__glext_h_) || defined(__gl_glext_h_)
+ #error glext.h included before glee.h
+ #endif
+
+@@ -48,7 +48,7 @@
+ #error wglext.h included before glee.h
+ #endif
+
+-#ifdef __glxext_h_
++#if defined(__glxext_h_) || defined(__glx_glxext_h_)
+ #error glxext.h included before glee.h
+ #endif
+
+@@ -63,7 +63,9 @@
+ #include <OpenGL/gl.h>
+ #else // GLX
+ #define __glext_h_ /* prevent glext.h from being included */
++ #define __gl_glext_h_
+ #define __glxext_h_ /* prevent glxext.h from being included */
++ #define __glx_glxext_h_
+ #define GLX_GLXEXT_PROTOTYPES
+ #include <GL/gl.h>
+ #include <GL/glx.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fife.git/commitdiff/74943e12c0fb4ce3f28b8b19e7e8d1a15a7a8454
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
