Merge remote-tracking branch 'origin/master'

packaging/linux/Arch/PKGBUILD

@@ -23,7 +23,6 @@ depends=(
   'libnotify'
   'libpulse'
   'libva'
-  'libvdpau'
   'libx11'
   'libxcb'
   'libxfixes'

packaging/linux/fedora/Sunshine.spec

@@ -27,7 +27,6 @@ BuildRequires: libevdev-devel
 BuildRequires: libgudev
 BuildRequires: libnotify-devel
 BuildRequires: libva-devel
-BuildRequires: libvdpau-devel
 BuildRequires: libX11-devel
 BuildRequires: libxcb-devel
 BuildRequires: libXcursor-devel
@@ -66,7 +65,6 @@ Requires: libdrm > 2.4.97
 Requires: libevdev >= 1.5.6
 Requires: libopusenc >= 0.2.1
 Requires: libva >= 2.14.0
-Requires: libvdpau >= 1.5
 Requires: libwayland-client >= 1.20.0
 Requires: libX11 >= 1.7.3.1
 Requires: miniupnpc >= 2.2.4

packaging/linux/flatpak/dev.lizardbyte.app.Sunshine.metainfo.xml

@@ -32,7 +32,7 @@
     <p>flatpak run --command=additional-install.sh @PROJECT_FQDN@</p>
     <p>NOTE: Sunshine uses a self-signed certificate. The web browser will report it as not secure, but it is safe.</p>
     <p>NOTE: KMS Grab (Optional)</p>
-    <p>sudo -i PULSE_SERVER=unix:$(pactl info | awk '/Server String/{print$3}') flatpak run @PROJECT_FQDN@</p>
+    <p>sudo -i PULSE_SERVER=unix:/run/user/$(id -u $whoami)/pulse/native flatpak run @PROJECT_FQDN@</p>
   </description>
 
   <releases>

packaging/linux/flatpak/dev.lizardbyte.app.Sunshine.yml

@@ -33,13 +33,13 @@ modules:
   - "modules/xvfb/xvfb.json"
 
   # Runtime dependencies
-  - shared-modules/libappindicator/libappindicator-gtk3-12.10.json
+  - shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json
   - "modules/avahi.json"
   - "modules/boost.json"
   - "modules/libevdev.json"
   - "modules/libnotify.json"
   - "modules/miniupnpc.json"
-  - "modules/numactl.json"  # TODO: is this still needed?
+  - "modules/numactl.json"
 
   # Caching is configured until here, not including CUDA, since it is too large for GitHub cache
   - "modules/cuda.json"

packaging/sunshine.rb

@@ -23,8 +23,8 @@ class @PROJECT_NAME@ < Formula
   end
 
   option "with-docs", "Enable docs"
-  option "with-dynamic-boost", "Dynamically link Boost libraries"
-  option "without-dynamic-boost", "Statically link Boost libraries" # default option
+  option "with-static-boost", "Enable static link of Boost libraries"
+  option "without-static-boost", "Disable static link of Boost libraries" # default option
 
   depends_on "cmake" => :build
   depends_on "doxygen" => :build
@@ -35,6 +35,7 @@ class @PROJECT_NAME@ < Formula
   depends_on "miniupnpc"
   depends_on "openssl"
   depends_on "opus"
+  depends_on "boost" => :recommended
   depends_on "icu4c" => :recommended
 
   on_linux do
@@ -43,7 +44,6 @@ class @PROJECT_NAME@ < Formula
     depends_on "libdrm"
     depends_on "libnotify"
     depends_on "libva"
-    depends_on "libvdpau"
     depends_on "libx11"
     depends_on "libxcb"
     depends_on "libxcursor"
@@ -84,14 +84,17 @@ class @PROJECT_NAME@ < Formula
       args << "-DBUILD_DOCS=OFF"
     end
 
-    if build.without? "dynamic-boost"
+    if build.without? "static-boost"
+      args << "-DBOOST_USE_STATIC=OFF"
+      ohai "Disabled statically linking Boost libraries"
+    else
       args << "-DBOOST_USE_STATIC=ON"
-      ohai "Statically linking Boost libraries"
+      ohai "Enabled statically linking Boost libraries"
 
       unless Formula["icu4c"].any_version_installed?
         odie <<~EOS
           icu4c must be installed to link against static Boost libraries,
-          either install icu4c or use brew install sunshine --with-dynamic-boost instead
+          either install icu4c or use brew install sunshine --with-static-boost instead
         EOS
       end
       ENV.append "CXXFLAGS", "-I#{Formula["icu4c"].opt_include}"
@@ -99,11 +102,10 @@ class @PROJECT_NAME@ < Formula
       ENV.append "LDFLAGS", "-L#{icu4c_lib_path}"
       ENV["LIBRARY_PATH"] = icu4c_lib_path
       ohai "Linking against ICU libraries at: #{icu4c_lib_path}"
-    else
-      args << "-DBOOST_USE_STATIC=OFF"
-      ohai "Dynamically linking Boost libraries"
     end
 
+    args << "-DCUDA_FAIL_ON_MISSING=OFF" if OS.linux?
+
     system "cmake", "-S", ".", "-B", "build", *std_cmake_args, *args
 
     cd "build" do