From e24b55db8c4cc17f591301c3b20a8733fad2ea2d Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Mon, 16 May 2022 19:21:27 +0430 Subject: [PATCH] Ports: Update SDLPoP's patches to use git patches --- ...=> 0001-Disable-some-extra-features.patch} | 19 ++++++++++-- ...se-the-correct-include-paths-for-SDL.patch | 29 +++++++++++++++++ ...unsupported-scanf-format-specifiers.patch} | 15 +++++++++ .../patches/0004-Fix-SDL2-include-path.patch | 31 +++++++++++++++++++ Ports/SDLPoP/patches/ReadMe.md | 29 +++++++++++------ Ports/SDLPoP/patches/includes.patch | 14 --------- Ports/SDLPoP/patches/sdl-path.patch | 16 ---------- 7 files changed, 111 insertions(+), 42 deletions(-) rename Ports/SDLPoP/patches/{disable_extra_features.patch => 0001-Disable-some-extra-features.patch} (84%) create mode 100644 Ports/SDLPoP/patches/0002-Use-the-correct-include-paths-for-SDL.patch rename Ports/SDLPoP/patches/{remove_fscanf_unknwn_conversion_specfier.patch => 0003-Remove-some-unsupported-scanf-format-specifiers.patch} (72%) create mode 100644 Ports/SDLPoP/patches/0004-Fix-SDL2-include-path.patch delete mode 100644 Ports/SDLPoP/patches/includes.patch delete mode 100644 Ports/SDLPoP/patches/sdl-path.patch diff --git a/Ports/SDLPoP/patches/disable_extra_features.patch b/Ports/SDLPoP/patches/0001-Disable-some-extra-features.patch similarity index 84% rename from Ports/SDLPoP/patches/disable_extra_features.patch rename to Ports/SDLPoP/patches/0001-Disable-some-extra-features.patch index af976b3e87..06b3a11d2f 100644 --- a/Ports/SDLPoP/patches/disable_extra_features.patch +++ b/Ports/SDLPoP/patches/0001-Disable-some-extra-features.patch @@ -1,5 +1,15 @@ +From 79a5522062cf03b1f7dc878799c66389e689b1d5 Mon Sep 17 00:00:00 2001 +From: Manuel Palenzuela +Date: Sat, 3 Apr 2021 17:53:44 +0200 +Subject: [PATCH 1/4] Disable some extra features + +This just disables some extra features the game has such as screenshots, hardware acceleration, etc. +--- + src/config.h | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + diff --git a/src/config.h b/src/config.h -index b6bb168..5af0adf 100644 +index 698e7ed..0a935ee 100644 --- a/src/config.h +++ b/src/config.h @@ -35,7 +35,7 @@ The authors of this program may be contacted at https://forum.princed.org @@ -54,7 +64,7 @@ index b6bb168..5af0adf 100644 // Bugfixes: -@@ -250,11 +250,11 @@ The authors of this program may be contacted at https://forum.princed.org +@@ -277,11 +277,11 @@ The authors of this program may be contacted at https://forum.princed.org #define USE_LIGHTING // Enable screenshot features. @@ -68,7 +78,7 @@ index b6bb168..5af0adf 100644 #ifdef USE_TEXT // The menu won't work without text. -@@ -264,13 +264,13 @@ The authors of this program may be contacted at https://forum.princed.org +@@ -291,13 +291,13 @@ The authors of this program may be contacted at https://forum.princed.org #endif // Enable colored torches. A torch can be colored by changing its modifier in a level editor. @@ -85,3 +95,6 @@ index b6bb168..5af0adf 100644 // Speed up the sound during fast forward using resampling. // If disabled, the sound is sped up by clipping out parts from it. +-- +2.36.1 + diff --git a/Ports/SDLPoP/patches/0002-Use-the-correct-include-paths-for-SDL.patch b/Ports/SDLPoP/patches/0002-Use-the-correct-include-paths-for-SDL.patch new file mode 100644 index 0000000000..8aba2af58a --- /dev/null +++ b/Ports/SDLPoP/patches/0002-Use-the-correct-include-paths-for-SDL.patch @@ -0,0 +1,29 @@ +From d352df3380953ce7acb34aa26dc3b343853c32df Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner +Date: Mon, 19 Apr 2021 16:17:10 +0200 +Subject: [PATCH 2/4] Use the correct include paths for SDL + +The SDL port is installed into /usr/local, and its headers are +accessible as . +--- + src/types.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/types.h b/src/types.h +index 1f696d1..b5ede07 100644 +--- a/src/types.h ++++ b/src/types.h +@@ -31,8 +31,8 @@ The authors of this program may be contacted at https://forum.princed.org + // These headers for SDL seem to be the pkgconfig/meson standard as per the + // latest versions. If the old ones should be used, the ifdef must be used + // to compare versions. +-# include +-# include ++# include ++# include + //#endif + + #if SDL_BYTEORDER != SDL_LIL_ENDIAN +-- +2.36.1 + diff --git a/Ports/SDLPoP/patches/remove_fscanf_unknwn_conversion_specfier.patch b/Ports/SDLPoP/patches/0003-Remove-some-unsupported-scanf-format-specifiers.patch similarity index 72% rename from Ports/SDLPoP/patches/remove_fscanf_unknwn_conversion_specfier.patch rename to Ports/SDLPoP/patches/0003-Remove-some-unsupported-scanf-format-specifiers.patch index 9354d644fd..d0bfb3ed8f 100644 --- a/Ports/SDLPoP/patches/remove_fscanf_unknwn_conversion_specfier.patch +++ b/Ports/SDLPoP/patches/0003-Remove-some-unsupported-scanf-format-specifiers.patch @@ -1,3 +1,15 @@ +From 4776a79fcc39601e79b79909f1fa3c69a42d958c Mon Sep 17 00:00:00 2001 +From: Manuel Palenzuela +Date: Sat, 3 Apr 2021 17:53:44 +0200 +Subject: [PATCH 3/4] Remove some unsupported scanf format specifiers + +(Note that scanf has been rewritten since and probably supports these +modifiers now, so this patch might not be necessary) +--- + src/options.c | 6 +++--- + src/seg009.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + diff --git a/src/options.c b/src/options.c index 1bfe473..2bf173e 100644 --- a/src/options.c @@ -35,3 +47,6 @@ index 139c2d8..e2047fb 100644 perror(names_path); continue; } +-- +2.36.1 + diff --git a/Ports/SDLPoP/patches/0004-Fix-SDL2-include-path.patch b/Ports/SDLPoP/patches/0004-Fix-SDL2-include-path.patch new file mode 100644 index 0000000000..abb3e8f13e --- /dev/null +++ b/Ports/SDLPoP/patches/0004-Fix-SDL2-include-path.patch @@ -0,0 +1,31 @@ +From ddde9196a6a165ff06ac725c567f7e9aebe1d4a8 Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner +Date: Mon, 19 Apr 2021 16:17:10 +0200 +Subject: [PATCH 4/4] Fix SDL2 include path + +SDL2 headers are installed into /usr/local under SDL2, make it so +they're found. +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3558a6c..d074e48 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,10 +14,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${SDLPoP_SOURCE_DIR}/..") + + # On macOS, if you used Homebrew to install SDL2, the location may be something like this: + +-#set(SDL2 "/usr/local/Cellar/sdl2/2.0.5") ++set(SDL2 "/usr/local") + + if (NOT(WIN32) AND (DEFINED SDL2)) +- include_directories(${SDL2}/include) ++ include_directories(${SDL2}/include/SDL2) + link_directories(${SDL2}/lib) + endif() + +-- +2.36.1 + diff --git a/Ports/SDLPoP/patches/ReadMe.md b/Ports/SDLPoP/patches/ReadMe.md index 17fca39076..bd9f847c13 100644 --- a/Ports/SDLPoP/patches/ReadMe.md +++ b/Ports/SDLPoP/patches/ReadMe.md @@ -1,18 +1,29 @@ -# Patches for SDLPoP +# Patches for SDLPoP on SerenityOS -## `sdl-path.patch` +## `0001-Disable-some-extra-features.patch` -Use the correct path to refer to SDL (instead of a MacOS specific path) +Disable some extra features -## `includes.patch` +This just disables some extra features the game has such as screenshots, hardware acceleration, etc. -Use `SDL2/` paths for includes. +## `0002-Use-the-correct-include-paths-for-SDL.patch` -## `disable_extra_features.patch` +Use the correct include paths for SDL -Disables some (presumably) unsupported features. +The SDL port is installed into /usr/local, and its headers are +accessible as . -## `remove_fscanf_unknwn_conversion_specfier.patch` +## `0003-Remove-some-unsupported-scanf-format-specifiers.patch` -Removes some (presumably) unsupported scanf specifiers. +Remove some unsupported scanf format specifiers + +(Note that scanf has been rewritten since and probably supports these +modifiers now, so this patch might not be necessary) + +## `0004-Fix-SDL2-include-path.patch` + +Fix SDL2 include path + +SDL2 headers are installed into /usr/local under SDL2, make it so +they're found. diff --git a/Ports/SDLPoP/patches/includes.patch b/Ports/SDLPoP/patches/includes.patch deleted file mode 100644 index 7f1d6ed18f..0000000000 --- a/Ports/SDLPoP/patches/includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68/src/types.h SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68.serenity/src/types.h ---- SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68/src/types.h 2021-04-18 10:45:52.000000000 +0200 -+++ SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68.serenity/src/types.h 2021-04-19 16:09:34.732779363 +0200 -@@ -31,8 +31,8 @@ - // These headers for SDL seem to be the pkgconfig/meson standard as per the - // latest versions. If the old ones should be used, the ifdef must be used - // to compare versions. --# include --# include -+# include -+# include - //#endif - - #if SDL_BYTEORDER != SDL_LIL_ENDIAN diff --git a/Ports/SDLPoP/patches/sdl-path.patch b/Ports/SDLPoP/patches/sdl-path.patch deleted file mode 100644 index 14fdb2390d..0000000000 --- a/Ports/SDLPoP/patches/sdl-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68/src/CMakeLists.txt SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68.serenity/src/CMakeLists.txt ---- SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68/src/CMakeLists.txt 2021-04-19 15:57:54.748801218 +0200 -+++ SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68.serenity/src/CMakeLists.txt 2021-04-19 15:59:47.581060085 +0200 -@@ -14,10 +14,10 @@ - - # On macOS, if you used Homebrew to install SDL2, the location may be something like this: - --#set(SDL2 "/usr/local/Cellar/sdl2/2.0.5") -+set(SDL2 "/usr/local") - - if (NOT(WIN32) AND (DEFINED SDL2)) -- include_directories(${SDL2}/include) -+ include_directories(${SDL2}/include/SDL2) - link_directories(${SDL2}/lib) - endif() -