aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/mars-sfml-2.3.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/mars-sfml-2.3.patch')
-rw-r--r--gnu/packages/patches/mars-sfml-2.3.patch151
1 files changed, 0 insertions, 151 deletions
diff --git a/gnu/packages/patches/mars-sfml-2.3.patch b/gnu/packages/patches/mars-sfml-2.3.patch
deleted file mode 100644
index 01ec05ff36..0000000000
--- a/gnu/packages/patches/mars-sfml-2.3.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-This is a concatenation of the following two patches:
-
- https://github.com/jcowgill/M.A.R.S./commit/33d5affabf8ff84f2c028b9303c6a9e83cc824ad.patch
- https://patch-diff.githubusercontent.com/raw/thelaui/M.A.R.S./pull/2.patch
-
-Their purpose is to allow Mars to be built against the latest version of SFML.
-
-From 33d5affabf8ff84f2c028b9303c6a9e83cc824ad Mon Sep 17 00:00:00 2001
-From: James Cowgill <james410@cowgill.org.uk>
-Date: Sat, 9 May 2015 01:54:14 +0100
-Subject: [PATCH] Remove dependency on GLU - fixes build with SFML 2.3
-
----
- premake4.lua | 8 ++++----
- src/Shaders/postFX.cpp | 2 +-
- src/System/window.cpp | 12 ++++++------
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/premake4.lua b/premake4.lua
-index 023dddd..5af4495 100755
---- a/premake4.lua
-+++ b/premake4.lua
-@@ -11,11 +11,11 @@ project "mars"
- defines { "NDEBUG" }
- flags { "Optimize" }
- if os.get() == "windows" then
-- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
-+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
- elseif os.get() == "macosx" then
- links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
- else
-- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
-+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
- libdirs { "/usr/lib", "/usr/local/lib" }
- end
-
-@@ -23,10 +23,10 @@ project "mars"
- defines { "_DEBUG", "DEBUG" }
- flags { "Symbols" }
- if os.get() == "windows" then
-- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
-+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
- elseif os.get() == "macosx" then
- links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
- else
-- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
-+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
- libdirs { "/usr/lib", "/usr/local/lib" }
- end
-diff --git a/src/Shaders/postFX.cpp b/src/Shaders/postFX.cpp
-index 987f411..f767a47 100644
---- a/src/Shaders/postFX.cpp
-+++ b/src/Shaders/postFX.cpp
-@@ -78,7 +78,7 @@ namespace postFX {
- postFX_.loadFromFile(settings::C_dataPath + "shaders/bump.frag", sf::Shader::Fragment);
- bumpMap_.create(SPACE_X_RESOLUTION*0.5f, SPACE_Y_RESOLUTION*0.5f);
- glViewport(0,0,SPACE_X_RESOLUTION*0.5f,SPACE_Y_RESOLUTION*0.5f);
-- gluOrtho2D(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0);
-+ glOrtho(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0, -1, 1);
- glEnable(GL_BLEND);
- glMatrixMode(GL_MODELVIEW);
- postFX_.setParameter("BumpMap", bumpMap_.getTexture());
-diff --git a/src/System/window.cpp b/src/System/window.cpp
-index e9a099a..8e12dcc 100644
---- a/src/System/window.cpp
-+++ b/src/System/window.cpp
-@@ -222,7 +222,7 @@ namespace window {
- glLoadIdentity();
-
- // Setup translation (according to left-upper corner)
-- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
-+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
-
- // probably improves performance...
- glDisable(GL_LIGHTING);
-@@ -247,7 +247,7 @@ namespace window {
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
-- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
-+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
-
-@@ -255,7 +255,7 @@ namespace window {
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
-- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
-+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- }
-@@ -270,7 +270,7 @@ namespace window {
- glLoadIdentity();
- setViewPort();
-
-- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
-+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
-
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
-@@ -284,7 +284,7 @@ namespace window {
- glLoadIdentity();
- setViewPort();
-
-- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
-+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
-
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
-@@ -294,7 +294,7 @@ namespace window {
- else {
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
-- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
-+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- }
-
-From a97d0d6a19b5b43e3c53081e36f1f1747b6674e6 Mon Sep 17 00:00:00 2001
-From: Sylvain BOILARD <boilard@crans.org>
-Date: Wed, 23 Jan 2013 02:02:47 +0100
-Subject: [PATCH] Use sf::Shader::Bind() correctly after latest update of the
- SFML's API.
-
----
- src/System/window.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/System/window.cpp b/src/System/window.cpp
-index e9a099a..3ffcf65 100644
---- a/src/System/window.cpp
-+++ b/src/System/window.cpp
-@@ -307,13 +307,11 @@ namespace window {
- window_.setActive(true);
- glEnable(GL_TEXTURE_2D);
-
-- if (shader)
-- shader->bind();
-+ sf::Shader::bind(shader);
-
- window_.draw(toBeDrawn, states);
-
-- if (shader)
-- shader->unbind();
-+ sf::Shader::bind(NULL);
-
- window_.popGLStates();
- glPopMatrix();
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-16 09:06:48 +0000