[gentoo-commits] repo/gentoo:master commit in: net-misc/sunshine/, net-misc/sunshine/files/
commit: 6e23d43c7ba5c3f3ff964206978f464784da877d
Author: James Le Cuirot gentoo org>
AuthorDate: Sun May 12 16:33:46 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon May 13 21:04:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e23d43c
net-misc/sunshine: Update NPM patch now it's merged upstream
Signed-off-by: James Le Cuirot gentoo.org>
net-misc/sunshine/files/sunshine-find-npm.patch | 106 +++-
net-misc/sunshine/sunshine-0.23.1.ebuild| 2 +-
net-misc/sunshine/sunshine-.ebuild | 3 +-
3 files changed, 51 insertions(+), 60 deletions(-)
diff --git a/net-misc/sunshine/files/sunshine-find-npm.patch
b/net-misc/sunshine/files/sunshine-find-npm.patch
index 42b91299cca5..ab25b4527b78 100644
--- a/net-misc/sunshine/files/sunshine-find-npm.patch
+++ b/net-misc/sunshine/files/sunshine-find-npm.patch
@@ -1,36 +1,65 @@
-From 0fa3273af349089b7d62c996fcaea67b10ed2a0c Mon Sep 17 00:00:00 2001
+From 66740900522f42564a2b0bd4e8a435ed24a61725 Mon Sep 17 00:00:00 2001
From: James Le Cuirot
-Date: Sat, 4 May 2024 23:32:29 +0100
-Subject: [PATCH 1/2] build: Unify asset building by leveraging CMake's env
- command
+Date: Sun, 12 May 2024 17:26:14 +0100
+Subject: [PATCH] Unify asset building and use find_program to find NPM (#2522)
-`add_custom_target` can also accept multiple commands to be run in
-sequence. It isn't clear how quoting applies here, but I've tested it,
-and it seems to be behave as expected when spaces are present.
---
- cmake/targets/common.cmake | 7 +++
- cmake/targets/unix.cmake| 6 --
- cmake/targets/windows.cmake | 6 --
- 3 files changed, 7 insertions(+), 12 deletions(-)
+ cmake/targets/common.cmake | 33 +
+ cmake/targets/unix.cmake| 6 --
+ cmake/targets/windows.cmake | 6 --
+ 3 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake
-index ee79528c..04d8e954 100644
+index ee79528c..941ef0b7 100644
--- a/cmake/targets/common.cmake
+++ b/cmake/targets/common.cmake
-@@ -15,6 +15,13 @@ else()
- set(NPM_BUILD_HOMEBREW "")
- endif()
+@@ -3,18 +3,6 @@
+ add_executable(sunshine ${SUNSHINE_TARGET_FILES})
+
+-# Homebrew build fails the vite build if we set these environment variables
+-# this block must be before the platform specific code
+-if(${SUNSHINE_BUILD_HOMEBREW})
+-set(NPM_SOURCE_ASSETS_DIR "")
+-set(NPM_ASSETS_DIR "")
+-set(NPM_BUILD_HOMEBREW "true")
+-else()
+-set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR})
+-set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR})
+-set(NPM_BUILD_HOMEBREW "")
+-endif()
+-
+ # platform specific target definitions
+ if(WIN32)
+ include(${CMAKE_MODULE_PATH}/targets/windows.cmake)
+@@ -49,6 +37,27 @@ endif()
+
+ target_compile_options(sunshine PRIVATE
$<$:${SUNSHINE_COMPILE_OPTIONS}>;$<$:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>)
# cmake-lint: disable=C0301
+
++# Homebrew build fails the vite build if we set these environment variables
++if(${SUNSHINE_BUILD_HOMEBREW})
++set(NPM_SOURCE_ASSETS_DIR "")
++set(NPM_ASSETS_DIR "")
++set(NPM_BUILD_HOMEBREW "true")
++else()
++set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR})
++set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR})
++set(NPM_BUILD_HOMEBREW "")
++endif()
++
+#WebUI build
++find_program(NPM npm REQUIRED)
+add_custom_target(web-ui ALL
+WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+COMMENT "Installing NPM Dependencies and Building the Web UI"
-+COMMAND npm install
-+COMMAND "${CMAKE_COMMAND}" -E env
"SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW}"
"SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}"
"SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}" npm run build) # cmake-lint:
disable=C0301
++COMMAND "$<$:cmd;/C>" "${NPM}" install
++COMMAND "${CMAKE_COMMAND}" -E env
"SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW}"
"SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}"
"SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}" "$<$:cmd;/C>" "${NPM}"
run build # cmake-lint: disable=C0301
++COMMAND_EXPAND_LISTS
++VERBATIM)
+
- # platform specific target definitions
- if(WIN32)
- include(${CMAKE_MODULE_PATH}/targets/windows.cmake)
+ # tests
+ if(BUILD_TESTS)
+ add_subdirectory(tests)
diff --git a/cmake/targets/unix.cmake b/cmake/targets/unix.cmake
index 5527a987..047a0b3d 100644
--- a/cmake/targets/unix.cmake
@@ -61,40 +90,3 @@ index e429feaa..341d7c2e 100644
--
2.44.0
-
-From f7f93c787bc7c6e82296f0b28c1684ba93cb0956 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Sun, 5 May 2024 23:30:36 +0100
-Subject: [PATCH 2/2] build: Use find_program to find NPM so it can be
- overridden
-
-This is useful for Gentoo, which needs to be able to do entirely offline
-builds, because it can override this with `true` while shipping
-pre-compiled assets. Gentoo has tried to ship
[gentoo-commits] repo/gentoo:master commit in: net-misc/sunshine/, net-misc/sunshine/files/
commit: 1f211c5d5f9784aa2c01b84a37e412824a54da48 Author: James Le Cuirot gentoo org> AuthorDate: Sat Mar 9 15:01:55 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Mar 9 15:01:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f211c5d net-misc/sunshine: Bump to 0.22.0, drop old 0.21.0 Signed-off-by: James Le Cuirot gentoo.org> net-misc/sunshine/Manifest | 10 +- .../sunshine/files/sunshine-0.21.0-no-x11.patch| 36 --- .../files/sunshine-0.21.0-system-deps.patch| 341 - .../sunshine/files/sunshine-0.21.0-vaapi.patch | 26 -- ...nshine-0.21.0.ebuild => sunshine-0.22.0.ebuild} | 28 +- net-misc/sunshine/sunshine-.ebuild | 16 +- 6 files changed, 29 insertions(+), 428 deletions(-) diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest index e440c1023dbc..e82f11764723 100644 --- a/net-misc/sunshine/Manifest +++ b/net-misc/sunshine/Manifest @@ -1,10 +1,10 @@ DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7 -DIST LizardByte-tray-e08bdbe5aa7de0ad9c0ce36257016e07c7e6e2c0.tar.gz 1066914 BLAKE2B 814e4aeace655cb06d50cbe26847f107b4141cec40fc812b924e87e4e14c7cddf8ee6dce0f54f76bf1f5c8dd355a8d7e32485759caa2c91aa24b1c594f1a879d SHA512 04df675d3fa8676b08a566bbbfb90af80b1efdd5ffc264f9aced3116ad1a3ad14c80a486a84f1ed800fd2ea2c2046e36f2919a2bb48cecdfca3baa3b650d3c48 +DIST LizardByte-tray-2bf1c610300b27f8d8ce87e2f13223fc83efeb42.tar.gz 1067540 BLAKE2B f832dc11398086236817f25e2343831bd7533737d851958df2bcc155a204f99bd0b491a5c259bf559d83108ec71afc3e85424d79040a641a4bcb832419120da6 SHA512 fa2bacc412268e82c03718e954914fc713d271398dfbef2a86c4da649f63233aff9bf6e99b08d6f3c8385d0c96f25d9d54b145d8d7422a82e80b5aa2e62de641 DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44 DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 -DIST moonlight-common-c-6e9ed871bc3e013386c775b2ee7d31deb1151068.tar.gz 143942 BLAKE2B d8e98cffc683cc7ef6ad9e58c0a154a60e4bf5742fba8c4bce270b84c2af6ff455a6f7e2920e3b83db052c2a1632e787f9a444b381a8a7476ab79fa4f79560ad SHA512 a9024ba400e6804c0b26db57fa16ddbcd080982f852d26fd1ca8ae84f969bacd883c4adc83105bd18e1af4d34e831dc241d0278f88549b46497eb62c72f39bf2 -DIST moonlight-enet-c6bb0e50118d08252eee308de8412751218442d6.tar.gz 85497 BLAKE2B 484cf25d37ed230946edc7417ca20ea4c16828f2a099fd6a88dca08dc78a5314e837c96d9a7536ace3e45c55d0edd8698568af8d5087adc7429bc4d3966cfbae SHA512 1e7f93639139ec3d02c5b442dd2d49e2ab8e729b7c4ee51d9b2da4061f8e3794e7984858cfb87d279b85939a9fed6d0c4a3b9994c30597791461e612a64843e2 +DIST moonlight-common-c-cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e.tar.gz 148691 BLAKE2B 2650e48ef5d08b5e4a901e0b394364335503cd717ae75b4ecf5329395f39d3312a9bbfe08137d2b7697f7b1672749d148e100fbaa5c7f87d190ab8157f158639 SHA512 f1d7848138b85a88abf798774f12f6491e19ae5e7699715b0454bfccc184439fba0ebf7e05327fd649e320e5d1ad610c57fe71190f92cf2248c8f974f9d79aaf +DIST moonlight-enet-04e27590670a87a7cd40f5a05cda97467e4e25a3.tar.gz 86434 BLAKE2B 8a5535843e4c650b945882abac1542bf8c79dc420607b88433d239aa5a17380f02e77bb8f1fcbe45dcb8ef894e6c9b4d940f4d3b34b956ce42d86f6a8ca5227a SHA512 6d2e9447e546489365b1fb563ed52664a91981717a3a3a9faa9600ab62be5ac09bd24ee9dd505833d31981ce6222f5ef430268a9f92aa83fa288b5b8d681e2aa DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd7c0884ffd38b63d61a7872337797529ef2012f9de0950088a5004cb32a2fb2c14bcab2ec6719968864e5e6b9a67e96afa39466e2071bf4a0cd752ae4b29 SHA512 548be25650619a6c31944cd7a745fd40d5bc5008f2d7f91e0207a10b923764cb88fd2ddcb71eaed7c4863ec89b34d61011b666e292da071ac3b4429e4d7dd027 -DIST sunshine-0.21.0.tar.gz 24066116 BLAKE2B cc7ecf20ea69ed9c35c97194ca803f5a329234d1857b8f9dcee070c08ccc36de4481acc4f493c4d5f9b7fce5f5bf6986630d26233e7fc0495a688d7f2fea4696 SHA512 96e71ca6e36f7944b5f96005e2cab4287cba0fd0d2e561e6eeea7fa1cbf047576ca6debc786d34d7543dab361841fbf59cbb950e0d3413be8ba8dfb81342056e -DIST sunshine-node-modules-0.21.0.tar.xz 2171156 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: net-misc/sunshine/, net-misc/sunshine/files/
commit: c7915a37767f37dc8256568f440355d9e1e33e53
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Mar 1 23:21:39 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Mar 1 23:31:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7915a37
net-misc/sunshine: Fix cross-compiling with patch
Upstream say they will merge this in time for the next release.
Signed-off-by: James Le Cuirot gentoo.org>
net-misc/sunshine/files/sunshine-cross-cbs.patch | 59
net-misc/sunshine/sunshine-0.21.0.ebuild | 6 ++-
net-misc/sunshine/sunshine-.ebuild | 6 ++-
3 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/net-misc/sunshine/files/sunshine-cross-cbs.patch
b/net-misc/sunshine/files/sunshine-cross-cbs.patch
new file mode 100644
index ..e6173597e476
--- /dev/null
+++ b/net-misc/sunshine/files/sunshine-cross-cbs.patch
@@ -0,0 +1,59 @@
+From 40654399bd090dda20750b184eb6b15bc615a5dc Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sun, 25 Feb 2024 16:24:25 +
+Subject: [PATCH] Fix cross-compiling and don't treat x86 as the default case
+
+If you set arch-specific CFLAGS, then ffmpeg's configure script may
+fail when it tries to use these flags against the build host's compiler.
+
+Also use CMAKE_SYSTEM_PROCESSOR to set up cross-compiling without
+relying on any custom variables. ffmpeg normalises its --arch option and
+will accept just about any string that you'll likely throw at it.
+
+diff --git a/cmake/ffmpeg_cbs.cmake b/cmake/ffmpeg_cbs.cmake
+index 573bec0..4a75e1a 100644
+--- a/cmake/ffmpeg_cbs.cmake
b/cmake/ffmpeg_cbs.cmake
+@@ -30,23 +30,30 @@ if (WIN32)
+ set(LEADING_SH_COMMAND sh)
+ endif ()
+
+-if (CROSS_COMPILE_ARM)
+-set(FFMPEG_EXTRA_CONFIGURE
+---arch=aarch64
+---enable-cross-compile)
++string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} arch)
++
++if (${arch} STREQUAL "aarch64" OR ${arch} STREQUAL "arm64")
+ set(CBS_ARCH_PATH arm)
+-elseif (CROSS_COMPILE_PPC)
+-set(FFMPEG_EXTRA_CONFIGURE
+---arch=powerpc64le
+---enable-cross-compile)
++elseif (${arch} STREQUAL "ppc64le")
+ set(CBS_ARCH_PATH ppc)
+-else ()
++elseif (${arch} STREQUAL "amd64" OR ${arch} STREQUAL "x86_64")
+ set(CBS_ARCH_PATH x86)
++else ()
++message(FATAL_ERROR "Unsupported system processor:"
${CMAKE_SYSTEM_PROCESSOR})
++endif ()
++
++if (CMAKE_CROSSCOMPILING)
++set(FFMPEG_EXTRA_CONFIGURE --arch=${arch} --enable-cross-compile)
+ endif ()
+
+ # The generated config.h needs to have `CONFIG_CBS_` flags enabled (from
`--enable-bsfs`)
+ execute_process(
+ COMMAND ${LEADING_SH_COMMAND} ./configure
++--cc=${CMAKE_C_COMPILER}
++--cxx=${CMAKE_CXX_COMPILER}
++--ar=${CMAKE_AR}
++--ranlib=${CMAKE_RANLIB}
++--optflags=${CMAKE_C_FLAGS}
+ --disable-all
+ --disable-autodetect
+ --disable-iconv
+--
+2.43.2
+
diff --git a/net-misc/sunshine/sunshine-0.21.0.ebuild
b/net-misc/sunshine/sunshine-0.21.0.ebuild
index 22cf946e4348..1c21649b7929 100644
--- a/net-misc/sunshine/sunshine-0.21.0.ebuild
+++ b/net-misc/sunshine/sunshine-0.21.0.ebuild
@@ -237,6 +237,10 @@ src_unpack() {
}
src_prepare() {
+ # Apply CBS patch.
+ cd "${WORKDIR}"/build-deps || die
+ eapply "${FILESDIR}"/${PN}-cross-cbs.patch
+
# Apply general ffmpeg patches.
cd "${WORKDIR}"/build-deps/ffmpeg_sources/ffmpeg || die
eapply "${WORKDIR}"/build-deps/ffmpeg_patches/ffmpeg/*.patch
@@ -329,8 +333,6 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DCMAKE_INSTALL_PREFIX="${S}"/third-party/ffmpeg
- $(usex arm64 -DCROSS_COMPILE_ARM=yes "")
- $(usex ppc64 -DCROSS_COMPILE_PPC=yes "")
)
CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure
diff --git a/net-misc/sunshine/sunshine-.ebuild
b/net-misc/sunshine/sunshine-.ebuild
index c88478b1a500..641289cdc732 100644
--- a/net-misc/sunshine/sunshine-.ebuild
+++ b/net-misc/sunshine/sunshine-.ebuild
@@ -235,6 +235,10 @@ src_unpack() {
}
src_prepare() {
+ # Apply CBS patch.
+ cd "${WORKDIR}"/build-deps || die
+ eapply "${FILESDIR}"/${PN}-cross-cbs.patch
+
# Apply general ffmpeg patches.
cd "${WORKDIR}"/build-deps/ffmpeg_sources/ffmpeg || die
eapply "${WORKDIR}"/build-deps/ffmpeg_patches/ffmpeg/*.patch
@@ -327,8 +331,6 @@ src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=no
-DCMAKE_INSTALL_PREFIX="${S}"/third-party/ffmpeg
- $(usex arm64 -DCROSS_COMPILE_ARM=yes "")
- $(usex ppc64 -DCROSS_COMPILE_PPC=yes "")
)
CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: net-misc/sunshine/, net-misc/sunshine/files/
commit: fa7f3ac6899777f88462eef4d83a2f55655c737b
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Feb 27 08:58:58 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Feb 27 08:58:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7f3ac6
net-misc/sunshine: Turns out nlohmann_json is only needed on Windows
Signed-off-by: James Le Cuirot gentoo.org>
.../sunshine/files/sunshine-custom-ffmpeg.patch| 25 +-
net-misc/sunshine/files/sunshine-system-json.patch | 56 --
net-misc/sunshine/sunshine-.ebuild | 3 --
3 files changed, 12 insertions(+), 72 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
Date: Mon, 1 Jan 2024 11:17:08 +
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
Date: Mon, 1 Jan 2024 13:34:20 +
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
diff --git a/net-misc/sunshine/files/sunshine-system-json.patch
b/net-misc/sunshine/files/sunshine-system-json.patch
deleted file mode 100644
index 62e405e8546f..
--- a/net-misc/sunshine/files/sunshine-system-json.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ec7c960954bba6a3aab03ff74fdbd3bc89948d4c Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Sat, 17 Feb 2024 17:02:45 +
-Subject: [PATCH] Optionally allow the system installation of nlohmann_json to
- be used
-
- cmake/compile_definitions/common.cmake | 2 +-
- cmake/dependencies/common.cmake| 8 +++-
- cmake/prep/options.cmake | 1 +
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/compile_definitions/common.cmake
b/cmake/compile_definitions/common.cmake
-index 94f1ac5..c65930c 100644
a/cmake/compile_definitions/common.cmake
-+++ b/cmake/compile_definitions/common.cmake
-@@ -135,4 +135,4 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
- ${OPENSSL_LIBRARIES}
- ${CURL_LIBRARIES}
- ${PLATFORM_LIBRARIES}
--nlohmann_json::nlohmann_json)
-+${JSON_LIBRARIES})
-diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
-index a1f3512..849afe7 100644
a/cmake/dependencies/common.cmake
-+++ b/cmake/dependencies/common.cmake
-@@ -20,7
