izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(deps): update dependency and paths for build-deps submodule (#3341)

Browse Source
This commit is contained in:
ReenigneArcher
2024-10-30 10:06:06 -04:00
committed by GitHub
parent ca40cfd268
commit d8fbe2d709
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/dependencies/common.cmake
View File

@@ -30,7 +30,7 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES)
set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 X11) set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 X11)
endif() endif()
set(FFMPEG_PREPARED_BINARIES set(FFMPEG_PREPARED_BINARIES
"${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") "${CMAKE_SOURCE_DIR}/third-party/build-deps/dist/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
# check if the directory exists # check if the directory exists
if(NOT EXISTS "${FFMPEG_PREPARED_BINARIES}") if(NOT EXISTS "${FFMPEG_PREPARED_BINARIES}")

2
docs/Doxyfile
View File

@@ -32,7 +32,7 @@ PROJECT_NAME = Sunshine
# project specific settings # project specific settings
DOT_GRAPH_MAX_NODES = 60 DOT_GRAPH_MAX_NODES = 60
IMAGE_PATH = ../docs/images IMAGE_PATH = ../docs/images
INCLUDE_PATH = ../third-party/build-deps/ffmpeg/Linux-x86_64/include/ INCLUDE_PATH = ../third-party/build-deps/dist/Linux-x86_64/include/
PREDEFINED += SUNSHINE_BUILD_WAYLAND PREDEFINED += SUNSHINE_BUILD_WAYLAND
PREDEFINED += SUNSHINE_TRAY=1 PREDEFINED += SUNSHINE_TRAY=1

6
src/cbs.cpp
View File

@@ -3,10 +3,10 @@
* @brief Definitions for FFmpeg Coded Bitstream API. * @brief Definitions for FFmpeg Coded Bitstream API.
*/ */
extern "C" { extern "C" {
#include <cbs/cbs_h264.h>
#include <cbs/cbs_h265.h>
#include <cbs/h264_levels.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavcodec/cbs_h264.h>
#include <libavcodec/cbs_h265.h>
#include <libavcodec/h264_levels.h>
#include <libavutil/pixdesc.h> #include <libavutil/pixdesc.h>
} }

2
third-party/build-deps vendored

Submodule third-party/build-deps updated: f8a2a1128e...ccac36854d