Update to v0.10.0, which requires new build deps

2 files changed, 19 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5fbbdbdaca5f..1a7d9f68e4de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,16 @@
 pkgbase = s2png-git
 	pkgdesc = stuff to PNG
-	pkgver = v0.7.2
+	pkgver = v0.10.0.r000
 	pkgrel = 1
 	url = https://github.com/dbohdan/s2png
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPLv2
+	makedepends = cargo
+	makedepends = rust
+	makedepends = rustfmt
+	makedepends = coreutils
+	makedepends = gcc
+	makedepends = binutils
 	depends = gd
 	provides = s2png
 	provides = s2png-git
diff --git a/PKGBUILD b/PKGBUILD
index 807f38e809b3..799d417472b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
 # Contributor:  D. Bohdan <http://dbohdan.com/contact/>
 
 pkgname=s2png-git
-pkgver=v0.7.2
+pkgver=v0.10.0.r000
 pkgrel=1
 
 pkgdesc='stuff to PNG'
-arch=('i686' 'x86_64')
+arch=('any')
 url='https://github.com/dbohdan/s2png'
 license=('GPLv2')
 depends=('gd')
+makedepends=('cargo' 'rust' 'rustfmt' 'coreutils' 'gcc' 'binutils')
 provides=('s2png' 's2png-git')
 conflicts=('s2png' 's2png-git')
 source=('git://github.com/dbohdan/s2png')
@@ -18,15 +19,20 @@ sha256sums=('SKIP')
 pkgver() {
     cd "$srcdir/s2png/"
     git reset --hard HEAD > /dev/null 2>&1
-    git describe --tags | sed 's/-/./g'
+    echo $(git describe --tags | sed 's/-/./g' | cut -d"." -f1-3)".r"$(git rev-list --all --count)
 }
 
 build() {
     cd "$srcdir/s2png/"
     git reset --hard HEAD > /dev/null 2>&1
-    make
+    mkdir -p "$srcdir/s2png/tempmakedir"
+    env CC="${CARCH}-unknown-linux-gnu-gcc" TARGET="${CARCH}-unknown-linux-gnu" USER_TEMP="$srcdir/s2png/tempmakedir" make test
+    env CC="${CARCH}-unknown-linux-gnu-gcc" TARGET="${CARCH}-unknown-linux-gnu" USER_TEMP="$srcdir/s2png/tempmakedir" make release
+    mv "$srcdir/s2png/tempmakedir/cargo/s2png/${CARCH}-unknown-linux-gnu/release/s2png" ./s2png_release_bin
+    strip s2png_release_bin
 }
 
 package() {
-    install -Dm755 "$srcdir/s2png/s2png" "$pkgdir/usr/bin/s2png"
+    install -Dm755 "$srcdir/s2png/s2png_release_bin" "$pkgdir/usr/bin/s2png"
 }
+