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

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

[Ionen Wolkens]

commit:     48c0b0fc94c19694b7fe2a98fc90ffa38a7519c4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 10 22:09:52 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 22:12:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c0b0fc

media-gfx/waifu2x-ncnn-vulkan: remove automatic lto check

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

 .../files/waifu2x-ncnn-vulkan-20210521-no-lto.patch    | 18 ++++++++++++++++++
 .../waifu2x-ncnn-vulkan-20210521.ebuild                |  6 +++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch
new file mode 100644
index 000000000000..301f6fca4276
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch
@@ -0,0 +1,18 @@
+Users should be the ones to choose to add -flto or not and how. The test
+may also cause unnecessary noise wrt https://bugs.gentoo.org/830950
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -42,13 +42,4 @@
+ 
+ # enable global link time optimization
+-cmake_policy(SET CMP0069 NEW)
+-set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+-include(CheckIPOSupported)
+-check_ipo_supported(RESULT ipo_supported OUTPUT ipo_supported_output)
+-if(ipo_supported)
+-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+-else()
+-    message(WARNING "IPO is not supported: ${ipo_supported_output}")
+-endif()
+ 
+ if(USE_SYSTEM_NCNN)

diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
index 3079c5c096f0..cc5fc8bd42a0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,10 @@ DEPEND="
 	${RDEPEND}
 	dev-util/vulkan-headers"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+)
+
 src_prepare() {
 	CMAKE_USE_DIR="${S}/src"
 	cmake_src_prepare

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

[Ionen Wolkens]

commit:     5cac8d2fb3113a788016ca1f316d3c424444490a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 19:02:23 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 19:07:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cac8d2f

media-gfx/waifu2x-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/922512
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

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

diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch
new file mode 100644
index 000000000000..7743c4267180
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-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/922512
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,3 +55,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/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
index d67e89271687..333b2c58ac8d 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.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
@@ -20,12 +20,15 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/glslang
 	dev-util/vulkan-headers
 "
+BDEPEND="
+	dev-util/glslang
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+	"${FILESDIR}"/${PN}-20220728-no-glslang-libs.patch
 )
 
 src_prepare() {
@@ -39,7 +42,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
 		-DUSE_SYSTEM_NCNN=ON
 		-DUSE_SYSTEM_WEBP=ON
 	)

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

[Ionen Wolkens]

commit:     a52b4c8926e00e9667cd91add7a1bd7f062ffad0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 09:46:28 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May  4 10:20:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52b4c89

media-gfx/waifu2x-ncnn-vulkan: add 20250504

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-gfx/waifu2x-ncnn-vulkan/Manifest             |  1 +
 .../waifu2x-ncnn-vulkan-20250504-shared-ncnn.patch | 16 +++++++
 .../waifu2x-ncnn-vulkan-20250504.ebuild            | 55 ++++++++++++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index a4b2f808a5b4..280171d0b5ca 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1 +1,2 @@
 DIST waifu2x-ncnn-vulkan-20220728.tar.gz 34076924 BLAKE2B 6ed310d57af52286a288b151f67a989ac41f8e248b2ad5f05392781a429c9f0ff1d79e8816c8c464cb5686692c2b4fe5dc2d50c4fc713a4887d044ee3cfda199 SHA512 ea17cbbcb7318586793222c6c7139f67395c49c567b601969b829fc426eb517308509b7c1da69171fcbf8e68baa5cec3e52e98159e3c5e6c35ce47a8514dadb7
+DIST waifu2x-ncnn-vulkan-20250504.tar.gz 34076915 BLAKE2B faac7a57062d240c32aa4bd45a2bda1183c91eaf1c67601476981f59f5540f888c5d2ad6328b48dddc1a03e300a3fe776920b477288dcb6ccf131e270459608f SHA512 174ac15420eb2b39477fecfb13b9ac328cec7328ffeb29e46d574c1852645b82688d6276443d4c2490e05766deea4c1f7513873875608a5ed992fffbaa8f8e16

diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20250504-shared-ncnn.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20250504-shared-ncnn.patch
new file mode 100644
index 000000000000..27287c48ac9d
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20250504-shared-ncnn.patch
@@ -0,0 +1,16 @@
+Build system tries to get ncnn's dependencies and link with them
+likely(?) expecting a static ncnn. These checks have caused issues
+before [1] and even if that was fixed, there is no reason to do
+this and DEPEND for nothing.
+
+Cannot do -DUSE_SYSTEM_NCNN=no given there is another condition
+using that that we do need.
+
+[1] https://bugs.gentoo.org/922512
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -53,3 +53,3 @@
+ 
+-if(USE_SYSTEM_NCNN)
++if(0)
+     find_package(Threads)

diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20250504.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20250504.ebuild
new file mode 100644
index 000000000000..9c2196d0c2fd
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20250504.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="waifu2x converter using ncnn and vulkan"
+HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
+SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/ncnn:=[vulkan]
+	media-libs/libwebp:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glslang
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+	"${FILESDIR}"/${PN}-20250504-shared-ncnn.patch
+)
+
+src_prepare() {
+	CMAKE_USE_DIR=${S}/src
+	cmake_src_prepare
+
+	# match the models path that is used in src_install
+	sed -e "/PATHSTR\|model path/s|models-|${EPREFIX}/usr/share/${PN}/models-|" \
+		-i src/main.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_NCNN=yes
+		-DUSE_SYSTEM_WEBP=yes
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
+
+	insinto /usr/share/${PN}
+	doins -r models/.
+
+	einstalldocs
+}