refresh

3 files changed, 28 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21f5ceb1b0ec..d421cda1ad7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = srmd-ncnn-vulkan-git
 	pkgdesc = SRMD super resolution implemented with ncnn library
-	pkgver = 20200606.r0.g1a7c13e
+	pkgver = 20210210.r0.g1e14194
 	pkgrel = 1
 	url = https://github.com/nihui/srmd-ncnn-vulkan
 	arch = i686
@@ -8,13 +8,16 @@ pkgbase = srmd-ncnn-vulkan-git
 	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
-	source = git://github.com/nihui/srmd-ncnn-vulkan.git
+	conflicts = srmd-ncnn-vulkan-bin
+	source = git+https://github.com/nihui/srmd-ncnn-vulkan.git
 	sha256sums = SKIP
 
 pkgname = srmd-ncnn-vulkan-git
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 15e02ea8d4c7..d3cde22e70ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,57 +2,46 @@
 #
 
 pkgname=srmd-ncnn-vulkan-git
-pkgver=20200606.r0.g1a7c13e
+pkgver=20210210.r0.g1e14194
 pkgrel=1
 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')
+depends=('vulkan-icd-loader' 'vulkan-driver' 'libwebp')
+makedepends=('git' 'cmake' 'glslang-git' 'vulkan-headers' 'ncnn')
+conflicts=('srmd-ncnn-vulkan' 'srmd-ncnn-vulkan-bin')
 provides=('srmd-ncnn-vulkan')
 arch=('i686' 'x86_64')
 source=(
-    "git://github.com/nihui/srmd-ncnn-vulkan.git"
-)
-sha256sums=(
-    'SKIP'
+    "git+https://github.com/nihui/srmd-ncnn-vulkan.git"
 )
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/srmd-ncnn-vulkan"
-    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    git -C ${pkgname%-git} describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 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%-git}"/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%-git}"/src/filesystem_utils.h
 }
 
 build() {
-    cd "${srcdir}/srmd-ncnn-vulkan/src"
-    mkdir -p build
-    cd build
-    cmake \
+    cmake -B build -S "${pkgname%-git}"/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%-git}
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname%-git}" ${pkgname%-git}/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%-git}/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%-git}/"$f"
     done
 }