Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ports: Replace SDL2 with sdl2-compat

Browse Source 
There is no need to keep two SDL versions around
This commit is contained in:
Bananymous
2026-07-05 00:05:51 +03:00
parent 380b172968
commit c7eb2dbdf3
22 changed files with 155 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/SuperTux/build.sh
View File

@@ -4,7 +4,7 @@ NAME='SuperTux'
VERSION='0.6.3'
DOWNLOAD_URL="https://github.com/SuperTux/supertux/releases/download/v$VERSION/SuperTux-v$VERSION-Source.tar.gz#f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6"
TAR_CONTENT="SuperTux-v$VERSION-Source"
DEPENDENCIES=('boost' 'SDL2' 'SDL2_image' 'curl' 'openal-soft' 'libvorbis' 'freetype' 'physfs' 'glm')
DEPENDENCIES=('boost' 'sdl2-compat' 'SDL2_image' 'curl' 'openal-soft' 'libvorbis' 'freetype' 'physfs' 'glm')
configure() {
cmake --fresh -B build -S . -G Ninja \

42
ports/SuperTux/patches/0001-fix-cmake.patch
View File

@@ -1,6 +1,5 @@
diff -ruN SuperTux-0.6.3/CMakeLists.txt SuperTux-0.6.3-banan_os/CMakeLists.txt
--- SuperTux-0.6.3/CMakeLists.txt 2021-12-23 01:01:57.000000000 +0200
+++ SuperTux-0.6.3-banan_os/CMakeLists.txt 2025-11-02 20:57:03.725932455 +0200
--- SuperTux-0.6.3/CMakeLists.txt 2021-12-23 01:01:57.000000000 +0200
+++ SuperTux-0.6.3-x86_64/CMakeLists.txt 2026-07-04 22:00:48.125314950 +0300
@@ -171,7 +171,7 @@
else(ENABLE_BOOST_STATIC_LIBS)
set(Boost_USE_STATIC_LIBS FALSE)
@@ -18,35 +17,16 @@ diff -ruN SuperTux-0.6.3/CMakeLists.txt SuperTux-0.6.3-banan_os/CMakeLists.txt
-DINSTALL_INC_DIR=include
-DCMAKE_POSITION_INDEPENDENT_CODE=ON)
@@ -966,7 +967,7 @@
endif()
endif()
target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL_TTF_PREFIX}/include/SDL2)
-target_link_libraries(supertux2_lib PUBLIC SDL_ttf_lib)
+target_link_libraries(supertux2_lib PUBLIC libSDL2_ttf.a)
if(VCPKG_BUILD)
target_link_libraries(supertux2_lib PUBLIC freetype)
else()
@@ -977,9 +978,10 @@
target_link_libraries(supertux2_lib PUBLIC ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
endif()
@@ -1022,11 +1023,7 @@
-target_link_libraries(supertux2_lib PUBLIC squirrel_lib)
-target_link_libraries(supertux2_lib PUBLIC sqstdlib_lib)
-target_link_libraries(supertux2_lib PUBLIC tinygettext_lib)
+target_link_libraries(supertux2_lib PUBLIC libsquirrel_static.a)
+target_link_libraries(supertux2_lib PUBLIC libsqstdlib_static.a)
+target_link_libraries(supertux2_lib PUBLIC libtinygettext.a)
+
target_link_libraries(supertux2_lib PUBLIC sexp)
target_link_libraries(supertux2_lib PUBLIC savepng)
target_link_libraries(supertux2_lib PUBLIC partio_zip_lib)
@@ -1025,7 +1027,7 @@
if(VCPKG_BUILD)
target_link_libraries(supertux2_lib PUBLIC ${CURL_LIBRARIES})
else()
if(NOT EMSCRIPTEN)
if(HAVE_LIBCURL)
- if(VCPKG_BUILD)
- target_link_libraries(supertux2_lib PUBLIC ${CURL_LIBRARIES})
- else()
- target_link_libraries(supertux2_lib PUBLIC ${CURL_LIBRARY})
+ target_link_libraries(supertux2_lib PUBLIC ${CURL_LIBRARY} ssl crypto zstd z)
endif()
- endif()
+ target_link_libraries(supertux2_lib PUBLIC ${CURL_LIBRARIES})
endif(HAVE_LIBCURL)
endif(NOT EMSCRIPTEN)