From 208de3dae9ef8ca040d7a8363a92064df9db1592 Mon Sep 17 00:00:00 2001
From: loki <loki@fakeemail.com>
Date: Mon, 26 Apr 2021 20:36:54 +0200
Subject: [PATCH] Fix Linux build

---
 CMakeLists.txt |  9 +++++----
 README.md      | 15 ++-------------
 appveyor.yml   |  7 +++----
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18cd222f..1347b7d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,10 @@ if(WIN32)
 		ViGEmClient/include/ViGEm/Util.h
 		ViGEmClient/include/ViGEm/km/BusShared.h)
 
+	set(OPENSSL_LIBRARIES
+		libssl.a
+		libcrypto.a)
+
 	set(FFMPEG_INCLUDE_DIRS
 		${SUNSHINE_PREPARED_BINARIES}/include)
 	set(FFMPEG_LIBRARIES
@@ -114,6 +118,7 @@ else()
 	list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_linux.json")
 
 	find_package(X11 REQUIRED)
+	find_package(FFmpeg REQUIRED)
 	set(PLATFORM_TARGET_FILES
 		sunshine/platform/linux/display.cpp
 		sunshine/platform/linux/input.cpp)
@@ -209,10 +214,6 @@ if(NOT SUNSHINE_ASSETS_DIR)
 	set(SUNSHINE_ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 endif()
 
-set(OPENSSL_LIBRARIES
-	libssl.a
-	libcrypto.a)
-
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		${CMAKE_THREAD_LIBS_INIT}
 		stdc++fs
diff --git a/README.md b/README.md
index fc414370..3a1bac44 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,10 @@ sunshine needs access to uinput to create mouse and gamepad events:
 
 ### Requirements:
 
-	MSYS2 : mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-boost
+	mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make
 
 ### Compilation:
-- `git clone https://github.com/loki-47-6F-64/sunshine.git --recurse-submodules`
+- `git clone https://github.com/loki-47-6F-64/sunshine.git --recursive`
 - `cd sunshine && mkdir build && cd build`
 - `cmake -G"Unix Makefiles" ..`
 - `make`
@@ -61,17 +61,6 @@ sunshine needs access to uinput to create mouse and gamepad events:
 ### Setup:
 - **OPTIONAL** Gamepad support: Download and run 'ViGEmBus_Setup_1.16.116.exe' from [https://github.com/ViGEm/ViGEmBus/releases]
 
-### Static build
-#### Requirements:
-	MSYS2 : mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-boost git-lfs
-
-#### Compilation:
-- `git lfs install`
-- `git clone https://github.com/loki-47-6F-64/sunshine.git --recurse-submodules`
-- `cd sunshine && mkdir build && cd build`
-- `cmake -DSUNSHINE_STANDALONE=ON -G"Unix Makefiles" ..`
-- `make`
-
 
 
 # Common 
diff --git a/appveyor.yml b/appveyor.yml
index 1467c82f..4a11c494 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,16 +1,15 @@
 image:
-  - Ubuntu
+  - Ubuntu2004
   - Visual Studio 2019
 
 environment:
   matrix:
     - BUILD_TYPE: Debug
     - BUILD_TYPE: Release
-    - GCC_VERSION: 8
 
 install:
   - sh: sudo apt update
-  - sh: sudo apt install -y build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
+  - sh: sudo apt install -y build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
   - cmd: C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make"
 
 before_build:
@@ -22,7 +21,7 @@ build_script:
   - cmd: set OLDPATH=%PATH%
   - cmd: set PATH=C:\msys64\mingw64\bin
   - sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_EXECUTABLE_PATH=sunshine -DSUNSHINE_ASSETS_DIR=/etc/sunshine ..
-  - cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_STANDALONE=ON -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
+  - cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
   - sh: make -j$(nproc)
   - cmd: mingw32-make -j2
   - cmd: set PATH=%OLDPATH%