diff options
author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2023-04-09 12:17:06 +0200 |
---|---|---|
committer | Sam Atkins <atkinssj@gmail.com> | 2023-04-09 11:39:31 +0100 |
commit | 4107ae1dea5eb4f639df26d620d7479fe177adb5 (patch) | |
tree | 975234ab3394fb96ad595508718c74d1de12435a /Ports/fheroes2/patches | |
parent | 9f217222b719c40941a21d709c370db0f1f4483e (diff) | |
download | serenity-4107ae1dea5eb4f639df26d620d7479fe177adb5.zip |
Ports: Remove abandoned port 'fheroes2' which was never playable
Diffstat (limited to 'Ports/fheroes2/patches')
4 files changed, 0 insertions, 130 deletions
diff --git a/Ports/fheroes2/patches/0001-Include-endian.h-on-serenity-as-well.patch b/Ports/fheroes2/patches/0001-Include-endian.h-on-serenity-as-well.patch deleted file mode 100644 index 18326ee201..0000000000 --- a/Ports/fheroes2/patches/0001-Include-endian.h-on-serenity-as-well.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Manganiello <adamantike@users.noreply.github.com> -Date: Sun, 27 Mar 2022 12:52:11 -0300 -Subject: [PATCH] Include <endian.h> on serenity as well - ---- - src/engine/endian_h2.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/engine/endian_h2.h b/src/engine/endian_h2.h -index 7d1fa27..9144a91 100644 ---- a/src/engine/endian_h2.h -+++ b/src/engine/endian_h2.h -@@ -21,7 +21,7 @@ - #ifndef ENDIAN_H2_H - #define ENDIAN_H2_H - --#if defined( __linux__ ) -+#if defined( __linux__ ) || defined( __serenity__ ) - #include <endian.h> - - #elif defined( __FreeBSD__ ) || defined( __OpenBSD__ ) diff --git a/Ports/fheroes2/patches/0002-Use-pkg-config-for-SDL_-and-SDL2.patch b/Ports/fheroes2/patches/0002-Use-pkg-config-for-SDL_-and-SDL2.patch deleted file mode 100644 index 0915ed6221..0000000000 --- a/Ports/fheroes2/patches/0002-Use-pkg-config-for-SDL_-and-SDL2.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Manganiello <adamantike@users.noreply.github.com> -Date: Sun, 27 Mar 2022 12:52:11 -0300 -Subject: [PATCH] Use pkg-config for SDL_* and SDL2 - ---- - CMakeLists.txt | 9 ++++++--- - src/engine/CMakeLists.txt | 12 +++++++----- - 2 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8728264..ebed16e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,13 +26,16 @@ option(FHEROES2_STRICT_COMPILATION "Enable -Werror strict compilation" OFF) - # - # Library & feature detection - # --find_package(${USE_SDL_VERSION} REQUIRED) --find_package(${USE_SDL_VERSION}_mixer REQUIRED) -+INCLUDE(FindPkgConfig) -+ -+PKG_SEARCH_MODULE(${USE_SDL_VERSION} REQUIRED sdl2) -+PKG_SEARCH_MODULE(${USE_SDL_VERSION}MIXER REQUIRED SDL2_mixer) -+ - find_package(ZLIB REQUIRED) - find_package(Threads) - - if(ENABLE_IMAGE) -- find_package(${USE_SDL_VERSION}_image REQUIRED) -+ PKG_SEARCH_MODULE(${USE_SDL_VERSION}IMAGE REQUIRED SDL2_image) - find_package(PNG REQUIRED) - endif(ENABLE_IMAGE) - -diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt -index 8a1fbeb..b9df312 100644 ---- a/src/engine/CMakeLists.txt -+++ b/src/engine/CMakeLists.txt -@@ -5,19 +5,21 @@ target_compile_definitions(engine PRIVATE - $<$<BOOL:${ENABLE_IMAGE}>:FHEROES2_IMAGE_SUPPORT> - ) - target_include_directories(engine PUBLIC -- $<$<BOOL:${ENABLE_IMAGE}>:${${USE_SDL_VERSION}_IMAGE_INCLUDE_DIR}> -- ${${USE_SDL_VERSION}_MIXER_INCLUDE_DIR} -- ${${USE_SDL_VERSION}_INCLUDE_DIR} -+ $<$<BOOL:${ENABLE_IMAGE}>:${${USE_SDL_VERSION}_IMAGE_INCLUDE_DIRS}> -+ ${${USE_SDL_VERSION}_MIXER_INCLUDE_DIRS} -+ ${${USE_SDL_VERSION}_INCLUDE_DIRS} - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include> - ) - target_link_libraries(engine - smacker -- ${${USE_SDL_VERSION}MAIN_LIBRARY} -- ${${USE_SDL_VERSION}_LIBRARY} -+ ${${USE_SDL_VERSION}MAIN_LIBRARIES} -+ ${${USE_SDL_VERSION}_LIBRARIES} - ${${USE_SDL_VERSION}_MIXER_LIBRARIES} - $<$<BOOL:${ENABLE_IMAGE}>:${${USE_SDL_VERSION}_IMAGE_LIBRARIES}> - $<$<BOOL:${ENABLE_IMAGE}>:PNG::PNG> -+ $<$<BOOL:${ENABLE_IMAGE}>:-lSDL2_image> -+ -lSDL2_mixer - Threads::Threads # To match the build settings of the main app - ZLIB::ZLIB - ) diff --git a/Ports/fheroes2/patches/0003-Disable-SDL-s-accelerated-rendering.patch b/Ports/fheroes2/patches/0003-Disable-SDL-s-accelerated-rendering.patch deleted file mode 100644 index 017f433485..0000000000 --- a/Ports/fheroes2/patches/0003-Disable-SDL-s-accelerated-rendering.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Manganiello <adamantike@users.noreply.github.com> -Date: Sun, 27 Mar 2022 12:52:11 -0300 -Subject: [PATCH] Disable SDL's accelerated rendering - ---- - src/engine/screen.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/engine/screen.cpp b/src/engine/screen.cpp -index 9cd9ccb..f4fe315 100644 ---- a/src/engine/screen.cpp -+++ b/src/engine/screen.cpp -@@ -1005,10 +1005,10 @@ namespace - int renderFlags() const - { - if ( _isVSyncEnabled ) { -- return ( SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC ); -+ return ( SDL_RENDERER_SOFTWARE | SDL_RENDERER_PRESENTVSYNC ); - } - -- return SDL_RENDERER_ACCELERATED; -+ return SDL_RENDERER_SOFTWARE; - } - - void _createPalette() diff --git a/Ports/fheroes2/patches/ReadMe.md b/Ports/fheroes2/patches/ReadMe.md deleted file mode 100644 index f40b266b8d..0000000000 --- a/Ports/fheroes2/patches/ReadMe.md +++ /dev/null @@ -1,17 +0,0 @@ -# Patches for fheroes2 on SerenityOS - -## `0001-Include-endian.h-on-serenity-as-well.patch` - -Include <endian.h> on serenity as well - - -## `0002-Use-pkg-config-for-SDL_-and-SDL2.patch` - -Use pkg-config for SDL_* and SDL2 - - -## `0003-Disable-SDL-s-accelerated-rendering.patch` - -Disable SDL's accelerated rendering - - |