gentoo auto-resync : 27:02:2024 - 11:40:34

4 files changed, 14 insertions, 75 deletions

diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index 2296e284dac7..5cf08de85d46 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -2,8 +2,7 @@ AUX sunshine-0.21.0-no-x11.patch 959 BLAKE2B 8fe641c9cae08bc280017f1bd2c3a922bda
 AUX sunshine-0.21.0-system-deps.patch 15391 BLAKE2B 7b6c79e644513723fc64d9c34093143bda5dc426b2e9aaa013f2fb517e65c841a460b7fc2764dfa8d645c2a41f8057d7bf05539fe25778962e62808821e68498 SHA512 565e5f33eda53f274d5bb75b0c3ce1f2efb05e483704352e30cea558ccb8a9736d06376a790dbfdbd50a901dd812bdc59116ab08d995ad5bbac30b65d1daabb0
 AUX sunshine-0.21.0-vaapi.patch 794 BLAKE2B 28f6a9ab061b467674c836230e81a45399c1f8c5bd2b6e0ec67ce3b264c5f45c749360dfc4bf4633763ea188493f24b9ef4222453ae0512d87e867bc3f6cc339 SHA512 9192c31ea4795cb987d60c493a5c3ece4d08e37f5f78cdf2bf079b470bbd5fcf357ce99385e07fcdfbe60aecffd7b25cc21b93ccae31730c1ecc444612f78d5a
 AUX sunshine-0.22.0-nvcodec.patch 1009 BLAKE2B 4a2fd3dbd98b64fd6e259c94d218f9853404a4096448ace8153c86717524b7cde5295a00aed972eca73c4a4c3bf6101349e8e61ebcb5e657d59426f903fc8efd SHA512 77ba0e67da4a3c252c5a19041bf0822651de9670ffe7e5732298cc00c6ac8cced97d2a0e0487af0ddc035fdb74fee2593ef91c446bb1125525ba4103b7b95fa2
-AUX sunshine-custom-ffmpeg.patch 7668 BLAKE2B ed546c249f173884297792867748c142e506b64c831ecd097de27417476fbfb88b94e04e8302f00926df669e9a1c74fa1699edad191dc054d82dfecda83a9abc SHA512 50f82076a90551e234acd999d0c4f3821d5ad6bc10910a7e6b034054097573b2116498c8c64df4d01baad599e3faa43e6676c30d0a9b878ebf5e934e4d91ff3d
-AUX sunshine-system-json.patch 2333 BLAKE2B 5cb13d834bbf7fa34e112982387672a49fc8da7ece14a816f40bdb7a130c1a6ca29a72020275125b57b9d0ca40b4494c37979fc7c8a5530a5b29bc90507c5ace SHA512 c67e1b99108418383547066af02ffc1fb2bb2890f09011ba1770ceaaf19b5c01709498c75ae0aa8428c00678403939752a5cad1637cdbc34565412e8226f2bb8
+AUX sunshine-custom-ffmpeg.patch 7668 BLAKE2B 2fa8adf912791e8abf73f0ea173228318edb804584c1efbe15077d6b6e08f7e6cfaa4dacf5e02115325ebe9a0ef09b9e49d3e021d6220dff0b364c1bbcd0b7e4 SHA512 ace6b855edf21a91958d843bff730634c585a96c1f728c304e7b79ddacc96fdb767936fd5d8dd8f2df3347d12a25519e9d1511ada3828404b9440d8333bfc013
 DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7
 DIST LizardByte-tray-e08bdbe5aa7de0ad9c0ce36257016e07c7e6e2c0.tar.gz 1066914 BLAKE2B 814e4aeace655cb06d50cbe26847f107b4141cec40fc812b924e87e4e14c7cddf8ee6dce0f54f76bf1f5c8dd355a8d7e32485759caa2c91aa24b1c594f1a879d SHA512 04df675d3fa8676b08a566bbbfb90af80b1efdd5ffc264f9aced3116ad1a3ad14c80a486a84f1ed800fd2ea2c2046e36f2919a2bb48cecdfca3baa3b650d3c48
 DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44
@@ -15,5 +14,5 @@ DIST sunshine-0.21.0.tar.gz 24066116 BLAKE2B cc7ecf20ea69ed9c35c97194ca803f5a329
 DIST sunshine-node-modules-0.21.0.tar.xz 2171156 BLAKE2B aa592d7041d08ff3dc795bf7afb5197e849afc7479df3c2e66e03b279f91cfb083e2e9f51ef594756b83b87b89214f48192be76b2efc7574a6aaf28d77ca7b37 SHA512 0a1cd9017b079a63f58f7fb4f2aaff8e2449788b213ddb6fa1da6bebf8a1d259ecc5900bb4ceaa15ca7bdca817792aeeff31e205d48593c3a55261c9f99d8f04
 DIST wlr-protocols-4264185db3b7e961e7f157e1cc4fd0ab75137568.tar.bz2 19574 BLAKE2B 65666095f186857e3c5274b23d5c40b40b0ba5d945c7b34331a06320128cb69a36a76baf2381b635858736ca6ed438c2ed67c03fac1c20e1ec4d71de27037e42 SHA512 0e6afde055d9b76bcb8c717433b78814f2cf9338ead451d3119f62463198ef272029767898e8f7d32896f2732be3aaa2a0373c671d8196e745d62f6116cd1583
 EBUILD sunshine-0.21.0.ebuild 11625 BLAKE2B 47f2189bda665f5d2da6021b7e28faf52bd3d5fc0ddbd58d6081797eddf2c26709f330eb8723f8ed16dc5762983137924ca20cc858b1ca8f69efc10a541b717d SHA512 4dc268cec3ecc77c1739ef628c4c68b8d5f9ebf48bd9912b8b708449bdf0b29d501aeca352c6d62ab3f771585e000684f0c3594d05529c8c27e84b337962e6c3
-EBUILD sunshine-9999.ebuild 11813 BLAKE2B b738e34bcde5aac45bd7857792119b1e9055a81d901029d22313601cff5417cb557b9bc58a958c16b2695d6c3beb137d93a4108dfbc952935da0cf4986db58a1 SHA512 a38e5b4fb0b2e45ed45b2b8da0dfc2738399df1897aafc78ae5f81a9997cbbd897b0fa98a472f611e8d36a8e56e33e5667ec80b62b952326908019c21dabd8c0
+EBUILD sunshine-9999.ebuild 11713 BLAKE2B 420db47556ef30277914f857af1802223aaf7c2676adb0d580c60307cd5d070608c174f8da91afd1fa392f06b2469870c7ec95ef08217265a15be74ecf03d138 SHA512 2114662a10cb4c970a6df7a6aef11074ceb89f7737ec79f7150ad1a5f3329affc5bb9e3e7b1ed7691369c61397804bee8c8876df7ecea3116277337257ee6e59
 MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d
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
 
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..000000000000
--- 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 <chewi@gentoo.org>
-Date: Sat, 17 Feb 2024 17:02:45 +0000
-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 +20,13 @@ pkg_check_modules(MINIUPNP miniupnpc REQUIRED)
- include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})
- 
- # nlohmann_json
--add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/nlohmann_json")
-+if(NOT SUNSHINE_SYSTEM_NLOHMANN_JSON)
-+    add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/nlohmann_json")
-+    set(JSON_LIBRARIES nlohmann_json::nlohmann_json)
-+else()
-+    pkg_check_modules(NLOHMANN_JSON nlohmann_json REQUIRED IMPORTED_TARGET)
-+    set(JSON_LIBRARIES PkgConfig::NLOHMANN_JSON)
-+endif()
- 
- # ffmpeg pre-compiled binaries
- if(WIN32)
-diff --git a/cmake/prep/options.cmake b/cmake/prep/options.cmake
-index 7a8d728..8a7c2f6 100644
---- a/cmake/prep/options.cmake
-+++ b/cmake/prep/options.cmake
-@@ -4,6 +4,7 @@ option(SUNSHINE_CONFIGURE_ONLY "Configure special files only, then exit." OFF)
- option(SUNSHINE_ENABLE_TRAY "Enable system tray icon. This option will be ignored on macOS." ON)
- option(SUNSHINE_REQUIRE_TRAY "Require system tray icon. Fail the build if tray requirements are not met." ON)
- 
-+option(SUNSHINE_SYSTEM_NLOHMANN_JSON "Use system installation of nlohmann_json rather than the submodule." OFF)
- option(SUNSHINE_SYSTEM_WAYLAND_PROTOCOLS "Use system installation of wayland-protocols rather than the submodule." OFF)
- 
- if(APPLE)
--- 
-2.43.0
-
diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild
index c9866cae6e67..c88478b1a500 100644
--- a/net-misc/sunshine/sunshine-9999.ebuild
+++ b/net-misc/sunshine/sunshine-9999.ebuild
@@ -165,7 +165,6 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
-	dev-cpp/nlohmann_json
 	media-libs/amf-headers
 	=media-libs/nv-codec-headers-12*
 	wayland? ( dev-libs/wayland-protocols )
@@ -181,7 +180,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-custom-ffmpeg.patch
-	"${FILESDIR}"/${PN}-system-json.patch
 	"${FILESDIR}"/${PN}-0.22.0-nvcodec.patch
 )
 
@@ -346,7 +344,6 @@ src_configure() {
 		-DSUNSHINE_ENABLE_X11=$(usex X)
 		-DSUNSHINE_ENABLE_TRAY=$(usex trayicon)
 		-DSUNSHINE_REQUIRE_TRAY=$(usex trayicon)
-		-DSUNSHINE_SYSTEM_NLOHMANN_JSON=yes
 		-DSUNSHINE_SYSTEM_WAYLAND_PROTOCOLS=yes
 		-DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir)
 		-DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d