Skip to content

Commit 2aec3cb

Browse files
Merge remote-tracking branch 'origin/master'
2 parents 3510a07 + 7dd836d commit 2aec3cb

File tree

7 files changed

+14
-2965
lines changed

7 files changed

+14
-2965
lines changed

docs/Doxyfile-1.10.0-default

Lines changed: 0 additions & 2894 deletions
This file was deleted.

packaging/linux/Arch/PKGBUILD

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ depends=(
3939
makedepends=(
4040
'cmake'
4141
'cuda'
42-
'doxygen'
4342
"gcc${_gcc_version}"
44-
'graphviz'
4543
'git'
4644
'make'
4745
'nodejs'
@@ -80,6 +78,7 @@ build() {
8078
-S "$pkgname" \
8179
-B build \
8280
-Wno-dev \
81+
-D BUILD_DOCS=OFF \
8382
-D BUILD_WERROR=ON \
8483
-D CMAKE_INSTALL_PREFIX=/usr \
8584
-D SUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
Name: Sunshine
1111
Version: %{build_version}
12-
Summary: Self-hosted game stream host for Moonlight.
1312
Release: 1%{?dist}
13+
Summary: Self-hosted game stream host for Moonlight.
1414
License: GPLv3-only
1515
URL: https://github.com/LizardByte/Sunshine
1616
Source0: tarball.tar.gz

packaging/linux/fedora/copr-build.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

packaging/sunshine.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class @PROJECT_NAME@ < Formula
2222
end
2323
end
2424

25-
option "with-docs-off", "Disable docs"
25+
option "with-docs", "Enable docs"
2626
option "with-dynamic-boost", "Dynamically link Boost libraries"
2727
option "without-dynamic-boost", "Statically link Boost libraries" # default option
2828

@@ -76,12 +76,12 @@ def install
7676
-DSUNSHINE_PUBLISHER_ISSUE_URL='https://app.lizardbyte.dev/support'
7777
]
7878

79-
if build.with? "docs-off"
80-
ohai "Building docs: disabled"
81-
args << "-DBUILD_DOCS=OFF"
82-
else
79+
if build.with? "docs"
8380
ohai "Building docs: enabled"
8481
args << "-DBUILD_DOCS=ON"
82+
else
83+
ohai "Building docs: disabled"
84+
args << "-DBUILD_DOCS=OFF"
8585
end
8686

8787
if build.without? "dynamic-boost"

src/config.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace config {
6060
} // namespace nv
6161

6262
namespace amd {
63-
#ifdef __APPLE__
63+
#ifndef _WIN32
6464
// values accurate as of 27/12/2022, but aren't strictly necessary for MacOS build
6565
#define AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED 100
6666
#define AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY 30
@@ -102,6 +102,9 @@ namespace config {
102102
#define AMF_VIDEO_ENCODER_CABAC 1
103103
#define AMF_VIDEO_ENCODER_CALV 2
104104
#else
105+
#ifdef _GLIBCXX_USE_C99_INTTYPES
106+
#undef _GLIBCXX_USE_C99_INTTYPES
107+
#endif
105108
#include <AMF/components/VideoEncoderAV1.h>
106109
#include <AMF/components/VideoEncoderHEVC.h>
107110
#include <AMF/components/VideoEncoderVCE.h>

src/platform/windows/display_wgc.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#include "misc.h"
1010
#include "src/logging.h"
1111

12+
// Gross hack to work around MINGW-packages#22160
13+
#define ____FIReference_1_boolean_INTERFACE_DEFINED__
14+
1215
#include <windows.graphics.capture.interop.h>
1316
#include <winrt/windows.foundation.h>
1417
#include <winrt/windows.foundation.metadata.h>

0 commit comments

Comments
 (0)