From 23ab38c82c824292aabc801eafd852df28ca8030 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 14 Jan 2020 04:07:23 +0100 Subject: [PATCH] SDL2: unify build options on all archs, don't enable rpi for arm* --- srcpkgs/SDL2/template | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 8d9aa05cfd6..4c8172aa3f4 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.0.10 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared @@ -18,17 +18,11 @@ checksum=b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 # Package build options build_options="gles opengl pulseaudio sndio vulkan wayland x11" +build_options_default="gles opengl pulseaudio sndio vulkan wayland x11" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*|ppc*) - build_options_default="gles opengl pulseaudio sndio vulkan wayland x11" - ;; - aarch64*) - build_options_default="gles opengl pulseaudio sndio x11" - ;; arm*) build_options+=" rpi" - build_options_default="rpi pulseaudio sndio x11" ;; esac @@ -42,7 +36,6 @@ if [ "$build_option_gles" ]; then configure_args+=" --enable-video-opengles" # libGLESv2.so.2 is dynamically loaded with dlopen. shlib_requires="libGLESv2.so.2" - depends+=" libGLES" else configure_args+=" --disable-video-opengles" fi @@ -58,7 +51,6 @@ fi if [ "$build_option_opengl" ]; then # libGL.so.1 is dynamically loaded with dlopen. shlib_requires+=" libGL.so.1" - depends+=" libGL" configure_args+=" --enable-video-opengl" else configure_args+=" --disable-video-opengl"