gentoo auto-resync : 02:03:2024 - 05:41:39

4 files changed, 70 insertions, 6 deletions

diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index 5cf08de85d46..08ad39723465 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -2,6 +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-cross-cbs.patch 2020 BLAKE2B b57c6fe66707a86b35a70945ca9b9da9c4e8bb0bba8bd0d66e9ec9e3d15121cc4a193b56ea376ff3e244d652c18ac7504d687cefd54876afcf3cb54d8024c71b SHA512 95710af147509f8c93c875513c01a596fd62fe421495395dfeef41a6230d031e779277a9a2604c4d5dce788d6ecf77e667942d3ae2d6e675ef29db86e6519734
 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
@@ -13,6 +14,6 @@ DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd
 DIST sunshine-0.21.0.tar.gz 24066116 BLAKE2B cc7ecf20ea69ed9c35c97194ca803f5a329234d1857b8f9dcee070c08ccc36de4481acc4f493c4d5f9b7fce5f5bf6986630d26233e7fc0495a688d7f2fea4696 SHA512 96e71ca6e36f7944b5f96005e2cab4287cba0fd0d2e561e6eeea7fa1cbf047576ca6debc786d34d7543dab361841fbf59cbb950e0d3413be8ba8dfb81342056e
 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 11713 BLAKE2B 420db47556ef30277914f857af1802223aaf7c2676adb0d580c60307cd5d070608c174f8da91afd1fa392f06b2469870c7ec95ef08217265a15be74ecf03d138 SHA512 2114662a10cb4c970a6df7a6aef11074ceb89f7737ec79f7150ad1a5f3329affc5bb9e3e7b1ed7691369c61397804bee8c8876df7ecea3116277337257ee6e59
+EBUILD sunshine-0.21.0.ebuild 11639 BLAKE2B 697f3a6842e158783f86c577e2dc63a49ab0a602f94a930f0959febfbe18d35007e78915b33feba404f1bd60eed42f3dba4573d4ea52298f8579db0120c7d5f5 SHA512 3f800f8168f4caf93f079346dc356018cb1da017c289ae4a7225013a100bd15740bf2f8732da7f03f2a002a8031e2fb59a68f961bf3c9b4e409f6cfc122e59ba
+EBUILD sunshine-9999.ebuild 11727 BLAKE2B 1b111f946e903e07a974cac0363d2c05abd5f8cf876cbd87a3cae0d0dd391372d3fef8d7ab33fed94f79ade86013e60696585adb9b8c299b3fe497f4287583a4 SHA512 a02a0631713c64c11838ca876b09178d54e95c06f90da0db4a61e1a50248ea29b27d20548c68cb8e5bda4e789e023718170028a5f72719fb8149d0dbd57a78d9
 MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d
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 000000000000..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 <chewi@gentoo.org>
+Date: Sun, 25 Feb 2024 16:24:25 +0000
+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-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild
index c88478b1a500..641289cdc732 100644
--- a/net-misc/sunshine/sunshine-9999.ebuild
+++ b/net-misc/sunshine/sunshine-9999.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