commit: bf4d83c6a5b0d4c7acd75a490b86a5aee97d394b Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jun 5 05:06:48 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jun 5 05:06:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4d83c6
media-gfx/waifu2x-ncnn-vulkan: drop 20220728 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-gfx/waifu2x-ncnn-vulkan/Manifest | 1 - ...fu2x-ncnn-vulkan-20220728-no-glslang-libs.patch | 15 ------ .../waifu2x-ncnn-vulkan-20220728.ebuild | 59 ---------------------- 3 files changed, 75 deletions(-) diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest index 280171d0b5ca..6adf0d570ce9 100644 --- a/media-gfx/waifu2x-ncnn-vulkan/Manifest +++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest @@ -1,2 +1 @@ -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-20220728-no-glslang-libs.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch deleted file mode 100644 index 7743c4267180..000000000000 --- a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 333b2c58ac8d..000000000000 --- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 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:= - media-libs/vulkan-loader -" -DEPEND=" - ${RDEPEND} - dev-util/vulkan-headers -" -BDEPEND=" - dev-util/glslang -" - -PATCHES=( - "${FILESDIR}"/${PN}-20210521-no-lto.patch - "${FILESDIR}"/${PN}-20220728-no-glslang-libs.patch -) - -src_prepare() { - CMAKE_USE_DIR=${S}/src - cmake_src_prepare - - # Update all paths to match installation for models. - sed "/PATHSTR\|model path/s|models-|${EPREFIX}/usr/share/${PN}/models-|" \ - -i src/main.cpp || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_SYSTEM_NCNN=ON - -DUSE_SYSTEM_WEBP=ON - ) - - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan - - insinto /usr/share/${PN} - doins -r models/. - - einstalldocs -}
