fix model paths

2 files changed, 27 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27b2003da840..130d7bd70044 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = waifu2x-ncnn-vulkan-git
 	pkgdesc = waifu2x converter ncnn version, runs fast on intel / amd / nvidia GPU with vulkan
-	pkgver = 20190712.r0.g0995d88
+	pkgver = 20190712.r3.gc11d4f4
 	pkgrel = 1
 	url = https://github.com/nihui/waifu2x-ncnn-vulkan
 	arch = i686
@@ -9,6 +9,7 @@ pkgbase = waifu2x-ncnn-vulkan-git
 	makedepends = git
 	makedepends = cmake
 	depends = ncnn-git
+	depends = vulkan-icd-loader
 	provides = waifu2x-ncnn-vulkan
 	conflicts = waifu2x-ncnn-vulkan
 	source = git://github.com/nihui/waifu2x-ncnn-vulkan.git
diff --git a/PKGBUILD b/PKGBUILD
index e6a48229fc1d..16edb3ddcb92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="waifu2x converter ncnn version, runs fast on intel / amd / nvidia GPU with vulkan"
 url="https://github.com/nihui/waifu2x-ncnn-vulkan"
 license=('MIT')
-depends=('ncnn-git')
+depends=('ncnn-git' 'vulkan-icd-loader')
 makedepends=('git' 'cmake')
 conflicts=('waifu2x-ncnn-vulkan')
 provides=('waifu2x-ncnn-vulkan')
@@ -16,7 +16,7 @@ source=("git://github.com/nihui/waifu2x-ncnn-vulkan.git")
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/waifu2x-ncnn-vulkan"
+    cd "${srcdir}/waifu2x-ncnn-vulkan"
   ( set -o pipefail
     git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -24,26 +24,33 @@ pkgver() {
 }
 
 prepare() {
-	cd "${srcdir}/waifu2x-ncnn-vulkan/src"
-	sed -ie 's/set(ncnn_DIR "\/home\/nihui\/dev\/ncnn\/build\/install\/lib\/cmake\/ncnn")/include_directories("\/usr\/include\/ncnn")/' CMakeLists.txt
-	sed -ie 's/find_package(ncnn REQUIRED)/#find_package(ncnn REQUIRED)/' CMakeLists.txt
+    cd "${srcdir}/waifu2x-ncnn-vulkan/src"
+
+    # Fix ncnn path
+    sed -i 's|set(ncnn_DIR "/home/nihui/dev/ncnn/build/install/lib/cmake/ncnn")|include_directories("/usr/include/ncnn")|' CMakeLists.txt
+    sed -i 's|find_package(ncnn REQUIRED)|#find_package(ncnn REQUIRED)|' CMakeLists.txt
+
+    # Fix default model path
+    sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' main.cpp
 }
 
 build() {
-	cd "${srcdir}/waifu2x-ncnn-vulkan/src"
-	mkdir -p build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}/usr ..
-	make
+    cd "${srcdir}/waifu2x-ncnn-vulkan/src"
+    mkdir -p build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+    make
 }
 
 package() {
-	cd "${srcdir}/waifu2x-ncnn-vulkan/src"
-	install -Dm755 "build/waifu2x-ncnn-vulkan" "${pkgdir}/usr/bin/waifu2x-ncnn-vulkan"
-        for f in ../models/models-cunet/*; do
-                install -Dm 644 "$f" ${pkgdir}/usr/share/waifu2x-ncnn-vulkan/"$f"
-        done
-	for f in ../models/models-upconv_7_anime_style_art_rgb/*; do
-		install -Dm 644 "$f" ${pkgdir}/usr/share/waifu2x-ncnn-vulkan/"$f"
-	done
+    cd "${srcdir}/waifu2x-ncnn-vulkan/src"
+    install -Dm755 "build/waifu2x-ncnn-vulkan" "${pkgdir}/usr/bin/waifu2x-ncnn-vulkan"
+
+    cd "${srcdir}/waifu2x-ncnn-vulkan/models"
+    for f in models-cunet/*; do
+        install -Dm 644 "$f" ${pkgdir}/usr/share/waifu2x-ncnn-vulkan/"$f"
+    done
+    for f in models-upconv_7_anime_style_art_rgb/*; do
+        install -Dm 644 "$f" ${pkgdir}/usr/share/waifu2x-ncnn-vulkan/"$f"
+    done
 }