[gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/, media-gfx/realesrgan-ncnn-vulkan/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/, media-gfx/realesrgan-ncnn-vulkan/files/

[Ionen Wolkens]

commit:     70e9f9a19f7cb150d653ba6fe244253d1426bbf5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 19:01:40 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 19:07:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e9f9a1

media-gfx/realesrgan-ncnn-vulkan: fix build "with" glslang-1.3.275

Do not quite see why this is even looking for glslang libraries
at all with USE_SYSTEM_NCNN, there is nothing that use it that
I can see. System ncnn *does* use glslang on the other hand
(maybe it's trying to check if system ncnn has support? ...but
then RDEPEND already ensures this).

Meanwhile system ncnn itself (which is more recent) seems to
be handling current glslang properly.

Let's just yank out the entire block.

That aside, this still looks for glslangValidator, so the
dependency should instead be BDEPEND.

Closes: https://bugs.gentoo.org/922511
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch    | 15 +++++++++++++++
 .../realesrgan-ncnn-vulkan-0.2.0-r1.ebuild                |  8 +++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

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
 	)