From 732a0025abd1e8954142b44862081bb7edd63de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Wed, 8 Feb 2023 21:49:35 +0000 Subject: [PATCH] SDL2: update to 2.26.3. --- srcpkgs/SDL2/template | 50 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 48f6e340889c..11c5686a076b 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,11 +1,11 @@ # Template file for 'SDL2' pkgname=SDL2 -version=2.26.2 +version=2.26.3 revision=1 -build_style=gnu-configure -configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev - --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared - --disable-alsa-shared --disable-pulseaudio-shared --enable-dbus" +build_style=cmake +configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF + -DSDL_CLOCK_GETTIME=ON -DSDL_PULSEAUDIO_SHARED=OFF + -DSDL_ALSA_SHARED=OFF -DSDL_DBUS=ON" hostmakedepends="pkg-config nasm" makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel libsamplerate-devel" @@ -15,7 +15,7 @@ license="Zlib" homepage="https://www.libsdl.org/" changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt" distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz" -checksum=95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 +checksum=c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 # Package build options build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11" @@ -34,24 +34,24 @@ esac # SDL_cpuinfo includes altivec.h, which breaks C++ programs with vector keyword case "$XBPS_TARGET_MACHINE" in - ppc*) configure_args+=" --disable-altivec";; + ppc*) configure_args+=" -DSDL_ALTIVEC=OFF";; *) ;; esac unset depends if [ "$build_option_gles" ]; then - configure_args+=" --enable-video-opengles" + configure_args+=" -DSDL_OPENGLES=ON" # libGLESv2.so.2 is dynamically loaded with dlopen. shlib_requires="libGLESv2.so.2" depends+=" virtual?libGLES" else - configure_args+=" --disable-video-opengles" + configure_args+=" -DSDL_OPENGLES=OFF" fi if [ "$build_option_rpi" ]; then # RaspberryPi, use Videocore IV - configure_args+=" --enable-video-opengles" + configure_args+=" -DSDL_OPENGLES=ON" makedepends+=" rpi-userland-devel" CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib" @@ -61,9 +61,9 @@ if [ "$build_option_opengl" ]; then # libGL.so.1 is dynamically loaded with dlopen. shlib_requires+=" libGL.so.1" depends+=" virtual?libGL" - configure_args+=" --enable-video-opengl" + configure_args+=" -DSDL_OPENGL=ON" else - configure_args+=" --disable-video-opengl" + configure_args+=" -DSDL_OPENGL=OFF" fi if [ "$build_option_opengl" -o "$build_option_gles" ]; then @@ -71,53 +71,51 @@ if [ "$build_option_opengl" -o "$build_option_gles" ]; then fi if [ "$build_option_pulseaudio" ]; then - configure_args+=" --enable-pulseaudio" + configure_args+=" -DSDL_PULSEAUDIO=ON" makedepends+=" pulseaudio-devel" else - configure_args+=" --disable-pulseaudio" + configure_args+=" -DSDL_PULSEAUDIO=OFF" fi if [ "$build_option_pipewire" ]; then - configure_args+=" --enable-pipewire" + configure_args+=" -DSDL_PIPEWIRE=ON" makedepends+=" pipewire-devel" else - configure_args+=" --disable-pipewire" + configure_args+=" -DSDL_PIPEWIRE=OFF" fi if [ "$build_option_sndio" ]; then - configure_args+=" --enable-sndio" + configure_args+=" -DSDL_SNDIO=ON" makedepends+=" sndio-devel" else - configure_args+=" --disable-sndio" + configure_args+=" -DSDL_SNDIO=OFF" fi if [ "$build_option_wayland" ]; then if [ -z "$build_option_gles" ]; then msg_error "$pkgname: wayland option requires gles.\n" fi - configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor" + configure_args+=" -DSDL_WAYLAND=ON -DSDL_WAYLAND_SHARED=OFF -DSDL_WAYLAND_LIBDECOR=ON" makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wayland-devel" fi else - configure_args+=" --disable-video-wayland" + configure_args+=" -DSDL_WAYLAND=OFF" fi if [ "$build_option_x11" ]; then - configure_args+=" --enable-video-x11-xcursor --enable-video-x11-xrandr - --enable-video-x11-xinput --enable-video-x11-scrnsaver - --enable-video-x11-xshape" + configure_args+=" -DSDL_X11=ON -DSDL_X11_SHARED=OFF" makedepends+=" libSM-devel libXcursor-devel libXScrnSaver-devel libXrandr-devel" else - configure_args+=" --without-x" + configure_args+=" -DSDL_X11=OFF" fi if [ "$build_option_vulkan" ]; then - configure_args+=" --enable-video-vulkan" + configure_args+=" -DSDL_VULKAN=ON" makedepends+=" Vulkan-Headers vulkan-loader" else - configure_args+=" --disable-video-vulkan" + configure_args+=" -DSDL_VULKAN=OFF" fi SDL2-devel_package() {