diff --git a/docs/Doxyfile b/docs/Doxyfile index 82e45c4e898..6526b8bf3cb 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -32,6 +32,7 @@ PROJECT_NAME = Sunshine # project specific settings DOT_GRAPH_MAX_NODES = 60 IMAGE_PATH = ../docs/images +INCLUDE_PATH = ../third-party/build-deps/ffmpeg/Linux-x86_64/include/ PREDEFINED += SUNSHINE_BUILD_WAYLAND PREDEFINED += SUNSHINE_TRAY=1 diff --git a/packaging/linux/Arch/PKGBUILD b/packaging/linux/Arch/PKGBUILD index 135e88a84a0..5ee6474840e 100644 --- a/packaging/linux/Arch/PKGBUILD +++ b/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 \ diff --git a/packaging/sunshine.rb b/packaging/sunshine.rb index 7f01d155b3f..b5220fe49b0 100644 --- a/packaging/sunshine.rb +++ b/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 @@ def install -DSUNSHINE_PUBLISHER_ISSUE_URL='https://app.lizardbyte.dev/support' ] - if build.with? "docs-off" - ohai "Building docs: disabled" - args << "-DBUILD_DOCS=OFF" - else + if build.with? "docs" ohai "Building docs: enabled" args << "-DBUILD_DOCS=ON" + else + ohai "Building docs: disabled" + args << "-DBUILD_DOCS=OFF" end if build.without? "dynamic-boost" diff --git a/src/config.cpp b/src/config.cpp index e8accb15a57..b42eb097a5d 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -59,7 +59,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 @@ -101,6 +101,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 #include #include diff --git a/third-party/build-deps b/third-party/build-deps index 1977d9c5607..8c7caa1f710 160000 --- a/third-party/build-deps +++ b/third-party/build-deps @@ -1 +1 @@ -Subproject commit 1977d9c560717b9b5f7621d13f6771c05c89f36f +Subproject commit 8c7caa1f7105d60eb7c041b642f1363f481a1f93