Skip to content

Commit

Permalink
build(deps): bump third party/build-deps from 1977d9c to 8c7caa1 (#…
Browse files Browse the repository at this point in the history
…3292)

Co-authored-by: Cameron Gutman <[email protected]>
  • Loading branch information
ReenigneArcher and cgutman authored Oct 12, 2024
1 parent e074316 commit 7dd836d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions packaging/linux/Arch/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ depends=(
makedepends=(
'cmake'
'cuda'
'doxygen'
"gcc${_gcc_version}"
'graphviz'
'git'
'make'
'nodejs'
Expand Down Expand Up @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions packaging/sunshine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <AMF/components/VideoEncoderAV1.h>
#include <AMF/components/VideoEncoderHEVC.h>
#include <AMF/components/VideoEncoderVCE.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/build-deps
Submodule build-deps updated 94 files
+1 −1 ffmpeg/Darwin-arm64/include/libavutil/ffversion.h
+ ffmpeg/Darwin-arm64/lib/libSvtAv1Enc.a
+ ffmpeg/Darwin-arm64/lib/libavcodec.a
+ ffmpeg/Darwin-arm64/lib/libavutil.a
+ ffmpeg/Darwin-arm64/lib/libcbs.a
+ ffmpeg/Darwin-arm64/lib/libswscale.a
+ ffmpeg/Darwin-arm64/lib/libx264.a
+ ffmpeg/Darwin-arm64/lib/libx265.a
+1 −1 ffmpeg/Darwin-x86_64/include/libavutil/ffversion.h
+ ffmpeg/Darwin-x86_64/lib/libSvtAv1Enc.a
+ ffmpeg/Darwin-x86_64/lib/libavcodec.a
+ ffmpeg/Darwin-x86_64/lib/libavutil.a
+ ffmpeg/Darwin-x86_64/lib/libcbs.a
+ ffmpeg/Darwin-x86_64/lib/libhdr10plus.a
+ ffmpeg/Darwin-x86_64/lib/libswscale.a
+ ffmpeg/Darwin-x86_64/lib/libx264.a
+ ffmpeg/Darwin-x86_64/lib/libx265.a
+139 −0 ffmpeg/Linux-aarch64/include/AMF/components/AMFXInput.h
+2 −0 ffmpeg/Linux-aarch64/include/AMF/components/DisplayCapture.h
+8 −7 ffmpeg/Linux-aarch64/include/AMF/components/FRC.h
+14 −13 ffmpeg/Linux-aarch64/include/AMF/components/VideoDecoderUVD.h
+16 −11 ffmpeg/Linux-aarch64/include/AMF/components/VideoEncoderAV1.h
+5 −3 ffmpeg/Linux-aarch64/include/AMF/components/VideoEncoderHEVC.h
+3 −3 ffmpeg/Linux-aarch64/include/AMF/components/VideoEncoderVCE.h
+7 −0 ffmpeg/Linux-aarch64/include/AMF/core/AudioBuffer.h
+8 −0 ffmpeg/Linux-aarch64/include/AMF/core/Buffer.h
+10 −8 ffmpeg/Linux-aarch64/include/AMF/core/D3D12AMF.h
+6 −5 ffmpeg/Linux-aarch64/include/AMF/core/Data.h
+34 −24 ffmpeg/Linux-aarch64/include/AMF/core/Platform.h
+11 −4 ffmpeg/Linux-aarch64/include/AMF/core/Surface.h
+1 −1 ffmpeg/Linux-aarch64/include/AMF/core/Variant.h
+1 −1 ffmpeg/Linux-aarch64/include/AMF/core/Version.h
+1 −1 ffmpeg/Linux-aarch64/include/libavutil/ffversion.h
+ ffmpeg/Linux-aarch64/lib/libSvtAv1Enc.a
+ ffmpeg/Linux-aarch64/lib/libavcodec.a
+ ffmpeg/Linux-aarch64/lib/libavutil.a
+139 −0 ffmpeg/Linux-ppc64le/include/AMF/components/AMFXInput.h
+2 −0 ffmpeg/Linux-ppc64le/include/AMF/components/DisplayCapture.h
+8 −7 ffmpeg/Linux-ppc64le/include/AMF/components/FRC.h
+14 −13 ffmpeg/Linux-ppc64le/include/AMF/components/VideoDecoderUVD.h
+16 −11 ffmpeg/Linux-ppc64le/include/AMF/components/VideoEncoderAV1.h
+5 −3 ffmpeg/Linux-ppc64le/include/AMF/components/VideoEncoderHEVC.h
+3 −3 ffmpeg/Linux-ppc64le/include/AMF/components/VideoEncoderVCE.h
+7 −0 ffmpeg/Linux-ppc64le/include/AMF/core/AudioBuffer.h
+8 −0 ffmpeg/Linux-ppc64le/include/AMF/core/Buffer.h
+10 −8 ffmpeg/Linux-ppc64le/include/AMF/core/D3D12AMF.h
+6 −5 ffmpeg/Linux-ppc64le/include/AMF/core/Data.h
+34 −24 ffmpeg/Linux-ppc64le/include/AMF/core/Platform.h
+11 −4 ffmpeg/Linux-ppc64le/include/AMF/core/Surface.h
+1 −1 ffmpeg/Linux-ppc64le/include/AMF/core/Variant.h
+1 −1 ffmpeg/Linux-ppc64le/include/AMF/core/Version.h
+1 −1 ffmpeg/Linux-ppc64le/include/libavutil/ffversion.h
+ ffmpeg/Linux-ppc64le/lib/libSvtAv1Enc.a
+ ffmpeg/Linux-ppc64le/lib/libavcodec.a
+ ffmpeg/Linux-ppc64le/lib/libavutil.a
+139 −0 ffmpeg/Linux-x86_64/include/AMF/components/AMFXInput.h
+2 −0 ffmpeg/Linux-x86_64/include/AMF/components/DisplayCapture.h
+8 −7 ffmpeg/Linux-x86_64/include/AMF/components/FRC.h
+14 −13 ffmpeg/Linux-x86_64/include/AMF/components/VideoDecoderUVD.h
+16 −11 ffmpeg/Linux-x86_64/include/AMF/components/VideoEncoderAV1.h
+5 −3 ffmpeg/Linux-x86_64/include/AMF/components/VideoEncoderHEVC.h
+3 −3 ffmpeg/Linux-x86_64/include/AMF/components/VideoEncoderVCE.h
+7 −0 ffmpeg/Linux-x86_64/include/AMF/core/AudioBuffer.h
+8 −0 ffmpeg/Linux-x86_64/include/AMF/core/Buffer.h
+10 −8 ffmpeg/Linux-x86_64/include/AMF/core/D3D12AMF.h
+6 −5 ffmpeg/Linux-x86_64/include/AMF/core/Data.h
+34 −24 ffmpeg/Linux-x86_64/include/AMF/core/Platform.h
+11 −4 ffmpeg/Linux-x86_64/include/AMF/core/Surface.h
+1 −1 ffmpeg/Linux-x86_64/include/AMF/core/Variant.h
+1 −1 ffmpeg/Linux-x86_64/include/AMF/core/Version.h
+1 −1 ffmpeg/Linux-x86_64/include/libavutil/ffversion.h
+ ffmpeg/Linux-x86_64/lib/libSvtAv1Enc.a
+ ffmpeg/Linux-x86_64/lib/libavcodec.a
+ ffmpeg/Linux-x86_64/lib/libavutil.a
+139 −0 ffmpeg/Windows-AMD64/include/AMF/components/AMFXInput.h
+2 −0 ffmpeg/Windows-AMD64/include/AMF/components/DisplayCapture.h
+8 −7 ffmpeg/Windows-AMD64/include/AMF/components/FRC.h
+14 −13 ffmpeg/Windows-AMD64/include/AMF/components/VideoDecoderUVD.h
+16 −11 ffmpeg/Windows-AMD64/include/AMF/components/VideoEncoderAV1.h
+5 −3 ffmpeg/Windows-AMD64/include/AMF/components/VideoEncoderHEVC.h
+3 −3 ffmpeg/Windows-AMD64/include/AMF/components/VideoEncoderVCE.h
+7 −0 ffmpeg/Windows-AMD64/include/AMF/core/AudioBuffer.h
+8 −0 ffmpeg/Windows-AMD64/include/AMF/core/Buffer.h
+10 −8 ffmpeg/Windows-AMD64/include/AMF/core/D3D12AMF.h
+6 −5 ffmpeg/Windows-AMD64/include/AMF/core/Data.h
+34 −24 ffmpeg/Windows-AMD64/include/AMF/core/Platform.h
+11 −4 ffmpeg/Windows-AMD64/include/AMF/core/Surface.h
+1 −1 ffmpeg/Windows-AMD64/include/AMF/core/Variant.h
+1 −1 ffmpeg/Windows-AMD64/include/AMF/core/Version.h
+1 −1 ffmpeg/Windows-AMD64/include/libavutil/ffversion.h
+ ffmpeg/Windows-AMD64/lib/libSvtAv1Enc.a
+ ffmpeg/Windows-AMD64/lib/libavcodec.a
+ ffmpeg/Windows-AMD64/lib/libavutil.a
+ ffmpeg/Windows-AMD64/lib/libx265.a

0 comments on commit 7dd836d

Please sign in to comment.