public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/
@ 2022-11-21 20:24 Piotr Karbowski
  0 siblings, 0 replies; 5+ messages in thread
From: Piotr Karbowski @ 2022-11-21 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     12d056ad1cb5c87e1bb0098ebf76feea16caf526
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 20:23:18 2022 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 20:24:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d056ad

media-gfx/realesrgan-ncnn-vulkan: new package.

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 media-gfx/realesrgan-ncnn-vulkan/Manifest          |  2 +
 media-gfx/realesrgan-ncnn-vulkan/metadata.xml      | 11 +++++
 .../realesrgan-ncnn-vulkan-0.2.0.ebuild            | 56 ++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/media-gfx/realesrgan-ncnn-vulkan/Manifest b/media-gfx/realesrgan-ncnn-vulkan/Manifest
new file mode 100644
index 000000000000..82a91a75b8ae
--- /dev/null
+++ b/media-gfx/realesrgan-ncnn-vulkan/Manifest
@@ -0,0 +1,2 @@
+DIST Real-ESRGAN-v0.2.5.0-models.tar.xz 39195532 BLAKE2B 3ff956be8a4a8890cc7b42f9e5f9e12d769f83f918762b75fd3d31e4659b793eca8d107b89fb39b8d601d14775f448ef35de3e9f437d51efb841a910fb56f88b SHA512 f1ede62854d76b6bf2278e074a21893ad4010a8327fb6744bc4af63717a0dfa342f618bfa916886f6e05a31e71feed3c1244395572688d6d531feec08431aace
+DIST realesrgan-ncnn-vulkan-0.2.0.tar.gz 138744 BLAKE2B ec74388e789efbf6ea82a88428ff5745aa65d38b3d490b80858f91e21ff0f50333f791dadf2a626a4bee1ca88c808e41a413afce1f85d5a82aa824ecab673838 SHA512 5c845ad2fbea45eba1899582f3ca69bea679107cc4b3c49a94649b5a954117269a5b7d65ffeb8943531c71fff2ca749c06d0e3e0fd9c155ad3196f48c548d7cd

diff --git a/media-gfx/realesrgan-ncnn-vulkan/metadata.xml b/media-gfx/realesrgan-ncnn-vulkan/metadata.xml
new file mode 100644
index 000000000000..c611331d3419
--- /dev/null
+++ b/media-gfx/realesrgan-ncnn-vulkan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xinntao/Real-ESRGAN-ncnn-vulkan</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0.ebuild b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0.ebuild
new file mode 100644
index 000000000000..71a046f87d9e
--- /dev/null
+++ b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="NCNN implementation of Real-ESRGAN"
+HOMEPAGE="https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan"
+SRC_URI="
+	https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/Real-ESRGAN-v0.2.5.0-models.tar.xz
+"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/ncnn:=[vulkan]
+	media-libs/libwebp:=
+	media-libs/vulkan-loader"
+DEPEND="
+	${RDEPEND}
+	dev-util/glslang
+	dev-util/vulkan-headers"
+
+S="${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}"
+
+src_prepare() {
+	rm -rf "src/libwebp" "src/ncnn"
+
+	CMAKE_USE_DIR=${S}/src
+	cmake_src_prepare
+
+	# Update all paths to match installation for models.
+	sed "s%PATHSTR(\"models\")%PATHSTR(\"${EPREFIX}/usr/share/${PN}/models\")%g" \
+		-i src/main.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DUSE_SYSTEM_NCNN=ON
+		-DUSE_SYSTEM_WEBP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/realesrgan-ncnn-vulkan
+
+	insinto /usr/share/${PN}/models
+	doins -r ../models/.
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/
@ 2022-12-04  9:56 Piotr Karbowski
  0 siblings, 0 replies; 5+ messages in thread
From: Piotr Karbowski @ 2022-12-04  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e8812cf3de296cbf347557b4df493ba7dfd744e6
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 09:55:32 2022 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 09:55:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8812cf3

media-gfx/realesrgan-ncnn-vulkan: new default model; added missing model.

Closes: https://bugs.gentoo.org/883447
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 media-gfx/realesrgan-ncnn-vulkan/Manifest          |  2 +-
 .../realesrgan-ncnn-vulkan-0.2.0.ebuild            | 56 ----------------------
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/media-gfx/realesrgan-ncnn-vulkan/Manifest b/media-gfx/realesrgan-ncnn-vulkan/Manifest
index 82a91a75b8ae..c83810c8caea 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/Manifest
+++ b/media-gfx/realesrgan-ncnn-vulkan/Manifest
@@ -1,2 +1,2 @@
-DIST Real-ESRGAN-v0.2.5.0-models.tar.xz 39195532 BLAKE2B 3ff956be8a4a8890cc7b42f9e5f9e12d769f83f918762b75fd3d31e4659b793eca8d107b89fb39b8d601d14775f448ef35de3e9f437d51efb841a910fb56f88b SHA512 f1ede62854d76b6bf2278e074a21893ad4010a8327fb6744bc4af63717a0dfa342f618bfa916886f6e05a31e71feed3c1244395572688d6d531feec08431aace
 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

diff --git a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0.ebuild b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0.ebuild
deleted file mode 100644
index 71a046f87d9e..000000000000
--- a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="NCNN implementation of Real-ESRGAN"
-HOMEPAGE="https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan"
-SRC_URI="
-	https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/Real-ESRGAN-v0.2.5.0-models.tar.xz
-"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/ncnn:=[vulkan]
-	media-libs/libwebp:=
-	media-libs/vulkan-loader"
-DEPEND="
-	${RDEPEND}
-	dev-util/glslang
-	dev-util/vulkan-headers"
-
-S="${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}"
-
-src_prepare() {
-	rm -rf "src/libwebp" "src/ncnn"
-
-	CMAKE_USE_DIR=${S}/src
-	cmake_src_prepare
-
-	# Update all paths to match installation for models.
-	sed "s%PATHSTR(\"models\")%PATHSTR(\"${EPREFIX}/usr/share/${PN}/models\")%g" \
-		-i src/main.cpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-		-DUSE_SYSTEM_NCNN=ON
-		-DUSE_SYSTEM_WEBP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/realesrgan-ncnn-vulkan
-
-	insinto /usr/share/${PN}/models
-	doins -r ../models/.
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/
@ 2022-12-04 20:17 Ionen Wolkens
  0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2022-12-04 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ba80a2e16e56035eb9098ddee8216fb7392c460e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 20:17:03 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 20:17:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba80a2e1

media-gfx/realesrgan-ncnn-vulkan: add myself as a maintainer

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

 media-gfx/realesrgan-ncnn-vulkan/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media-gfx/realesrgan-ncnn-vulkan/metadata.xml b/media-gfx/realesrgan-ncnn-vulkan/metadata.xml
index c611331d3419..5a3386deab23 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/metadata.xml
+++ b/media-gfx/realesrgan-ncnn-vulkan/metadata.xml
@@ -5,6 +5,10 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">xinntao/Real-ESRGAN-ncnn-vulkan</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/
@ 2023-10-10 20:20 Ionen Wolkens
  0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2023-10-10 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     18ea2bc76d4917cb57aa5f94de13a08861ffca32
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 19:29:10 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:18:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ea2bc7

media-gfx/realesrgan-ncnn-vulkan: tidy ebuild

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

 .../realesrgan-ncnn-vulkan-0.2.0-r1.ebuild         | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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 56946abc7263..abca6664655a 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,11 @@ inherit cmake
 DESCRIPTION="NCNN implementation of Real-ESRGAN"
 HOMEPAGE="https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan"
 SRC_URI="
-	https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${PN}-models.tar.xz
+	https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-models.tar.xz
 "
+S=${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}
 
 LICENSE="MIT BSD"
 SLOT="0"
@@ -19,27 +21,27 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-libs/ncnn:=[vulkan]
 	media-libs/libwebp:=
-	media-libs/vulkan-loader"
+	media-libs/vulkan-loader
+"
 DEPEND="
 	${RDEPEND}
 	dev-util/glslang
-	dev-util/vulkan-headers"
+	dev-util/vulkan-headers
+"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-default-realesrgan-x4plus-model.patch
+	"${FILESDIR}"/${PN}-default-realesrgan-x4plus-model.patch
 )
 
-S="${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}"
-
 src_prepare() {
-	rm -rf "src/libwebp" "src/ncnn"
-
 	CMAKE_USE_DIR=${S}/src
 	cmake_src_prepare
 
 	# Update all paths to match installation for models.
 	sed "s%PATHSTR(\"models\")%PATHSTR(\"${EPREFIX}/usr/share/${PN}/models\")%g" \
 		-i src/main.cpp || die
+
+	rm -r src/libwebp src/ncnn || die
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/
@ 2023-10-10 20:20 Ionen Wolkens
  0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2023-10-10 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     9ea3a75e7c240442fe4ca3d7eec79f8917ccf38f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 19:35:26 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:18:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea3a75e

media-gfx/realesrgan-ncnn-vulkan: stabilize 0.2.0-r1 for amd64

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

 media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 abca6664655a..6a38c35e4cc2 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
@@ -16,7 +16,7 @@ S=${WORKDIR}/Real-ESRGAN-ncnn-vulkan-${PV}
 
 LICENSE="MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/ncnn:=[vulkan]


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-10-10 20:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-04  9:56 [gentoo-commits] repo/gentoo:master commit in: media-gfx/realesrgan-ncnn-vulkan/ Piotr Karbowski
  -- strict thread matches above, loose matches on Subject: below --
2023-10-10 20:20 Ionen Wolkens
2023-10-10 20:20 Ionen Wolkens
2022-12-04 20:17 Ionen Wolkens
2022-11-21 20:24 Piotr Karbowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox