From 354c012a5eb6779d6e5a338e603161f98a7ce7d7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 Apr 2019 17:26:12 +0200 Subject: [PATCH] SDL2: enable gles/wayland build options on aarch64/x86/ppc. This way we can just set the envvar "SDL_VIDEODRIVER=wayland" to make this work with no changes. Tested on sway with neverball. --- srcpkgs/SDL2/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index bbbf295c51..3fdccef7fb 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.0.9 -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 @@ -17,14 +17,14 @@ distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz" checksum=255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1 # Package build options -build_options="gles opengl pulseaudio sndio wayland x11 vulkan" +build_options="gles opengl pulseaudio sndio vulkan wayland x11" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc*) - build_options_default="opengl pulseaudio x11 vulkan sndio" + build_options_default="gles opengl pulseaudio sndio vulkan wayland x11" ;; aarch64*) - build_options_default="gles opengl pulseaudio x11 sndio" + build_options_default="gles opengl pulseaudio sndio x11" ;; arm*) # Enable OpenGL/ES on rpi platforms @@ -50,7 +50,6 @@ if [ "$build_option_gles" ]; then *) # libGLESv2.so.2 is dynamically loaded with dlopen. shlib_requires="libGLESv2.so.2" - makedepends+=" glu-devel" depends="libGLES" ;; esac @@ -63,11 +62,14 @@ if [ "$build_option_opengl" ]; then shlib_requires="libGL.so.1" depends="libGL" configure_args+=" --enable-video-opengl" - makedepends+=" glu-devel" else configure_args+=" --disable-video-opengl" fi +if [ "$build_option_opengl" -o "$build_option_gles" ]; then + makedepends+=" glu-devel" +fi + if [ "$build_option_pulseaudio" ]; then configure_args+=" --enable-pulseaudio" makedepends+=" pulseaudio-devel" @@ -83,8 +85,8 @@ else fi if [ "$build_option_wayland" ]; then - if [ "$build_option_opengl" ]; then - msg_error "$pkgname: wayland option requires gles and not opengl.\n" + if [ -z "$build_option_gles" ]; then + msg_error "$pkgname: wayland option requires gles.\n" fi configure_args+=" --enable-video-wayland --disable-wayland-shared" makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"