[marsshooter] 02/28: Drop all patches. Applied upstream.
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Jan 10 16:43:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository marsshooter.
commit 19d126bb3be035cadaaffab8f4f8c4c618ac22db
Author: Markus Koschany <apo at debian.org>
Date: Sun Jan 3 15:42:15 2016 +0100
Drop all patches. Applied upstream.
---
debian/patches/CMakeList.patch | 33 ------
debian/patches/Use-sf-Shader-Bind-correctly.patch | 29 ------
debian/patches/desktop-file.patch | 26 -----
...egfault-when-using-arguments-without-path.patch | 32 ------
debian/patches/remove-glu-dependency.patch | 116 ---------------------
debian/patches/series | 5 -
6 files changed, 241 deletions(-)
diff --git a/debian/patches/CMakeList.patch b/debian/patches/CMakeList.patch
deleted file mode 100644
index 960f441..0000000
--- a/debian/patches/CMakeList.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sat, 14 Sep 2013 22:41:26 +0200
-Subject: CMakeList
-
-Forwarded: https://github.com/thelaui/M.A.R.S./issues/9
----
- src/CMakeLists.txt | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7047df1..8ccd378 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -122,13 +122,12 @@ if(UNIX)
- DESTINATION
- ${CMAKE_INSTALL_PREFIX}/share/applications
- )
-- install(
-- FILES
-- ${MARS_SOURCE_DIR}/resources/mars
-- DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/share/menu
-- )
--
-+ #install(
-+ #FILES
-+ #${MARS_SOURCE_DIR}/resources/mars
-+ #DESTINATION
-+ #${CMAKE_INSTALL_PREFIX}/share/menu
-+ #)
- else(UNIX)
- # executable
- install(
diff --git a/debian/patches/Use-sf-Shader-Bind-correctly.patch b/debian/patches/Use-sf-Shader-Bind-correctly.patch
deleted file mode 100644
index 341fb3d..0000000
--- a/debian/patches/Use-sf-Shader-Bind-correctly.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Sylvain BOILARD <boilard at crans.org>
-Date: Wed, 23 Jan 2013 02:02:47 +0100
-Subject: Use sf::Shader::Bind() correctly
-
-Forwarded: https://github.com/thelaui/M.A.R.S./pull/2
----
- 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();
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
deleted file mode 100644
index a136736..0000000
--- a/debian/patches/desktop-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Mon, 16 Sep 2013 12:42:54 +0200
-Subject: desktop file
-
-Forwarded: https://github.com/thelaui/M.A.R.S./issues/8
----
- resources/mars.desktop | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/resources/mars.desktop b/resources/mars.desktop
-index f765144..3a4b815 100755
---- a/resources/mars.desktop
-+++ b/resources/mars.desktop
-@@ -3,9 +3,10 @@ Type=Application
- Name=M.A.R.S.
- GenericName=Shooter Game
- Comment=M.A.R.S. - a ridiculous shooter
-+Comment[de]=M.A.R.S. - ein irrer Shooter.
- Exec=mars
- Icon=mars
- Terminal=false
--Categories=Game;ActionGame;
-+Categories=Game;ActionGame;
- StartupNotify=false
--MimeType=application;
-+Keywords=ships;space;shooter;2D;opengl;sfml;shader;particle;effects;multiplayer;
diff --git a/debian/patches/fix-segfault-when-using-arguments-without-path.patch b/debian/patches/fix-segfault-when-using-arguments-without-path.patch
deleted file mode 100644
index a6de78d..0000000
--- a/debian/patches/fix-segfault-when-using-arguments-without-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Sylvain Boilard <boilard at crans.org>
-Date: Mon, 3 Feb 2014 18:25:06 +0100
-Subject: fix segfault when using arguments without path
-
-Forwarded: https://github.com/thelaui/M.A.R.S./pull/6
----
- src/main.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 8346411..3fa97a0 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -61,10 +61,16 @@ int main(int argc, char* argv[]) {
- return 0;
- }
- else if (std::string(argv[i]) == "-cfg") {
-- settings::C_configPath = argv[++i];
-+ if (++i < argc)
-+ settings::C_configPath = argv[i];
-+ else
-+ std::cout << "Option \"-cfg\" expects a path to be provided following it.\n";
- }
- else if (std::string(argv[i]) == "-data") {
-- settings::C_dataPath = argv[++i];
-+ if (++i < argc)
-+ settings::C_dataPath = argv[i];
-+ else
-+ std::cout << "Option \"-data\" expects a path to be provided following it.\n";
- }
- else {
- std::cout << "Unknown option \"" << argv[i] << "\". Use -help for a complete list of supported flags.\n";
diff --git a/debian/patches/remove-glu-dependency.patch b/debian/patches/remove-glu-dependency.patch
deleted file mode 100644
index d157136..0000000
--- a/debian/patches/remove-glu-dependency.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: James Cowgill <james410 at cowgill.org.uk>
-Date: Wed, 1 Jul 2015 12:32:55 +0200
-Subject: remove glu dependency
-
-Fix build failures with SFML 2.3 due to the use of GLU functions.
-Replace GLU with standard OpenGL calls.
-
-Forwarded: https://github.com/thelaui/M.A.R.S./pull/17
----
- 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 3ffcf65..cbec0f6 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();
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 122b663..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-Use-sf-Shader-Bind-correctly.patch
-CMakeList.patch
-desktop-file.patch
-fix-segfault-when-using-arguments-without-path.patch
-remove-glu-dependency.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/marsshooter.git
More information about the Pkg-games-commits
mailing list