diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-12-04 01:04:52 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-12-04 01:30:07 +0000 |
| commit | 842c49101f58021b9354b0f92b70705a272a3d6e (patch) | |
| tree | 43d2a78ffe166fb5d4be9dad202ccae1564b3dbc | |
| parent | d262cc5c0f9168fc07f9c844600ec06d8330a21e (diff) | |
| download | packages-842c49101f58021b9354b0f92b70705a272a3d6e.tar.gz packages-842c49101f58021b9354b0f92b70705a272a3d6e.tar.bz2 packages-842c49101f58021b9354b0f92b70705a272a3d6e.tar.xz packages-842c49101f58021b9354b0f92b70705a272a3d6e.zip | |
user/supertux: Fix SDL2 detection on 32-bit CPUs
No clue why they were special-casing detection like this.
Fixes: #870
| -rw-r--r-- | user/supertux/APKBUILD | 4 | ||||
| -rw-r--r-- | user/supertux/cmake32.patch | 22 |
2 files changed, 25 insertions, 1 deletions
diff --git a/user/supertux/APKBUILD b/user/supertux/APKBUILD index 9247e8200..f1518855d 100644 --- a/user/supertux/APKBUILD +++ b/user/supertux/APKBUILD @@ -14,6 +14,7 @@ makedepends="boost-dev cmake curl-dev glew-dev libogg-dev libvorbis-dev zlib-dev subpackages="$pkgname-doc" source="https://github.com/SuperTux/supertux/releases/download/v$pkgver/SuperTux-v$pkgver-Source.tar.gz find-sdl2.patch + cmake32.patch " builddir="$srcdir"/SuperTux-v$pkgver-Source @@ -41,4 +42,5 @@ package() { } sha512sums="c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798 SuperTux-v0.6.3-Source.tar.gz -9e229d837d8006d618320ef3f7465ef88f8903853ed1ef3e291373d25f8542010f7dad6c1c5859e857db48e1447337ddbed0619228f5eac6aba916b69567fd94 find-sdl2.patch" +9e229d837d8006d618320ef3f7465ef88f8903853ed1ef3e291373d25f8542010f7dad6c1c5859e857db48e1447337ddbed0619228f5eac6aba916b69567fd94 find-sdl2.patch +c0e6cdd52e07e04ef67edc8b7f3d3c37dd2ffd35381b704b43512a01bbd0a5a35fbeae7ec225be8e4643dbcaac3eae427d7ea5217dc1e676f2991ee46f5bf513 cmake32.patch" diff --git a/user/supertux/cmake32.patch b/user/supertux/cmake32.patch new file mode 100644 index 000000000..bc31de62c --- /dev/null +++ b/user/supertux/cmake32.patch @@ -0,0 +1,22 @@ +There is no reason to special-case finding SDL2 for 32-bit, and it doesn't +work effectively anyway. + +--- SuperTux-v0.6.3-Source/CMakeLists.txt.old 2021-12-22 23:01:57.000000000 +0000 ++++ SuperTux-v0.6.3-Source/CMakeLists.txt 2022-12-04 00:59:27.057071029 +0000 +@@ -232,16 +232,6 @@ + find_library(SDL2_LIBRARIES SDL2) + find_library(SDL2IMAGE_LIBRARIES SDL2_image) + message(STATUS "SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIRS}") +- elseif (CMAKE_SIZEOF_VOID_P EQUAL 4) +- # 32-bit +- find_library(SDL2_LIBRARIES SDL2) +- find_library(SDL2IMAGE_LIBRARIES SDL2_image) +- find_path(SDL2_INCLUDE_DIRS SDL2/SDL.h) +- find_path(SDL2IMAGE_INCLUDE_DIRS SDL2/SDL_image.h) +- set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIRS}/SDL2) +- set(SDL2IMAGE_INCLUDE_DIRS ${SDL2IMAGE_INCLUDE_DIRS}/SDL2) +- message(STATUS "SDL LIBS: ${SDL2_LIBRARIES}") +- message(STATUS "SDL INCL: ${SDL2_INCLUDE_DIRS}") + else() + # 64-bit + include(FindPkgConfig) |