From 1c8df72400a2ce40a47cb8899aed73afe6d76024 Mon Sep 17 00:00:00 2001 From: Michael Sartain Date: Wed, 4 Sep 2019 16:46:40 -0400 Subject: [PATCH] Linux SDL2: Rebuild sdl2 with alsa-lib-devel package installed (enable ALSA) Cherry Pick 8433316 from Dev-Rendering #jira UE-51823 #rb Brandon.Schaefer #fyi Arciel.Rekman #lockdown cristina.riveron [CL 8498898 by Michael Sartain in 4.23 branch] --- Engine/Build/Commit.gitdeps.xml | 36 +++++++++---------- .../SDL2/docker/docker-build-sdl2.sh | 13 ++++++- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/Engine/Build/Commit.gitdeps.xml b/Engine/Build/Commit.gitdeps.xml index 5bbdb39fb442..9e571500933d 100644 --- a/Engine/Build/Commit.gitdeps.xml +++ b/Engine/Build/Commit.gitdeps.xml @@ -41791,12 +41791,12 @@ - - - - - - + + + + + + @@ -54242,6 +54242,7 @@ + @@ -54604,7 +54605,6 @@ - @@ -55097,6 +55097,7 @@ + @@ -60198,7 +60199,6 @@ - @@ -66222,6 +66222,7 @@ + @@ -69547,7 +69548,6 @@ - @@ -75079,6 +75079,7 @@ + @@ -75494,7 +75495,6 @@ - @@ -78095,7 +78095,6 @@ - @@ -78388,6 +78387,7 @@ + @@ -82501,7 +82501,6 @@ - @@ -83955,6 +83954,7 @@ + @@ -87466,6 +87466,7 @@ + @@ -88632,7 +88633,6 @@ - @@ -89014,6 +89014,7 @@ + @@ -89171,7 +89172,6 @@ - @@ -89494,6 +89494,7 @@ + @@ -89580,6 +89581,7 @@ + @@ -89609,7 +89611,6 @@ - @@ -89828,7 +89829,6 @@ - @@ -89858,6 +89858,7 @@ + @@ -89899,7 +89900,6 @@ - @@ -90287,6 +90287,7 @@ + @@ -90525,7 +90526,6 @@ - diff --git a/Engine/Source/ThirdParty/SDL2/docker/docker-build-sdl2.sh b/Engine/Source/ThirdParty/SDL2/docker/docker-build-sdl2.sh index 85dbe3e1a264..3a7c6bd5eb1b 100755 --- a/Engine/Source/ThirdParty/SDL2/docker/docker-build-sdl2.sh +++ b/Engine/Source/ThirdParty/SDL2/docker/docker-build-sdl2.sh @@ -15,7 +15,7 @@ if [ $UID -eq 0 ]; then # Centos 7 yum install -y cmake make gcc-c++ - yum install -y libXcursor-devel libXinerama-devel libxi-dev libXrandr-devel libXScrnSaver-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel pulseaudio-libs-devel wayland-protocols-devel wayland-devel libxkbcommon-devel mesa-libwayland-egl-devel + yum install -y libXcursor-devel libXinerama-devel libxi-dev libXrandr-devel libXScrnSaver-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel pulseaudio-libs-devel wayland-protocols-devel wayland-devel libxkbcommon-devel mesa-libwayland-egl-devel alsa-lib-devel # Create non-privileged user and workspace adduser buildmaster @@ -31,6 +31,8 @@ fi export VULKAN_SDK=/Vulkan export SDL_DIR=/SDL-gui-backend +export ARCH=$(uname -m) + # Get num of cores export CORES=$(getconf _NPROCESSORS_ONLN) echo Using ${CORES} cores for building @@ -47,7 +49,16 @@ BuildWithOptions() mkdir -p $BuildDir pushd $BuildDir + # Building with OGL breaks SDL_CreateWindow() on embedded devices w/o proper GL libraries + # http://lists.libsdl.org/pipermail/commits-libsdl.org/2017-September/001967.html + if [[ ${ARCH} == 'aarch64' ]]; then + Options+=' -DVIDEO_OPENGL=OFF' + fi + + set -x cmake $Options ${SDL_DIR} + set +x + make -j${CORES} mv $StaticLibName ../$SdlLibName