diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /games-util/slade/files | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'games-util/slade/files')
8 files changed, 112 insertions, 379 deletions
diff --git a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch b/games-util/slade/files/slade-3.1.12a-bundled-libs.patch deleted file mode 100644 index 6e8285d81056..000000000000 --- a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur a/src/Application/App.cpp b/src/Application/App.cpp ---- a/src/Application/App.cpp 2020-05-26 00:34:50.000000000 +0100 -+++ b/src/Application/App.cpp 2020-05-31 17:11:08.365000293 +0100 -@@ -34,7 +34,7 @@ - #include "App.h" - #include "Archive/ArchiveManager.h" - #include "Dialogs/SetupWizard/SetupWizardDialog.h" --#include "External/dumb/dumb.h" -+#include <dumb.h> - #include "Game/Configuration.h" - #include "General/ColourConfiguration.h" - #include "General/Console/Console.h" -diff -Naur a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp ---- a/src/Audio/ModMusic.cpp 2020-05-26 00:34:50.000000000 +0100 -+++ b/src/Audio/ModMusic.cpp 2020-05-31 17:11:08.365000293 +0100 -@@ -30,7 +30,7 @@ - *******************************************************************/ - #include "Main.h" - #include "ModMusic.h" --#include "External/dumb/dumb.h" -+#include <dumb.h> - - - /******************************************************************* -diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2020-05-26 00:34:50.000000000 +0100 -+++ b/src/CMakeLists.txt 2020-05-31 17:11:08.365000293 +0100 -@@ -105,6 +105,8 @@ - find_package(GLEW REQUIRED) - find_package(Freetype REQUIRED) - find_package(CURL REQUIRED) -+find_package(Lua REQUIRED) -+pkg_check_modules(DUMB REQUIRED dumb>=1.0) - include_directories( - ${FREEIMAGE_INCLUDE_DIR} - ${SFML_INCLUDE_DIR} -@@ -112,8 +114,9 @@ - ${FREETYPE_INCLUDE_DIRS} - ${GLEW_INCLUDE_PATH} - ${CURL_INCLUDE_DIR} -+ ${LUA_INCLUDE_DIR} -+ ${DUMB_INCLUDE_DIRS} - . -- ./External/dumb - ./Application - ) - -@@ -182,6 +185,8 @@ - ${FREETYPE_LIBRARIES} - ${GLEW_LIBRARY} - ${CURL_LIBRARIES} -+ ${LUA_LIBRARIES} -+ ${DUMB_LIBRARIES} - ) - - if (WX_GTK3) -diff -Naur a/src/External/CMakeLists.txt b/src/External/CMakeLists.txt ---- a/src/External/CMakeLists.txt 2020-05-26 00:34:50.000000000 +0100 -+++ b/src/External/CMakeLists.txt 2020-05-31 17:12:09.614333605 +0100 -@@ -24,8 +24,6 @@ - file(GLOB_RECURSE EXTERNAL_SOURCES - *.cpp - *.cxx -- dumb/*.c -- lua/*.c - lzma/C/LzmaDec.c - ${SLADE_HEADERS} - ) -diff -Naur a/src/External/sol/sol.hpp b/src/External/sol/sol.hpp ---- a/src/External/sol/sol.hpp 2020-05-26 00:34:50.000000000 +0100 -+++ b/src/External/sol/sol.hpp 2020-05-31 17:11:08.367000336 +0100 -@@ -798,7 +798,7 @@ - #include <lualib.h> - #include <lauxlib.h> - #else --#include "External/lua/lua.hpp" -+#include <lua.hpp> - #endif // C++ Mangling for Lua - - #if defined(_WIN32) || defined(_MSC_VER) diff --git a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch deleted file mode 100644 index ba7fba329c9b..000000000000 --- a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -104,7 +104,7 @@ - find_package(OpenGL REQUIRED) - find_package(GLEW REQUIRED) - find_package(CURL REQUIRED) --find_package(Lua REQUIRED) -+find_package(Lua ${LUA_VERSION} EXACT REQUIRED) - pkg_check_modules(DUMB REQUIRED dumb>=1.0) - include_directories( - ${FREEIMAGE_INCLUDE_DIR} diff --git a/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch b/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch deleted file mode 100644 index c0ef70d6dfc8..000000000000 --- a/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/sirjuddington/SLADE/issues/1147 - -diff -Naur a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp ---- a/src/Audio/MIDIPlayer.cpp 2020-05-28 00:08:34.000000000 +0100 -+++ b/src/Audio/MIDIPlayer.cpp 2020-05-31 21:40:03.480211253 +0100 -@@ -74,8 +74,6 @@ - #ifndef NO_FLUIDSYNTH - // Set fluidsynth driver to alsa in linux (no idea why it defaults to jack) - #if !defined __WXMSW__ && !defined __WXOSX__ -- if (fs_driver == "") -- fs_driver = "alsa"; - #endif // !defined __WXMSW__ && !defined __WXOSX__ - - // Init soundfont path diff --git a/games-util/slade/files/slade-3.1.12a-freetype-deps.patch b/games-util/slade/files/slade-3.1.12a-freetype-deps.patch deleted file mode 100644 index 33fdbfe8521c..000000000000 --- a/games-util/slade/files/slade-3.1.12a-freetype-deps.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 115ae712d576deafaa95dc5227a7f83dce92a9cb Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Sun, 31 May 2020 21:59:06 +0100 -Subject: [PATCH 1/2] Drop unused FreeType dependency - -It may be used by FTGL but it's not directly used by this -project. pkg-config should handle this for static builds. ---- - src/CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f54b126f..8dab39fc 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -103,7 +103,6 @@ find_package(SFML COMPONENTS ${SFML_FIND_COMPONENTS} REQUIRED) - find_package(FTGL REQUIRED) - find_package(OpenGL REQUIRED) - find_package(GLEW REQUIRED) --find_package(Freetype REQUIRED) - find_package(CURL REQUIRED) - find_package(Lua REQUIRED) - find_package(fmt CONFIG REQUIRED) -@@ -111,7 +110,6 @@ include_directories( - ${FREEIMAGE_INCLUDE_DIR} - ${SFML_INCLUDE_DIR} - ${FTGL_INCLUDE_DIR} -- ${FREETYPE_INCLUDE_DIRS} - ${GLEW_INCLUDE_PATH} - ${CURL_INCLUDE_DIR} - ${LUA_INCLUDE_DIR} -@@ -184,7 +182,6 @@ target_link_libraries(slade - ${SFML_LIBRARY} - ${FTGL_LIBRARIES} - ${OPENGL_LIBRARIES} -- ${FREETYPE_LIBRARIES} - ${GLEW_LIBRARY} - ${CURL_LIBRARIES} - ${LUA_LIBRARIES} --- -2.26.2 - -From 9116972a75b58ef32e229842f80cdc96fab04f1e Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Sun, 31 May 2020 22:00:53 +0100 -Subject: [PATCH 2/2] Only require FTGL when USE_SFML_RENDERWINDOW is disabled - ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 8dab39fc..b0d4776d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -72,6 +72,7 @@ set(SFML_FIND_COMPONENTS system audio window graphics network) - ADD_DEFINITIONS(-DUSE_SFML_RENDERWINDOW) - else (USE_SFML_RENDERWINDOW) - set(SFML_FIND_COMPONENTS system audio window network) -+find_package(FTGL REQUIRED) - endif(USE_SFML_RENDERWINDOW) - - # Fluidsynth -@@ -100,7 +101,6 @@ endif() - - find_package(FreeImage REQUIRED) - find_package(SFML COMPONENTS ${SFML_FIND_COMPONENTS} REQUIRED) --find_package(FTGL REQUIRED) - find_package(OpenGL REQUIRED) - find_package(GLEW REQUIRED) - find_package(CURL REQUIRED) --- -2.26.2 - diff --git a/games-util/slade/files/slade-3.1.12a-sfml-gtk3.patch b/games-util/slade/files/slade-3.1.12a-sfml-gtk3.patch deleted file mode 100644 index 745a41d64b80..000000000000 --- a/games-util/slade/files/slade-3.1.12a-sfml-gtk3.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 7e2aa2666701cc0db32d8b3185c3cd07ae733ab0 Mon Sep 17 00:00:00 2001 -From: Simon Judd <sirjuddington@gmail.com> -Date: Fri, 6 Dec 2019 16:36:52 +1030 -Subject: [PATCH] Fix SFML RenderWindow embedding on GTK3 - -It actually seems to work ok now so might be able to make it the default there - -It'd be nice if it worked on macos as well, then I'd be able to remove the wxGLCanvas/FTGL stuff completely... ---- - -diff --git a/src/UI/Canvas/OGLCanvas.cpp b/src/UI/Canvas/OGLCanvas.cpp -index 92f86b29..4bba9f98 100644 ---- a/src/UI/Canvas/OGLCanvas.cpp -+++ b/src/UI/Canvas/OGLCanvas.cpp -@@ -44,6 +44,8 @@ - #endif - #endif - -+EXTERN_CVAR(Int, gl_depth_buffer_size) -+ - - /******************************************************************* - * OGLCANVAS CLASS FUNCTIONS -@@ -130,29 +132,29 @@ bool OGLCanvas::setContext() - #endif - } - --void OGLCanvas::createSFML() -+bool OGLCanvas::createSFML() - { - #ifdef USE_SFML_RENDERWINDOW - // Code taken from SFML wxWidgets integration example - sf::WindowHandle handle; - #ifdef __WXGTK__ -- // GTK implementation requires to go deeper to find the -- // low-level X11 identifier of the widget -- gtk_widget_realize(m_wxwindow); -- gtk_widget_set_double_buffered(m_wxwindow, false); -- GdkWindow* Win = gtk_widget_get_window(m_wxwindow); -- XFlush(GDK_WINDOW_XDISPLAY(Win)); -- //sf::RenderWindow::Create(GDK_WINDOW_XWINDOW(Win)); -- handle = GDK_WINDOW_XWINDOW(Win); -+ auto widget = GetHandle(); -+ if (!widget) -+ return false; -+ auto window = gtk_widget_get_window(widget); -+ if (!window) -+ return false; -+ handle = gdk_x11_window_get_xid(window); - #else - handle = GetHandle(); - #endif - // Context settings - sf::ContextSettings settings; -- settings.depthBits = 24; -- settings.stencilBits = 8; -+ settings.depthBits = gl_depth_buffer_size; -+ settings.stencilBits = sf::ContextSettings::Default; - sf::RenderWindow::create(handle, settings); - #endif -+ return true; - } - - /* OGLCanvas::init -@@ -308,7 +310,9 @@ void OGLCanvas::onPaint(wxPaintEvent& e) - - if (recreate) - { -- createSFML(); -+ if (!createSFML()) -+ return; -+ - recreate = false; - } - -diff --git a/src/UI/Canvas/OGLCanvas.h b/src/UI/Canvas/OGLCanvas.h -index a1defbee..9b9b07db 100644 ---- a/src/UI/Canvas/OGLCanvas.h -+++ b/src/UI/Canvas/OGLCanvas.h -@@ -28,7 +28,7 @@ public: - Palette* getPalette() { return &palette; } - void setPalette(Palette* pal) { palette.copyPalette(pal); } - bool setContext(); -- void createSFML(); -+ bool createSFML(); - void init(); - virtual void draw() = 0; - virtual void update(long frametime) {} diff --git a/games-util/slade/files/slade-3.1.12a-wxGLCanvas.patch b/games-util/slade/files/slade-3.1.12a-wxGLCanvas.patch deleted file mode 100644 index 64698cc4591d..000000000000 --- a/games-util/slade/files/slade-3.1.12a-wxGLCanvas.patch +++ /dev/null @@ -1,112 +0,0 @@ -From a934d04b8c49c250e9be27581129c75bc058814a Mon Sep 17 00:00:00 2001 -From: Simon Judd <sirjuddington@gmail.com> -Date: Mon, 9 Dec 2019 12:26:17 +1030 -Subject: [PATCH] Always use wxGLCanvas as a base for OGLCanvas - -Even if using SFML - this fixes the depth buffer not being created on linux ---- - -diff --git a/src/OpenGL/OpenGL.cpp b/src/OpenGL/OpenGL.cpp -index 7e506550..0a8d4236 100644 ---- a/src/OpenGL/OpenGL.cpp -+++ b/src/OpenGL/OpenGL.cpp -@@ -38,14 +38,14 @@ CVAR(Bool, gl_tex_enable_np2, true, CVAR_SAVE) - CVAR(Bool, gl_point_sprite, true, CVAR_SAVE) - CVAR(Bool, gl_tweak_accuracy, true, CVAR_SAVE) - CVAR(Bool, gl_vbo, true, CVAR_SAVE) --CVAR(Int, gl_depth_buffer_size, 16, CVAR_SAVE) -+CVAR(Int, gl_depth_buffer_size, 24, CVAR_SAVE) - - namespace OpenGL - { - #ifndef USE_SFML_RENDERWINDOW - wxGLContext* context = NULL; -- int wx_gl_attrib[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, WX_GL_STENCIL_SIZE, 8, 0 }; - #endif -+ int wx_gl_attrib[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, WX_GL_STENCIL_SIZE, 8, 0 }; - bool initialised = false; - double version = 0; - unsigned max_tex_size = 128; -@@ -224,7 +224,6 @@ bool OpenGL::accuracyTweak() - return gl_tweak_accuracy; - } - --#ifndef USE_SFML_RENDERWINDOW - /* OpenGL::getWxGLAttribs - * Returns the GL attributes array for use with wxGLCanvas - *******************************************************************/ -@@ -235,7 +234,6 @@ int* OpenGL::getWxGLAttribs() - - return wx_gl_attrib; - } --#endif - - /* OpenGL::setColour - * Sets the colour to [col], and changes the colour blend mode if -diff --git a/src/OpenGL/OpenGL.h b/src/OpenGL/OpenGL.h -index 1d5c9b9a..9082687c 100644 ---- a/src/OpenGL/OpenGL.h -+++ b/src/OpenGL/OpenGL.h -@@ -20,10 +20,8 @@ - #include <GL/glu.h> - #endif - --#ifndef USE_SFML_RENDERWINDOW - #include <wx/glcanvas.h> - #undef None // Why does <X11/X.h> #define this? Idiotic --#endif - - #define BLEND_NORMAL 0 - #define BLEND_ADDITIVE 1 -@@ -56,9 +54,7 @@ namespace OpenGL - unsigned maxTextureSize(); - bool isInitialised(); - bool accuracyTweak(); --#ifndef USE_SFML_RENDERWINDOW - int* getWxGLAttribs(); --#endif - void setColour(rgba_t col, bool set_blend = true); - void setColour(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, int8_t blend = BLEND_IGNORE); - void setBlend(int blend); -diff --git a/src/UI/Canvas/OGLCanvas.cpp b/src/UI/Canvas/OGLCanvas.cpp -index 4bba9f98..a48d9ac6 100644 ---- a/src/UI/Canvas/OGLCanvas.cpp -+++ b/src/UI/Canvas/OGLCanvas.cpp -@@ -55,8 +55,9 @@ EXTERN_CVAR(Int, gl_depth_buffer_size) - /* OGLCanvas::OGLCanvas - * OGLCanvas class constructor, SFML implementation - *******************************************************************/ --OGLCanvas::OGLCanvas(wxWindow* parent, int id, bool handle_timer, int timer_interval) -- : wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxWANTS_CHARS), timer(this) -+OGLCanvas::OGLCanvas(wxWindow* parent, int id, bool handle_timer, int timer_interval) : -+ wxGLCanvas(parent, id, OpenGL::getWxGLAttribs(), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxWANTS_CHARS), -+ timer(this) - { - init_done = false; - recreate = false; -diff --git a/src/UI/Canvas/OGLCanvas.h b/src/UI/Canvas/OGLCanvas.h -index 9b9b07db..128cb633 100644 ---- a/src/UI/Canvas/OGLCanvas.h -+++ b/src/UI/Canvas/OGLCanvas.h -@@ -8,7 +8,7 @@ - - class wxWindow; - #ifdef USE_SFML_RENDERWINDOW --class OGLCanvas : public wxControl, public sf::RenderWindow -+class OGLCanvas : public wxGLCanvas, public sf::RenderWindow - { - #else - class OGLCanvas : public wxGLCanvas -@@ -38,7 +38,11 @@ public: - void setup2D(); - - #ifdef USE_SFML_RENDERWINDOW -- void SwapBuffers() { display(); } -+ bool SwapBuffers() override -+ { -+ display(); -+ return true; -+ } - #endif - - void onPaint(wxPaintEvent& e); diff --git a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch new file mode 100644 index 000000000000..4474ab783d47 --- /dev/null +++ b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch @@ -0,0 +1,85 @@ +From a22553a612ade8a5e3f90c84166e9fdda16635c9 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 20 Feb 2021 12:22:24 +0000 +Subject: [PATCH] Unbundle the DUMB library + +--- + src/Application/App.cpp | 2 +- + src/Audio/ModMusic.cpp | 2 +- + src/CMakeLists.txt | 4 +++- + thirdparty/CMakeLists.txt | 2 -- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Application/App.cpp b/src/Application/App.cpp +index 3d4dcc1d..d2c3e583 100644 +--- a/src/Application/App.cpp ++++ b/src/Application/App.cpp +@@ -60,7 +60,7 @@ + #include "UI/WxUtils.h" + #include "Utility/StringUtils.h" + #include "Utility/Tokenizer.h" +-#include "thirdparty/dumb/dumb.h" ++#include <dumb.h> + #include <filesystem> + + using namespace slade; +diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp +index cb8eef8c..2d368fdb 100644 +--- a/src/Audio/ModMusic.cpp ++++ b/src/Audio/ModMusic.cpp +@@ -32,7 +32,7 @@ + // ----------------------------------------------------------------------------- + #include "Main.h" + #include "ModMusic.h" +-#include "thirdparty/dumb/dumb.h" ++#include <dumb.h> + + using namespace slade; + using namespace audio; +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 802598f6..222e6040 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -110,6 +110,7 @@ endif() + pkg_check_modules(fmt REQUIRED fmt>=6) + include_directories(${fmt_INCLUDE_DIRS}) + find_package(MPG123 REQUIRED) ++pkg_check_modules(DUMB REQUIRED dumb>=1.0) + include_directories( + ${FREEIMAGE_INCLUDE_DIR} + ${SFML_INCLUDE_DIR} +@@ -118,9 +119,9 @@ include_directories( + ${CURL_INCLUDE_DIR} + ${LUA_INCLUDE_DIR} + ${MPG123_INCLUDE_DIR} ++ ${DUMB_INCLUDE_DIRS} + . + .. +- ../thirdparty/dumb + ./Application + ) + +@@ -200,6 +201,7 @@ target_link_libraries(slade + ${CURL_LIBRARIES} + ${LUA_LIBRARIES} + ${MPG123_LIBRARIES} ++ ${DUMB_LIBRARIES} + ${fmt_LIBRARIES} + -lstdc++fs + ) +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 6b0eb504..a3757c91 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -12,8 +12,6 @@ set(EXTERNAL_SOURCES + file(GLOB_RECURSE EXTERNAL_SOURCES + *.cpp + *.cxx +- dumb/*.c +- lua/*.c + lzma/C/LzmaDec.c + fmt/*.cc + ${SLADE_HEADERS} +-- +2.30.0 + diff --git a/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch new file mode 100644 index 000000000000..bd828d81b390 --- /dev/null +++ b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch @@ -0,0 +1,27 @@ +From dc0057d1200f9bb6b67f1b1a2094b7e402d1d370 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 20 Feb 2021 12:28:48 +0000 +Subject: [PATCH] Don't force FluidSynth to use ALSA on Linux + +--- + src/Audio/MIDIPlayer.cpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp +index bb001339..f33ffe67 100644 +--- a/src/Audio/MIDIPlayer.cpp ++++ b/src/Audio/MIDIPlayer.cpp +@@ -344,10 +344,6 @@ public: + fs_initialised_ = false; + file_ = ""; + +- // Set fluidsynth driver to alsa in linux (no idea why it defaults to jack) +- if (app::platform() == app::Platform::Linux && fs_driver.value.empty()) +- fs_driver = "alsa"; +- + // Init soundfont path + if (fs_soundfont_path.value.empty()) + { +-- +2.30.0 + |