From 2b2f431a0021b4787ca3c028cefb30ad81347778 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 19 Jan 2024 20:08:27 +0000
Subject: gentoo auto-resync : 19:01:2024 - 20:08:27

---
 media-gfx/realesrgan-ncnn-vulkan/Manifest                 |  3 ++-
 .../realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch    | 15 +++++++++++++++
 .../realesrgan-ncnn-vulkan-0.2.0-r1.ebuild                |  8 +++++---
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch

(limited to 'media-gfx/realesrgan-ncnn-vulkan')

diff --git a/media-gfx/realesrgan-ncnn-vulkan/Manifest b/media-gfx/realesrgan-ncnn-vulkan/Manifest
index 14fe253a29ba..b13fd6d073f9 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/Manifest
+++ b/media-gfx/realesrgan-ncnn-vulkan/Manifest
@@ -1,5 +1,6 @@
+AUX realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch 496 BLAKE2B 4da4d6b6f19fdc86a086866f2982dc5e6ee0f440560c7a765e924073b7bac8a6d9dcb87a892397404b29b9dc1108cabf965f950f06665d72a0b12e57076f8a47 SHA512 ab94ab82ebf7539eaea96a2992761537ae896f46677de4538d06e4dda95f2fe82413983c09c8194fd7a460dc863c00a6c31b567daf32f670ab1f21f04e86db93
 AUX realesrgan-ncnn-vulkan-default-realesrgan-x4plus-model.patch 1479 BLAKE2B 9d34821ed2af85ba048c9a9c9abae3c40b0568c723fec0db95b3a84f706a69ef2fddf31a3e613adb9d06481616b2f3681b304e77c205c4563a6ae315b6bac6bf SHA512 541dc5ae5c657caceb3e0a248428eeeb8fce58c52f8c43cfaeab47171a86532547ecbf6773faa2634be2934a659cdb913a0898f9d6a2db900baca292b073ca59
 DIST realesrgan-ncnn-vulkan-0.2.0.tar.gz 138744 BLAKE2B ec74388e789efbf6ea82a88428ff5745aa65d38b3d490b80858f91e21ff0f50333f791dadf2a626a4bee1ca88c808e41a413afce1f85d5a82aa824ecab673838 SHA512 5c845ad2fbea45eba1899582f3ca69bea679107cc4b3c49a94649b5a954117269a5b7d65ffeb8943531c71fff2ca749c06d0e3e0fd9c155ad3196f48c548d7cd
 DIST realesrgan-ncnn-vulkan-models.tar.xz 69216524 BLAKE2B ed9a1f019a48b81828221eb1cad38d0a710dfae15a13729276b040aed33bba0d326906fb0e9e162ce0ea4dc6f1bbcae92c08c4479fc3b09e854c2d5718b62c04 SHA512 4ac10f031688b18ac0920a0d848520a1fe4818a4141914ab4f4d36505abb271f4dbc538b41c3bc34586d7485773d86df2446c4af41f6d00cf4b140975ce21eda
-EBUILD realesrgan-ncnn-vulkan-0.2.0-r1.ebuild 1282 BLAKE2B 191ea0b7d1302a0fa6744c3843823c5ba824dfca69ac7db3fa8ca3792bbbba1e4f882f832c1340417c8f3002937a4bd4ce668f696478d3da9ef41fbc15f2d5ce SHA512 742d93ad0cb52d2c0e23439d0c31a15be49c20ca98cb1b82407d0e109c758abbea6352e9e91c9c91423c28ed702c16860cf89a63ed6502dbd70009be762c3934
+EBUILD realesrgan-ncnn-vulkan-0.2.0-r1.ebuild 1282 BLAKE2B ee3b5ec2523d8466f8ead1f353df3e9b76a0f4709e41f32ae027610aef515cf62f440944ae882b7e1d465245fa6f5b75a93484dcb337f536fb03efeae3256156 SHA512 1f48d1cfde45a89a4bcda051a588e06846c1fc6ce6bdf5c39c17c4234cf50330ac8c7f26eb4c780da8823c5a2346584f6cb6b2a0beedc0caaf0384380eeec014
 MISC metadata.xml 342 BLAKE2B 04b8955b1e0c980600685a6748eb4173cae733c9aeeb705c58119ede5d47b7552a81813baa21f6d49b8dc9453f4240dc77bf0a077810600d19b36b9a6f58c4f8 SHA512 9bc43c6ff21c64facfce322777ceac1422cc444e9bf3c97036ddc85d51b180c847803417a9c96d709cfff03b586ed92d1f55af04d495f1b692bedd39b925ce1c
diff --git a/media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch b/media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch
new file mode 100644
index 000000000000..ac8442f16518
--- /dev/null
+++ b/media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch
@@ -0,0 +1,15 @@
+With USE_SYSTEM_NCNN this seemingly(?) tries to check if glslang
+libraries exists only to know if system ncnn has support which is
+already ensured through DEPEND here.
+
+And then the checks fail[1] with modern glslang, so yank out the
+unnecessary block.
+
+[1] https://bugs.gentoo.org/922511
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -99,3 +99,3 @@
+ 
+-if(USE_SYSTEM_NCNN)
++if(0)
+     set(GLSLANG_TARGET_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to glslangTargets.cmake directory")
diff --git a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
index 6a38c35e4cc2..3f7d27a8c5ac 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
+++ b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,12 +25,15 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/glslang
 	dev-util/vulkan-headers
 "
+BDEPEND="
+	dev-util/glslang
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-default-realesrgan-x4plus-model.patch
+	"${FILESDIR}"/${PN}-0.2.0-no-glslang-libs.patch
 )
 
 src_prepare() {
@@ -46,7 +49,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
 		-DUSE_SYSTEM_NCNN=ON
 		-DUSE_SYSTEM_WEBP=ON
 	)
-- 
cgit v1.2.3