bump to 20210720, using ninja

2 files changed, 27 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 505c1299c08e..f23ec90cafdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ncnn
 	pkgdesc = High-performance neural network inference framework optimized for the mobile platform
-	pkgver = 20210507
+	pkgver = 20210720
 	pkgrel = 1
 	url = https://github.com/Tencent/ncnn
 	arch = i686
@@ -8,12 +8,12 @@ pkgbase = ncnn
 	license = BSD
 	makedepends = cmake
 	makedepends = glslang-git
+	makedepends = ninja
 	makedepends = vulkan-headers
 	makedepends = vulkan-icd-loader
 	makedepends = gcc
 	conflicts = ncnn-git
-	source = ncnn-20210507.tar.gz::https://github.com/Tencent/ncnn/archive/20210507.tar.gz
-	sha256sums = b9f87aa7e7c41abfcb8e271ff2b15cebd7ecee52cd6e1fb84ebd130e1a483a52
+	source = ncnn-20210720.tar.gz::https://github.com/Tencent/ncnn/archive/20210720.tar.gz
+	b2sums = f3ce1cf53f6b821e66794f2c14fa92454a842b83f8be54a5300da4fc399cd3444df8c630ab999fe4d085c0466c207954851a4fbe266c9088b48f579f6fe2cf6a
 
 pkgname = ncnn
-
diff --git a/PKGBUILD b/PKGBUILD
index 10abe72757ff..17cb2891dde5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,39 @@
-# Maintainer: PumpkinCheshire <sollyonzou at gmail dot com>
+#!/bin/bash
+
+# Maintainer: PumpkinCheshire <me at pumpkincheshire dot top>
 # Contributor: Cobalt Space <cobaltspace at protonmail dot com>
 # Contributor: Mitch Bigelow <ipha00 at gmail dot com>
 
 pkgname=ncnn
-pkgver=20210507
+pkgver=20210720
 pkgrel=1
-pkgdesc="High-performance neural network inference framework optimized for the mobile platform"
-url="https://github.com/Tencent/ncnn"
+pkgdesc='High-performance neural network inference framework optimized for the mobile platform'
+url='https://github.com/Tencent/ncnn'
+arch=('i686' 'x86_64')
 license=('BSD')
 depends=()
-makedepends=('cmake' 'glslang-git' 'vulkan-headers' 'vulkan-icd-loader' 'gcc')
-conflicts=('ncnn-git')
-arch=('i686' 'x86_64')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Tencent/ncnn/archive/${pkgver}.tar.gz"
+makedepends=(
+    'cmake'
+    'glslang-git'
+    'ninja'
+    'vulkan-headers'
+    'vulkan-icd-loader'
+    'gcc'
 )
-sha256sums=('b9f87aa7e7c41abfcb8e271ff2b15cebd7ecee52cd6e1fb84ebd130e1a483a52')
+conflicts=('ncnn-git')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Tencent/ncnn/archive/$pkgver.tar.gz")
+b2sums=('f3ce1cf53f6b821e66794f2c14fa92454a842b83f8be54a5300da4fc399cd3444df8c630ab999fe4d085c0466c207954851a4fbe266c9088b48f579f6fe2cf6a')
 
 prepare() {
-    cd "${srcdir}/ncnn-${pkgver}"
+    cd "$srcdir/ncnn-$pkgver" || exit
 
     # fix double path
     sed -i 's|glslang/glslang|glslang|' src/gpu.cpp
 }
 
 build() {
-    cmake -B build -S "ncnn-${pkgver}" \
+    cmake -B build -S "$pkgname-$pkgver" \
+        -GNinja \
         -DCMAKE_BUILD_TYPE='None' \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DNCNN_BUILD_EXAMPLES=OFF \
@@ -33,10 +42,10 @@ build() {
         -DNCNN_SYSTEM_GLSLANG=ON \
         -DGLSLANG_TARGET_DIR=/usr/lib/cmake/ \
         -Wno-dev
-    make -C build
+    ninja -C build
 }
 
 package() {
-    make -C build DESTDIR="${pkgdir}" install
-    install -Dm644 "${srcdir}/ncnn-${pkgver}/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    DESTDIR="$pkgdir" ninja -C build install
+    install -Dm644 "$srcdir/ncnn-$pkgver/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }