LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-25 20:22:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ports: Fix SDLPoP

Browse Source 
This port was still using the upstream's master branch as opposed to
a fixed git commit.

Also, now that SDL2 is installed into /usr/local the build failed.

I have also removed an obsolete patch because we're now linking
against shared libraries for SDL2 and those already have appropriate
library dependencies.
This commit is contained in:
Gunnar Beutner 2021-04-19 16:17:10 +02:00 committed by Andreas Kling
parent 6f5e92a279
commit 253c1aa644
Notes: sideshowbarker 2024-07-18 19:23:40 +09:00 
Author: https://github.com/gunnarbeutner
Commit: https://github.com/SerenityOS/serenity/commit/253c1aa6446
Pull-request: https://github.com/SerenityOS/serenity/pull/6488
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ports/SDLPoP/package.sh
View File

@ -3,17 +3,17 @@ port=PrinceOfPersia
useconfigure=true
version=git
depends="SDL2 SDL2_image"
workdir=SDLPoP-master
workdir=SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68
configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://github.com/NagyD/SDLPoP/archive/refs/heads/master.zip PoP.zip c75184eb2a7e8c9ed008ffae371ec178"
auth_type=md5
files="https://github.com/NagyD/SDLPoP/archive/86988c668eeaa10f218e1d4938fc5b4e42314d68.zip PoP.zip d18cae8541fb8cbcc374fd998316993d561429a83f92061bc0754337ada774c5"
auth_type=sha256
install_location="Root/opt/PrinceOfPersia"
configure() {
run cmake $configopts src/.
run cmake $configopts ./src
}
install() {
run mkdir -p "${SERENITY_BUILD_DIR}/${install_location}"
mkdir -p "${SERENITY_BUILD_DIR}/${install_location}"
run cp -r prince data SDLPoP.ini "${SERENITY_BUILD_DIR}/${install_location}"
}

14
Ports/SDLPoP/patches/includes.patch Normal file
View File

@ -0,0 +1,14 @@
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 <SDL.h>
-# include <SDL_image.h>
+# include <SDL2/SDL.h>
+# include <SDL2/SDL_image.h>
//#endif
#if SDL_BYTEORDER != SDL_LIL_ENDIAN

11
Ports/SDLPoP/patches/link_against_serenity_libs.patch
View File

@ -1,11 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3558a6c..2092651 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,5 +118,5 @@ if(WIN32)
elseif(APPLE)
target_link_libraries(prince SDL2main SDL2 SDL2_image m)
else() # Linux, *BSD, etc.
- target_link_libraries(prince SDL2 SDL2_image m)
+ target_link_libraries(prince SDL2 SDL2_image -lm -lpng -ljpeg -lz -lgui -lcore -lipc -lgfx -lpthread)
endif()

16
Ports/SDLPoP/patches/sdl-path.patch Normal file
View File

@ -0,0 +1,16 @@
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()