summaryrefslogtreecommitdiff
path: root/media-gfx/waifu2x-ncnn-vulkan
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
commite748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /media-gfx/waifu2x-ncnn-vulkan
parent908778078736bd36f7a60a2d576d415cb8e000fa (diff)
gentoo resync : 31.05.2021
Diffstat (limited to 'media-gfx/waifu2x-ncnn-vulkan')
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/Manifest10
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/metadata.xml4
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild40
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild40
-rw-r--r--media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild (renamed from media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild)41
5 files changed, 28 insertions, 107 deletions
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 2f27df705ca0..e74512568593 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,9 +1,5 @@
-DIST waifu2x-ncnn-vulkan-20200224.tar.gz 34063828 BLAKE2B 9fa00abd31f0d81dd785be5253e44f5bd4082ae9b2fcae747562eb6c577fd7cccdfeaf7421d09c54119fd36285dffcc68d2889ddc06d1a6ddf47ea418066367e SHA512 13531a186817da99efb60fc0b16d0d3f455d0f2d2c9b4b53ddaedf7c50f622b2e5385e4f5dd29668cf845444b39645f0b7e810ab5084aa1e3ca6dbaf424a4e13
-DIST waifu2x-ncnn-vulkan-20200414.tar.gz 34063752 BLAKE2B eb52cc3cf857bdb428497acf8721d51abd6e067b4ae2f126833dfcf8402eae118cfa112b310b366e3e945b871b8c3306e5d826426c43e66b6e1055729644f222 SHA512 c0c5d40fdbf0b643b589d5bca5460ec59fbf38ede33af510c4b30b3211f18cd44d665980a11c13ee922cacf7a05d89b076078bcb8fa59c0523ad6b985a804d97
-DIST waifu2x-ncnn-vulkan-20200818.tar.gz 34073325 BLAKE2B 125c0b975e6aab20fc20563c1edc669a4741779366f9aff20d0f695f56f29d0e1728c1fd1130cdaf4adb6a2c8dad348e262580702519004581b2055ae38ac315 SHA512 6f40885fd91cde3206198da3bf2103d1867a8f35549340cc697819dea2b3e06932203a95a7fda2c636658b40fdc1d3f0f4c4e3e13ba142f9a8ad8475ff1b8f58
DIST waifu2x-ncnn-vulkan-20210210.tar.gz 34076481 BLAKE2B 821b59d5e681caf4bbdeb0e3576a6df0e257a0f8fdc68c3f4152c5f35cb2d288245051dce874e009af6556b4c7e4fffe1fa261872baf2493e056a78c847acc0d SHA512 56ed4dfda71054f3ebfd6c4c11bcb9351a676ace8405cdc309bd16d18eb65ad0fd230fb943a0ba1dcb3afdb517e7f86bf6df2eadff6e754d296304135cd885be
-EBUILD waifu2x-ncnn-vulkan-20200224.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
-EBUILD waifu2x-ncnn-vulkan-20200414.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
-EBUILD waifu2x-ncnn-vulkan-20200818.ebuild 1045 BLAKE2B ff8530866c99de62b34a885361e10616fa54b8689d9e690941ac01397bde024204ac70801109b0b945afb28086c17a2ee33ff9284b62528d2f95c3d399e0f560 SHA512 7115cf9671e25838e1d160c55e552ba0e405584c961549c728a2f86481a062b88f02b11bb7d46f6d5a30057d19497ad49572a1a1e18a53bc455324a499351acd
+DIST waifu2x-ncnn-vulkan-20210521.tar.gz 34076523 BLAKE2B d04c3ac1152be899292730fe06f317c92f1334ea3f91cc6208444574c271d401152b4432bf5293f7193f0c318ca1685145754dd78ad0a8523aefa0fd56d40b4a SHA512 b1a0202a94deb9faadda34c5d46bceabec7ee00960676ca98090af4101bb63648fdc266cc608bfc621a3ec65c8c5f9503a02a4db4e51e9b2048d574c7a7f368a
EBUILD waifu2x-ncnn-vulkan-20210210.ebuild 1045 BLAKE2B 6a82c95e27af54e06e38adc6616612f276a12a2510516c2a166b95872f63a0b33e4a764bb0293184bb87b9c14f9d6570ce321a090266037b35f7c13ec990bd55 SHA512 d18ebedcdd5ef779c75ac2281b3f787309b74710d38c3d36da3e723bcc22243b216a3fa63fefc760b12a5d70c191511302e919aa8e513f88ae7eae1121358ab4
-MISC metadata.xml 342 BLAKE2B 718aec175f149d204eb6afabb3a2a59e47366538f16d346a1baeeae03afdfb68bd4c5c39d642af862400f0736644141eb156b43014f4125df61a0b9979bdb83d SHA512 a9b596ab9b9e2bd6052bbb11d7b19e2b6a4fbf69935345498cf5f5fa4934731bfccaf3e3391da0260e6f165198f71545ae8f86b1b01b8507fb9b003cd7e56809
+EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1107 BLAKE2B 83be2724db19d19ae98b403949d38573e825234a74e8709d4deecbebdbfbe2b002af5eb1a9bbae57ebe959e2294eac4810ad908d417f4523fabb456e1e73cf33 SHA512 06521bb7ab249d3bed620343d34b7a869b2dc8b8e847c577bc66d3a7d2aa28e359efe3c9defec17d9b3c4d282ef3975eb3125c64a8ba32b63b7d25f3d1ec6720
+MISC metadata.xml 464 BLAKE2B ac1978d9a9aa3202c24dedf74bc70aa2956396c89da177c2d63bc3f8f0cbb50fa74a991c887bf5cdc75733bd7d3ffdc0ee4d96fffadae2e9f657d3799c05af7a SHA512 278b4b063cedc5d27b208bb055e54bd2261e0265c09b6046b25af1c448e9b60eef925889986aad5bb1c7c9670ea9eb82652c249f6d585bd29502565e2943f177
diff --git a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
index 7c9fd1249e8c..6dafc8f991c6 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
+++ b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
@@ -5,6 +5,10 @@
<email>slashbeast@gentoo.org</email>
<name>Piotr Karbowski</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>sudinave@gmail.com</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
<upstream>
<remote-id type="github">nihui/waifu2x-ncnn-vulkan</remote-id>
</upstream>
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
deleted file mode 100644
index 77225416ea89..000000000000
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-libs/ncnn
- media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-#S="${WORKDIR}/${P}/src"
-CMAKE_USE_DIR="${S}/src"
-
-src_prepare() {
- # Make finding models actually possible.
- sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp\
-
- cmake_src_prepare
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
-
- insinto "/usr/share/${PN}"
- doins -r models/*
-}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild
deleted file mode 100644
index 77225416ea89..000000000000
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-libs/ncnn
- media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-#S="${WORKDIR}/${P}/src"
-CMAKE_USE_DIR="${S}/src"
-
-src_prepare() {
- # Make finding models actually possible.
- sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp\
-
- cmake_src_prepare
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
-
- insinto "/usr/share/${PN}"
- doins -r models/*
-}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
index 5800b9b7f2e3..3079c5c096f0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
@@ -7,37 +7,36 @@ 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"
-KEYWORDS="~amd64 ~x86"
LICENSE="MIT"
SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+# Pin dev-libs/ncnn near bundled copy until more stable.
+RDEPEND="
+ ~dev-libs/ncnn-20210525[vulkan]
+ dev-util/glslang
+ media-libs/libwebp:=
+ media-libs/vulkan-loader"
DEPEND="
- ~dev-libs/ncnn-20200727
- media-libs/vulkan-loader
- media-libs/libwebp
- dev-util/glslang"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-CMAKE_USE_DIR="${S}/src"
+ ${RDEPEND}
+ dev-util/vulkan-headers"
src_prepare() {
- # Make finding models actually possible.
- sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp
-
+ 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"
- "-DGLSLANG_TARGET_DIR=${EPREFIX}/usr/$(get_libdir)/cmake"
+ -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+ -DUSE_SYSTEM_NCNN=ON
+ -DUSE_SYSTEM_WEBP=ON
)
cmake_src_configure
@@ -46,6 +45,8 @@ src_configure() {
src_install() {
dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
- insinto "/usr/share/${PN}"
- doins -r models/*
+ insinto /usr/share/${PN}
+ doins -r models/.
+
+ einstalldocs
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 13:26:48 +0000