From ac4d0b8bf685b40df3d74caa7b76bc0a65bdcfcb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:41:08 +0000 Subject: [PATCH 1/4] build(deps): bump third-party/build-deps from `1977d9c` to `79c5243` Bumps [third-party/build-deps](https://github.com/LizardByte/build-deps) from `1977d9c` to `79c5243`. - [Commits](https://github.com/LizardByte/build-deps/compare/1977d9c560717b9b5f7621d13f6771c05c89f36f...79c5243b34cf4602f80fe22d5d829d1a4cee72b9) --- updated-dependencies: - dependency-name: third-party/build-deps dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- third-party/build-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party/build-deps b/third-party/build-deps index 1977d9c5607..79c5243b34c 160000 --- a/third-party/build-deps +++ b/third-party/build-deps @@ -1 +1 @@ -Subproject commit 1977d9c560717b9b5f7621d13f6771c05c89f36f +Subproject commit 79c5243b34cf4602f80fe22d5d829d1a4cee72b9 From 96519f76a2f7f6d4a614fbc52ef6726f17c8db09 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 9 Oct 2024 21:24:47 -0500 Subject: [PATCH 2/4] build(amf): work around build error with AMF 1.4.35 --- src/config.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 75df9450465a180b5c73d39f8d5340e1d9a4b0fa Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:49:37 -0400 Subject: [PATCH 3/4] revert: "docs(doxygen): remove include dir #3286" --- docs/Doxyfile | 1 + 1 file changed, 1 insertion(+) 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 From d4705a29b71135ac0dbc9459277015ad8449ae60 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 11 Oct 2024 22:39:43 -0400 Subject: [PATCH 4/4] ci(docs): disable docs for some builds --- packaging/linux/Arch/PKGBUILD | 3 +-- packaging/sunshine.rb | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) 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"