From a3b92a33480af76919e2d6a78d6462040ba45aa7 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Thu, 8 May 2025 20:58:40 +0000 Subject: [PATCH] build: update installdeps to SDL3 Signed-off-by: Rafael Kitover --- installdeps | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/installdeps b/installdeps index 0d42d32f..431a3a5a 100755 --- a/installdeps +++ b/installdeps @@ -191,7 +191,7 @@ freebsd_installdeps() { check sudo pkg update - pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl2 wx31-gtk3 iconv zip ninja" + pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl3 wx31-gtk3 iconv zip ninja" [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg" @@ -320,8 +320,6 @@ debian_installdeps() { glew_lib=$(apt-cache search libglew | grep '^libglew[0-9]' | sed 's/ - .*//' | sort -r | head -1) - sdl_lib=$(apt-cache search '^libsdl2-2.0' | sed 's/ - .*//' | sort -r | head -1) - # not present in trusty if [ -n "$ENABLE_FFMPEG" ]; then libswresample_dev=$(apt-cache search libswresample-dev | awk '{print $1}') @@ -344,7 +342,7 @@ debian_installdeps() { ;; esac - pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl2-dev $sdl_lib libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build libopenal-dev" + pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl3-dev libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build libopenal-dev" [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs libavcodec-dev libavformat-dev libswscale-dev libavutil-dev $libswresample_dev" @@ -395,7 +393,7 @@ debian_installdeps() { fi fi - deps="gcc zlib ffmpeg gettext sdl2 openal wxwidgets openal" + deps="gcc zlib ffmpeg gettext sdl3 openal wxwidgets openal" [ -n "$ENABLE_FFMPEG" ] && deps="$deps ffmpeg" set -- @@ -492,7 +490,7 @@ fedora_installdeps() { # this is sometimes necessary for rawhide set -- --exclude='glibc32*' fi - for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel openal-soft-devel wxGTK-devel gtk3-devel; do + for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL3-devel openal-soft-devel wxGTK-devel gtk3-devel; do case $pkg in *ffmpeg*) [ -z "$ENABLE_FFMPEG" ] && continue @@ -585,7 +583,7 @@ fedora_installdeps() { ;; esac # install static deps - for pkg in zlib gettext SDL2 wxWidgets3 openal-soft; do + for pkg in zlib gettext SDL3 wxWidgets3 openal-soft; do set -- "$@" "${target}-${pkg}-static" done @@ -676,7 +674,7 @@ rhel_installdeps() { set -- --exclude='glibc32*' fi - for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel openal-soft-devel wxGTK3-devel gtk3-devel; do + for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL3-devel openal-soft-devel wxGTK3-devel gtk3-devel; do case $pkg in *ffmpeg*) [ -z "$ENABLE_FFMPEG" ] && continue @@ -761,7 +759,7 @@ rhel_installdeps() { ;; esac # install static deps - for pkg in zlib gettext SDL2 wxWidgets openal-soft; do + for pkg in zlib gettext SDL3 wxWidgets openal-soft; do set -- "$@" "${target}-${pkg}-static" done @@ -787,7 +785,7 @@ suse_installdeps() { tools="make cmake ccache nasm gettext-tools pkg-config ccache zip ninja" - libs="gcc gcc-c++ libSDL2-devel wxGTK3-3_2-devel openal-soft-devel ffmpeg-7-libavcodec-devel ffmpeg-7-libavdevice-devel ffmpeg-7-libavfilter-devel ffmpeg-7-libavformat-devel ffmpeg-7-libavutil-devel ffmpeg-7-libpostproc-devel ffmpeg-7-libswresample-devel ffmpeg-7-libswscale-devel" + libs="gcc gcc-c++ libSDL3-devel wxGTK3-3_2-devel openal-soft-devel ffmpeg-7-libavcodec-devel ffmpeg-7-libavdevice-devel ffmpeg-7-libavfilter-devel ffmpeg-7-libavformat-devel ffmpeg-7-libavutil-devel ffmpeg-7-libpostproc-devel ffmpeg-7-libswresample-devel ffmpeg-7-libswscale-devel" if [ "$target" = m32 ]; then error '32 bit cross builds are no longer supported on OpenSUSE' @@ -854,7 +852,7 @@ archlinux_installdeps() { $pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic - libs="zlib mesa gettext sdl2 wxgtk3 $gtk openal" + libs="zlib mesa gettext sdl3 wxgtk3 $gtk openal" [ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg" @@ -950,7 +948,7 @@ EOF fi done - deps="zlib gettext pkg-config sdl2 wxmsw openal" + deps="zlib gettext pkg-config sdl3 wxmsw openal" # and the actual deps for p in $deps; do @@ -979,7 +977,7 @@ solus_installdeps() { check sudo eopkg -y install -c system.devel check sudo eopkg -y install git ccache ninja - set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel openal-soft-devel + set -- sdl3-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel openal-soft-devel if [ -n "$amd64" -a "$target" = m32 ]; then info_msg 'Calculating dependencies, this will take a while..' @@ -1052,7 +1050,7 @@ gentoo_installdeps() { dev-build/cmake \ dev-util/ccache \ sys-devel/binutils \ - media-libs/libsdl2 \ + media-libs/libsdl3 \ media-libs/openal \ x11-libs/wxGTK:$wx_slot \ sys-libs/zlib \ @@ -1070,7 +1068,7 @@ gentoo_installdeps() { alpine_installdeps() { installing - check sudo apk add cmake ninja g++ ccache nasm gettext-dev zlib-dev mesa-dev sdl2-dev glu-dev wxwidgets-dev gtk+3.0-dev zip + check sudo apk add cmake ninja g++ ccache nasm gettext-dev zlib-dev mesa-dev sdl3-dev glu-dev wxwidgets-dev gtk+3.0-dev zip build_instructions } @@ -1105,7 +1103,7 @@ windows_installdeps() { ;; esac - pkgs="$pkgs SDL2 wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache openal" + pkgs="$pkgs SDL3 wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache openal" case "$target" in *x86_64) @@ -1177,7 +1175,7 @@ brew_installdeps() { check brew -v update - brews="nasm cmake ccache gettext libtiff pkg-config sdl2 wxwidgets faudio ccache ninja zlib" + brews="nasm cmake ccache gettext libtiff pkg-config sdl3 wxwidgets faudio ccache ninja zlib" [ -n "$ENABLE_FFMPEG" ] && brews="$brews ffmpeg" @@ -1203,7 +1201,7 @@ macports_installdeps() { check sudo port -v selfupdate - ports="cmake ccache nasm gettext pkgconfig libsdl2 wxWidgets-3.0 libiconv ninja" + ports="cmake ccache nasm gettext pkgconfig libsdl3 wxWidgets-3.0 libiconv ninja" [ -n "$ENABLE_FFMPEG" ] && ports="$ports ffmpeg" @@ -1219,7 +1217,7 @@ fink_installdeps() { check sudo fink -vy selfupdate - pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev ccache ninja" + pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl3 wxwidgets300-osxcocoa libiconv-dev ccache ninja" [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg" @@ -1244,4 +1242,4 @@ EOF main "$@" -# vim:et sw=4: \ No newline at end of file +# vim:et sw=4: