summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD57
3 files changed, 32 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92e291677cc6..0f457c7d4026 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
pkgbase = srmd-ncnn-vulkan
pkgdesc = SRMD super resolution implemented with ncnn library
pkgver = 20210210
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/nihui/srmd-ncnn-vulkan
arch = i686
arch = x86_64
license = MIT
makedepends = git
makedepends = cmake
- makedepends = glslang
+ makedepends = glslang-git
makedepends = vulkan-headers
+ makedepends = ncnn
depends = vulkan-icd-loader
depends = vulkan-driver
+ depends = libwebp
+ provides = srmd-ncnn-vulkan
conflicts = srmd-ncnn-vulkan-git
- source = git://github.com/nihui/srmd-ncnn-vulkan.git#tag=20210210
- sha256sums = SKIP
+ conflicts = srmd-ncnn-vulkan-bin
+ source = https://github.com/nihui/srmd-ncnn-vulkan/archive/refs/tags/20210210.tar.gz
+ sha256sums = c4da46d26709429da5c59523102dcd5e5269fcb57ebaf036acf7224f59cd2958
pkgname = srmd-ncnn-vulkan
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index b825fb62c8d6..c3d9242ec370 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,41 @@
-# Maintainer: Mitch Bigelow <ipha00@gmail.com>
-#
+# Maintainer: PumpkinCheshire <sollyonzou at gmail dot net>
+# Contributor: Mitch Bigelow <ipha00@gmail.com>
pkgname=srmd-ncnn-vulkan
pkgver=20210210
-pkgrel=1
+pkgrel=2
pkgdesc="SRMD super resolution implemented with ncnn library"
url="https://github.com/nihui/srmd-ncnn-vulkan"
license=('MIT')
-depends=('vulkan-icd-loader' 'vulkan-driver')
-makedepends=('git' 'cmake' 'glslang' 'vulkan-headers')
-conflicts=('srmd-ncnn-vulkan-git')
-# provides=('srmd-ncnn-vulkan')
+depends=('vulkan-icd-loader' 'vulkan-driver' 'libwebp')
+makedepends=('git' 'cmake' 'glslang-git' 'vulkan-headers' 'ncnn')
+conflicts=('srmd-ncnn-vulkan-git' 'srmd-ncnn-vulkan-bin')
+provides=('srmd-ncnn-vulkan')
arch=('i686' 'x86_64')
-source=(
- "git://github.com/nihui/srmd-ncnn-vulkan.git#tag=${pkgver}"
-)
-sha256sums=(
- 'SKIP'
-)
-
-# pkgver() {
-# cd "${srcdir}/srmd-ncnn-vulkan"
-# git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-# }
+source=("https://github.com/nihui/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
+sha256sums=('c4da46d26709429da5c59523102dcd5e5269fcb57ebaf036acf7224f59cd2958')
prepare() {
- cd "${srcdir}/srmd-ncnn-vulkan"
-
- # init ncnn submodule
- git submodule update --init --recursive
+ sed -i 's|path_t model = PATHSTR("models-srmd")|path_t model = PATHSTR("/usr/share/srmd-ncnn-vulkan/models-srmd/")|' "${pkgname}-${pkgver}"/src/main.cpp
- # Fix default model path
- sed -i 's|path_t model = PATHSTR("models-srmd")|path_t model = PATHSTR("/usr/share/srmd-ncnn-vulkan/models-srmd")|' src/main.cpp
+ sed -i 's|return get_executable_directory() + path;|return "/usr/share/srmd-ncnn-vulkan/" + path;|' "${pkgname}-${pkgver}"/src/filesystem_utils.h
}
build() {
- cd "${srcdir}/srmd-ncnn-vulkan/src"
- mkdir -p build
- cd build
- cmake \
+ cmake -B build -S "${pkgname}-${pkgver}"/src \
-DCMAKE_INSTALL_PREFIX=/usr \
- ..
- make
+ -DGLSLANG_TARGET_DIR=/usr/lib/cmake \
+ -DUSE_SYSTEM_NCNN=on \
+ -DUSE_SYSTEM_WEBP=on
+ cmake --build build
}
package() {
+ install -Dm755 -t "${pkgdir}/usr/bin" build/${pkgname}
+ install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ${pkgname}-${pkgver}/LICENSE
- cd "${srcdir}/srmd-ncnn-vulkan"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- install -Dm755 "src/build/srmd-ncnn-vulkan" "${pkgdir}/usr/bin/srmd-ncnn-vulkan"
-
- cd "${srcdir}/srmd-ncnn-vulkan/models"
+ cd "${srcdir}/${pkgname}-${pkgver}/models/"
for f in models-*/*; do
- install -Dm 644 "$f" ${pkgdir}/usr/share/srmd-ncnn-vulkan/"$f"
+ install -Dm 644 "$f" ${pkgdir}/usr/share/${pkgname}/"$f"
done
}