gentoo auto-resync : 14:05:2024 - 00:01:24

4 files changed, 54 insertions, 63 deletions

diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index e84434f96bd8..b62664c9bbd3 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -1,7 +1,7 @@
 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
-AUX sunshine-find-npm.patch 4320 BLAKE2B 8549ec578c3b2b8f937f717b75aac9480e22ad689fd777529fa1b91f13abaf3070734906b6b41450c8608ddc8644bd69f86f2623ffc8c387d1f8ed12ffa5605d SHA512 dfe33fa065e01c76b02e7c9a076679822e8a617c9649d264f384db2cb0586552f9ef5092c131217e5cbac0c5aff924722bf9f4a55d60cd167b2885631b896da2
+AUX sunshine-find-npm.patch 3778 BLAKE2B 9862cb4f8926438a588275446d02a84e0341dcafacf7037338151eb0e3020a89aa8f583d52efcebca032fd8f87b12ff6f6545f288ae1431f84efd9bc6b381d18 SHA512 4ed7da0be9d8608e71fd17b8af7ef159920d9313278c0f7f21390144b510dbfa0b2a4433bca5664e507c6210e1f032c5c014448e85a44eba891df71fc316c2b9
 DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7
 DIST LizardByte-tray-4d8b798cafdd11285af9409c16b5f792968e0045.tar.gz 1068346 BLAKE2B 6da778c6dc1efb1147363de239a4170dad23288322285b847ed86837b316162bce861b848b8371ea8562efbfa0d36dc6921e8a36da0a05740e3f6aa1da29fae1 SHA512 9c6535a6a3ba4489b5af0821a8c42bbb706259c10d70237bd3d3b31283a7e8ad0e3c2326a34c229d899389156909c36252a931ea47eef8daeb8b7c54b26e92cb
 DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44
@@ -12,6 +12,6 @@ DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd
 DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16
 DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa
 DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb
-EBUILD sunshine-0.23.1.ebuild 11922 BLAKE2B ebff5aa558d58dc3e1d0c90d64d4e1aa61bb19f1a344575af1543f617c0293cf8d57fed61d256ed8285141f275d2fcf89b32e718d5a200b62e0377576becdbc5 SHA512 14e41237f436ccd6ebe68385a0478ec0d5d92c1ca814f25e37cdf4c252b769f3c6486091ad4e5cbcd946ca8ea0a375e16131f3bb94049007a5281eb6f78f0179
-EBUILD sunshine-9999.ebuild 11922 BLAKE2B ebff5aa558d58dc3e1d0c90d64d4e1aa61bb19f1a344575af1543f617c0293cf8d57fed61d256ed8285141f275d2fcf89b32e718d5a200b62e0377576becdbc5 SHA512 14e41237f436ccd6ebe68385a0478ec0d5d92c1ca814f25e37cdf4c252b769f3c6486091ad4e5cbcd946ca8ea0a375e16131f3bb94049007a5281eb6f78f0179
+EBUILD sunshine-0.23.1.ebuild 11943 BLAKE2B 4c9dfbf39d87da8cec615660c9d4c315a28692faed80bd67da952d3d6beeb2dc5a82f41277e37d712d9069384300a20ba5a7c3ecc3b74ab7b64ad1a87178d774 SHA512 bc5a654cec73c65b89b3c76eef78751de45711c91c47d0e1d4ede52ba31eb59fb91ce12778781ebd9de58bf29ab12194cd0d61d06a9922f2d7b7988899da4a4a
+EBUILD sunshine-9999.ebuild 11907 BLAKE2B 645e693f78bfe3fbad37496c06d0f5a620260766ae18da70bc28ae82a21d9be9e8635012764edfc49a11976fd5e9c0a3a2c4a3524edede64e45d8c2353515233 SHA512 79b8d4c6d8311e2444a554eb9ad75cfef74cc126096112919ee87bf4513e92a3834fd07d6248aafb3032290ab296bd96eb64e3d00c8b27b67d049e946aeaa59a
 MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d
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 <chewi@gentoo.org>
-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 $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${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 "$<$<BOOL:${WIN32}>: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}" "$<$<BOOL:${WIN32}>: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 <chewi@gentoo.org>
-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 cached NPM modules
-instead, but it turns out these are very sensitive to the NPM version.
----
- cmake/targets/common.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake
-index 04d8e954..5c489551 100644
---- a/cmake/targets/common.cmake
-+++ b/cmake/targets/common.cmake
-@@ -16,11 +16,12 @@ else()
- 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 "${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
- 
- # platform specific target definitions
- if(WIN32)
--- 
-2.44.0
-
diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild
index a708fffba539..f700216a63b6 100644
--- a/net-misc/sunshine/sunshine-0.23.1.ebuild
+++ b/net-misc/sunshine/sunshine-0.23.1.ebuild
@@ -359,7 +359,7 @@ src_compile() {
 	emake -C "${WORKDIR}"/ffmpeg-build V=1 install
 	CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_compile
 	CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_build install
-	CMAKE_USE_DIR="${S}" cmake_src_compile
+	CMAKE_USE_DIR="${S}" npm_config_offline=1 cmake_src_compile
 }
 
 pkg_postinst() {
diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild
index a708fffba539..500879c32b40 100644
--- a/net-misc/sunshine/sunshine-9999.ebuild
+++ b/net-misc/sunshine/sunshine-9999.ebuild
@@ -178,7 +178,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-custom-ffmpeg.patch
 	"${FILESDIR}"/${PN}-0.22.0-nvcodec.patch
-	"${FILESDIR}"/${PN}-find-npm.patch
 )
 
 # Make this mess a bit simpler.
@@ -359,7 +358,7 @@ src_compile() {
 	emake -C "${WORKDIR}"/ffmpeg-build V=1 install
 	CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_compile
 	CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_build install
-	CMAKE_USE_DIR="${S}" cmake_src_compile
+	CMAKE_USE_DIR="${S}" npm_config_offline=1 cmake_src_compile
 }
 
 pkg_postinst() {