SDL2: update to 2.24.0 and clean up build options

release notes:
- https://github.com/libsdl-org/SDL/releases/tag/release-2.24.0
This commit is contained in:
Rudi Heitbaum 2022-08-19 21:12:54 +00:00
parent fc53520484
commit c7e59fb4cc

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="SDL2" PKG_NAME="SDL2"
PKG_VERSION="2.0.22" PKG_VERSION="2.24.0"
PKG_SHA256="fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e" PKG_SHA256="91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://www.libsdl.org/" PKG_SITE="https://www.libsdl.org/"
PKG_URL="https://www.libsdl.org/release/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_URL="https://www.libsdl.org/release/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@ -14,91 +14,88 @@ PKG_BUILD_FLAGS="+pic"
if [ "${TARGET_ARCH}" = "x86_64" ]; then if [ "${TARGET_ARCH}" = "x86_64" ]; then
PKG_DEPENDS_TARGET+=" nasm:host" PKG_DEPENDS_TARGET+=" nasm:host"
PKG_SDL2_X86ASM="-DASSEMBLY=ON" PKG_SDL2_X86ASM="-DSDL_ASSEMBLY=ON"
else else
# Only x86(-64) and ppc assembly present as of 2.0.8 # Only x86(-64) and ppc assembly present as of 2.0.8
PKG_SDL2_X86ASM="-DASSEMBLY=OFF" PKG_SDL2_X86ASM="-DSDL_ASSEMBLY=OFF"
fi fi
PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \ PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \
-DSDL_SHARED=OFF \ -DSDL_SHARED=OFF \
-DLIBC=ON \ -DSDL_LIBC=ON \
-DGCC_ATOMICS=ON \ -DSDL_GCC_ATOMICS=ON \
${PKG_SDL2_X86ASM} \ ${PKG_SDL2_X86ASM} \
-DALTIVEC=OFF \ -DSDL_ALTIVEC=OFF \
-DOSS=OFF \ -DSDL_OSS=OFF \
-DALSA=ON \ -DSDL_ALSA=ON \
-DALSA_SHARED=ON \ -DSDL_ALSA_SHARED=ON \
-DESD=OFF \ -DSDL_ESD=OFF \
-DESD_SHARED=OFF \ -DSDL_ESD_SHARED=OFF \
-DARTS=OFF \ -DSDL_ARTS=OFF \
-DARTS_SHARED=OFF \ -DSDL_ARTS_SHARED=OFF \
-DNAS=OFF \ -DSDL_NAS=OFF \
-DNAS_SHARED=ON \ -DSDL_NAS_SHARED=ON \
-DSNDIO=OFF \ -DSDL_SNDIO=OFF \
-DDISKAUDIO=OFF \ -DSDL_DISKAUDIO=OFF \
-DDUMMYAUDIO=OFF \ -DSDL_DUMMYAUDIO=OFF \
-DVIDEO_WAYLAND=OFF \ -DSDL_WAYLAND=OFF \
-DVIDEO_WAYLAND_QT_TOUCH=ON \ -DSDL_WAYLAND_QT_TOUCH=ON \
-DWAYLAND_SHARED=OFF \ -DSDL_WAYLAND_SHARED=OFF \
-DVIDEO_MIR=OFF \ -DSDL_COCOA=OFF \
-DMIR_SHARED=OFF \ -DSDL_DIRECTFB=OFF \
-DVIDEO_COCOA=OFF \ -DSDL_DIRECTFB_SHARED=OFF \
-DVIDEO_DIRECTFB=OFF \ -DSDL_FUSIONSOUND=OFF \
-DDIRECTFB_SHARED=OFF \ -DSDL_FUSIONSOUND_SHARED=OFF \
-DFUSIONSOUND=OFF \ -DSDL_DUMMYVIDEO=OFF \
-DFUSIONSOUND_SHARED=OFF \ -DSDL_PTHREADS=ON \
-DVIDEO_DUMMY=OFF \ -DSDL_PTHREADS_SEM=ON \
-DINPUT_TSLIB=OFF \ -DSDL_DIRECTX=OFF \
-DPTHREADS=ON \ -DSDL_LOADSO=ON \
-DPTHREADS_SEM=ON \ -DSDL_CLOCK_GETTIME=OFF \
-DDIRECTX=OFF \ -DSDL_RPATH=OFF \
-DSDL_DLOPEN=ON \ -DSDL_KMSDRM=OFF \
-DCLOCK_GETTIME=OFF \ -DSDL_RENDER_D3D=OFF"
-DRPATH=OFF \
-DVIDEO_KMSDRM=OFF \
-DRENDER_D3D=OFF"
if [ "${DISPLAYSERVER}" = "x11" ]; then if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" libX11 libXrandr" PKG_DEPENDS_TARGET+=" libX11 libXrandr"
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \
-DVIDEO_X11=ON \ -DSDL_X11=ON \
-DX11_SHARED=ON \ -DSDL_X11_SHARED=ON \
-DVIDEO_X11_XCURSOR=OFF \ -DSDL_X11_XCURSOR=OFF \
-DVIDEO_X11_XINERAMA=OFF \ -DSDL_X11_XINERAMA=OFF \
-DVIDEO_X11_XINPUT=OFF \ -DSDL_X11_XINPUT=OFF \
-DVIDEO_X11_XRANDR=ON \ -DSDL_X11_XRANDR=ON \
-DVIDEO_X11_XSCRNSAVER=OFF \ -DSDL_X11_XSCRNSAVER=OFF \
-DVIDEO_X11_XSHAPE=OFF \ -DSDL_X11_XSHAPE=OFF \
-DVIDEO_X11_XVM=OFF" -DSDL_X11_XVM=OFF"
else else
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \
-DVIDEO_X11=OFF" -DSDL_X11=OFF"
fi fi
if [ ! "${OPENGL}" = "no" ]; then if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL}" PKG_DEPENDS_TARGET+=" ${OPENGL}"
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \
-DVIDEO_OPENGL=ON \ -DSDL_OPENGL=ON \
-DVIDEO_OPENGLES=OFF" -DSDL_OPENGLES=OFF"
else else
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \
-DVIDEO_OPENGL=OFF \ -DSDL_OPENGL=OFF \
-DVIDEO_OPENGLES=ON" -DSDL_OPENGLES=ON"
fi fi
if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" pulseaudio" PKG_DEPENDS_TARGET+=" pulseaudio"
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \
-DPULSEAUDIO=ON \ -DSDL_PULSEAUDIO=ON \
-DPULSEAUDIO_SHARED=ON" -DSDL_PULSEAUDIO_SHARED=ON"
else else
PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \
-DPULSEAUDIO=OFF \ -DSDL_PULSEAUDIO=OFF \
-DPULSEAUDIO_SHARED=OFF" -DSDL_PULSEAUDIO_SHARED=OFF"
fi fi
post_makeinstall_target() { post_makeinstall_target() {