Merge remote-tracking branch 'origin/master'

packaging/linux/Arch/PKGBUILD

@@ -39,9 +39,7 @@ depends=(
 makedepends=(
   'cmake'
   'cuda'
-  'doxygen'
   "gcc${_gcc_version}"
-  'graphviz'
   'git'
   'make'
   'nodejs'
@@ -80,6 +78,7 @@ build() {
         -S "$pkgname" \
         -B build \
         -Wno-dev \
+        -D BUILD_DOCS=OFF \
         -D BUILD_WERROR=ON \
         -D CMAKE_INSTALL_PREFIX=/usr \
         -D SUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \

packaging/linux/fedora/Sunshine.spec

@@ -9,8 +9,8 @@
 
 Name: Sunshine
 Version: %{build_version}
-Summary: Self-hosted game stream host for Moonlight.
 Release: 1%{?dist}
+Summary: Self-hosted game stream host for Moonlight.
 License: GPLv3-only
 URL: https://github.com/LizardByte/Sunshine
 Source0: tarball.tar.gz

packaging/linux/fedora/copr-build.sh

@@ -1,62 +0,0 @@
-#! /bin/sh -x
-
-# This file is not used directly in this repository. It should be uploaded to Copr whenever the file changes.
-# Replicate to each package in "pulls", "beta", and "stable" Copr repositories
-
-set -e
-resultdir="${COPR_RESULTDIR}"
-git clone "https://github.com/${COPR_OWNER}/${COPR_PACKAGE}.git" --depth 1
-cd "${COPR_PACKAGE}"
-
-# optional part; drop if building against 'master' is enough
-if test -z "$REVISION"; then
-  # the hook_payload file contains webhook JSON payload (copr creates it for
-  # us); it is created only if the build is triggered by Custom webhook.
-  if test -f "$resultdir"/hook_payload; then
-    git clone https://github.com/praiskup/copr-ci-tooling \
-      "$resultdir/cct" --depth 1
-    export PATH="$resultdir/cct:$PATH"
-
-    echo "---"
-    cat "$resultdir"/hook_payload
-    echo "---"
-
-    # use jq to get the pr_id from the hook_payload
-    PR=$(jq -r '.pr_id' "$resultdir"/hook_payload)
-    if [ -z "$PR" ]; then
-      BRANCH="master"
-    else
-      BRANCH="pr/${PR}"
-    fi
-
-    copr-travis-checkout "$resultdir"/hook_payload
-  fi
-else
-  git checkout "$REVISION"
-fi
-
-# initialize the submodules
-git submodule update --init --recursive
-
-# get the tag of this commit IF it has one
-TAG=$(git tag --points-at HEAD | head -n1)
-if [ -z "$TAG" ]; then
-  TAG="0.0.$PR"
-fi
-TAG=$(echo "$TAG" | sed 's/^v//')  # remove v prefix from the tag
-echo "TAG=$TAG"
-
-# get the commit
-COMMIT=$(git rev-parse HEAD)
-echo "COMMIT=$COMMIT"
-
-# move spec file to the correct location
-mv packaging/linux/fedora/*.spec "${resultdir}"
-
-# use sed to replace these values in the spec file
-sed -i "s|%global build_version 0|%global build_version ${TAG}|" "${resultdir}"/*.spec
-sed -i "s|%global branch 0|%global branch ${BRANCH}|" "${resultdir}"/*.spec
-sed -i "s|%global commit 0|%global commit ${COMMIT}|" "${resultdir}"/*.spec
-
-# create a tarball of the source code
-tar -czf "${resultdir}/tarball.tar.gz" .

packaging/sunshine.rb

@@ -22,7 +22,7 @@ class @PROJECT_NAME@ < Formula
     end
   end
 
-  option "with-docs-off", "Disable docs"
+  option "with-docs", "Enable docs"
   option "with-dynamic-boost", "Dynamically link Boost libraries"
   option "without-dynamic-boost", "Statically link Boost libraries" # default option
 
@@ -76,12 +76,12 @@ class @PROJECT_NAME@ < Formula
       -DSUNSHINE_PUBLISHER_ISSUE_URL='https://app.lizardbyte.dev/support'
     ]
 
-    if build.with? "docs-off"
+    if build.with? "docs"
-      ohai "Building docs: disabled"
-      args << "-DBUILD_DOCS=OFF"
-    else
       ohai "Building docs: enabled"
       args << "-DBUILD_DOCS=ON"
+    else
+      ohai "Building docs: disabled"
+      args << "-DBUILD_DOCS=OFF"
     end
 
     if build.without? "dynamic-boost"

src/config.cpp

@@ -60,7 +60,7 @@ namespace config {
   }  // namespace nv
 
   namespace amd {
-#ifdef __APPLE__
+#ifndef _WIN32
   // values accurate as of 27/12/2022, but aren't strictly necessary for MacOS build
   #define AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED 100
   #define AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY 30
@@ -102,6 +102,9 @@ namespace config {
   #define AMF_VIDEO_ENCODER_CABAC 1
   #define AMF_VIDEO_ENCODER_CALV 2
 #else
+  #ifdef _GLIBCXX_USE_C99_INTTYPES
+    #undef _GLIBCXX_USE_C99_INTTYPES
+  #endif
   #include <AMF/components/VideoEncoderAV1.h>
   #include <AMF/components/VideoEncoderHEVC.h>
   #include <AMF/components/VideoEncoderVCE.h>

src/platform/windows/display_wgc.cpp

@@ -9,6 +9,9 @@
 #include "misc.h"
 #include "src/logging.h"
 
+// Gross hack to work around MINGW-packages#22160
+#define ____FIReference_1_boolean_INTERFACE_DEFINED__
+
 #include <windows.graphics.capture.interop.h>
 #include <winrt/windows.foundation.h>
 #include <winrt/windows.foundation.metadata.h>