diff options
Diffstat (limited to 'net-misc/sunshine/files/sunshine-custom-ffmpeg.patch')
-rw-r--r-- | net-misc/sunshine/files/sunshine-custom-ffmpeg.patch | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch b/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch index 94febe187c1f..172ae3ff7d59 100644 --- a/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch +++ b/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch @@ -1,4 +1,4 @@ -From 64783df9d7ed22916894387a8ff1f73a97dbb760 Mon Sep 17 00:00:00 2001 +From 20c589554a1b10dad206619e11d143c420aa6c82 Mon Sep 17 00:00:00 2001 From: James Le Cuirot <chewi@gentoo.org> Date: Mon, 1 Jan 2024 11:17:08 +0000 Subject: [PATCH 1/2] Allow a custom FFmpeg build to be provided using CMake @@ -9,11 +9,11 @@ Subject: [PATCH 1/2] Allow a custom FFmpeg build to be provided using CMake 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake -index a1f3512..d921c1b 100644 +index 29bed10..d43a6e0 100644 --- a/cmake/dependencies/common.cmake +++ b/cmake/dependencies/common.cmake -@@ -23,53 +23,63 @@ include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS}) - add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/nlohmann_json") +@@ -20,53 +20,63 @@ pkg_check_modules(MINIUPNP miniupnpc REQUIRED) + include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS}) # ffmpeg pre-compiled binaries -if(WIN32) @@ -117,10 +117,9 @@ index a1f3512..d921c1b 100644 # platform specific dependencies if(WIN32) -- -2.43.0 +2.43.2 - -From b7a479b15216900fdc4cbc5587d8fd90e366f5a5 Mon Sep 17 00:00:00 2001 +From 53cd96560114dd700c943db63723e340100446a3 Mon Sep 17 00:00:00 2001 From: James Le Cuirot <chewi@gentoo.org> Date: Mon, 1 Jan 2024 13:34:20 +0000 Subject: [PATCH 2/2] Move numa from general PLATFORM_LIBRARIES to @@ -134,22 +133,22 @@ may be disabled in a custom FFmpeg build. 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake -index 613a090..e1fda2c 100644 +index b6d1990..ec668f7 100644 --- a/cmake/compile_definitions/linux.cmake +++ b/cmake/compile_definitions/linux.cmake -@@ -242,7 +242,6 @@ list(APPEND PLATFORM_LIBRARIES +@@ -252,7 +252,6 @@ list(APPEND PLATFORM_TARGET_FILES + list(APPEND PLATFORM_LIBRARIES Boost::dynamic_linking dl - evdev - numa pulse pulse-simple) diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake -index d921c1b..23695e3 100644 +index d43a6e0..bddee03 100644 --- a/cmake/dependencies/common.cmake +++ b/cmake/dependencies/common.cmake -@@ -41,7 +41,7 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES) +@@ -38,7 +38,7 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES) message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) endif() elseif(UNIX) @@ -159,5 +158,5 @@ index d921c1b..23695e3 100644 list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") -- -2.43.0 +2.43.2 |