From f173b3ff0957086bf950a3a72270445850ac2d35 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 31 Jan 2021 14:48:42 -0600
Subject: [PATCH] Attempt to fix AppImage and Steam Link build errors

---
 app/streaming/video/ffmpeg-renderers/drm.cpp |  4 ++++
 appveyor.yml                                 |  2 +-
 scripts/build-steamlink-app.sh               | 13 +++----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/streaming/video/ffmpeg-renderers/drm.cpp b/app/streaming/video/ffmpeg-renderers/drm.cpp
index fb70a613..d6799458 100644
--- a/app/streaming/video/ffmpeg-renderers/drm.cpp
+++ b/app/streaming/video/ffmpeg-renderers/drm.cpp
@@ -20,6 +20,10 @@ extern "C" {
 
 #include <SDL_syswm.h>
 
+#ifndef SDL_VIDEO_DRIVER_KMSDRM
+#error DRM renderer requires SDL built with --enable-video-kmsdrm
+#endif
+
 DrmRenderer::DrmRenderer()
     : m_HwContext(nullptr),
       m_DrmFd(-1),
diff --git a/appveyor.yml b/appveyor.yml
index 08f70b37..02129b02 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ install:
   - sh: '[ "$BUILD_TARGET" != linux ] || sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial'
   - sh: '[ "$BUILD_TARGET" != linux ] || sudo apt update'
   - sh: '[ "$BUILD_TARGET" != linux ] || sudo apt install -y qt514base qt514quickcontrols2 qt514svg qt514wayland nasm libgbm-dev libdrm-dev libfreetype6-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev wayland-protocols libopus-dev libvdpau-dev'
-  - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export SDL2_VER=d75deb75464a && hg clone https://hg.libsdl.org/SDL SDL2 && cd SDL2 && hg update -r $SDL2_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi'
+  - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export SDL2_VER=d75deb75464a && hg clone https://hg.libsdl.org/SDL SDL2 && cd SDL2 && hg update -r $SDL2_VER && ./configure --enable-video-kmsdrm && make -j$(nproc) && sudo make install && cd ..; fi'
   - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export SDL2_TTF_VER=2.0.15 && wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$SDL2_TTF_VER.tar.gz && tar -xvf SDL2_ttf-$SDL2_TTF_VER.tar.gz && cd SDL2_ttf-$SDL2_TTF_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi'
   - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export LIBVA_VER=2.10.0 && wget https://github.com/intel/libva/releases/download/$LIBVA_VER/libva-$LIBVA_VER.tar.bz2 && tar -xvf libva-$LIBVA_VER.tar.bz2 && cd libva-$LIBVA_VER && ./configure && make -j$(nproc) && sudo make install && cd ..; fi'
   - sh: 'if [[ "$BUILD_TARGET" = linux ]]; then export NVHDR_VER=8.1.24.12 && wget https://github.com/FFmpeg/nv-codec-headers/releases/download/n$NVHDR_VER/nv-codec-headers-$NVHDR_VER.tar.gz && tar -xvf nv-codec-headers-$NVHDR_VER.tar.gz && cd nv-codec-headers-$NVHDR_VER && sudo make install && cd ..; fi'
diff --git a/scripts/build-steamlink-app.sh b/scripts/build-steamlink-app.sh
index fcc1a3e7..4f4060f8 100755
--- a/scripts/build-steamlink-app.sh
+++ b/scripts/build-steamlink-app.sh
@@ -27,22 +27,15 @@ mkdir $BUILD_FOLDER
 mkdir $DEPLOY_FOLDER
 mkdir $INSTALLER_FOLDER
 
-echo Switching to Qt 5.14 SDK
-pushd $STEAMLINK_SDK_PATH
-git clean -f -d -x
-git reset --hard
-git checkout $QT_514_COMMIT || fail "Unable to checkout $QT_514_COMMIT"
-popd
-
-echo Initializing Steam Link SDK for Qt 5.14
+echo Initializing Steam Link SDK
 source $STEAMLINK_SDK_PATH/setenv.sh || fail "SL SDK initialization failed!"
 
-echo Configuring the project for Qt 5.14
+echo Configuring the project
 pushd $BUILD_FOLDER
 qmake $SOURCE_ROOT/moonlight-qt.pro QMAKE_CFLAGS_ISYSTEM= || fail "Qmake failed!"
 popd
 
-echo Compiling Moonlight for Qt 5.14 in $BUILD_CONFIG configuration
+echo Compiling Moonlight in $BUILD_CONFIG configuration
 pushd $BUILD_FOLDER
 make -j$(nproc) $(echo "$BUILD_CONFIG" | tr '[:upper:]' '[:lower:]') || fail "Make failed!"
 popd