update to 4.1.1

2 files changed, 26 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e4dfc3c4955..86b559134ac6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = xv
 	pkgdesc = A nice image viewer
-	pkgver = 3.10a
-	pkgrel = 24
-	url = http://www.trilon.com/xv/
+	pkgver = 4.1.1
+	pkgrel = 1
+	url = https://github.com/jasper-software/xv
 	arch = i686
 	arch = x86_64
+	arch = armv7h
+	arch = aarch64
 	license = custom
 	makedepends = cmake
 	makedepends = libxt
@@ -13,9 +15,9 @@ pkgbase = xv
 	depends = libtiff
 	depends = jasper
 	options = !emptydirs
-	source = https://github.com/jasper-software/xv/releases/download/v4.0.0-alpha7/xv-3.10a-js-4.0.0-alpha7.tar.gz
+	source = https://github.com/jasper-software/xv/releases/download/v4.1.1/xv-3.10a-js-4.1.1.tar.gz
 	source = license.txt
-	sha1sums = a8124cedcfe77a51d56df43e789366880b494627
+	sha1sums = 2c9b7108bcd6ff97dfe1cd5f31f024a445cbe860
 	sha1sums = 4561344e8f2c30eee9c55b14a14f062d89d6e7b7
 
 pkgname = xv
diff --git a/PKGBUILD b/PKGBUILD
index 456cceb383f0..bb89aa09a053 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,42 @@
-# Maintainer: Matthew McGinn <mamcgi@gmail.com>
+# Contributor: Matthew McGinn <mamcgi@gmail.com>
 # Contributor: György Balló
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xv
-pkgver=3.10a
-pkgrel=24
-_jsrel=4.0.0-alpha7
-pkgdesc="A nice image viewer"
-arch=('i686' 'x86_64')
-url="http://www.trilon.com/xv/"
-license=('custom')
+pkgver=4.1.1
+pkgrel=1
+_xvver=3.10a
+pkgdesc='A nice image viewer'
+arch=(i686 x86_64 armv7h aarch64)
+url='https://github.com/jasper-software/xv'
+license=(custom)
 depends=('libpng' 'libx11' 'libtiff' 'jasper')
 makedepends=('cmake' 'libxt')
-options=('!emptydirs')
-source=(https://github.com/jasper-software/xv/releases/download/v${_jsrel}/${pkgname}-${pkgver}-js-${_jsrel}.tar.gz
+options=(!emptydirs)
+source=(https://github.com/jasper-software/xv/releases/download/v$pkgver/$pkgname-$_xvver-js-$pkgver.tar.gz
         license.txt)
-sha1sums=('a8124cedcfe77a51d56df43e789366880b494627'
+sha1sums=('2c9b7108bcd6ff97dfe1cd5f31f024a445cbe860'
           '4561344e8f2c30eee9c55b14a14f062d89d6e7b7')
 
 prepare() {
-  cd "${pkgname}-${pkgver}-js-${_jsrel}"
+  cd "$pkgname-$_xvver-js-$pkgver"
   cmake -H. -Btmp_cmake \
-    -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" \
-    -DCMAKE_INSTALL_SYSCONFDIR="${pkgdir}/etc" \
+    -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \
+    -DCMAKE_INSTALL_SYSCONFDIR="$pkgdir/etc" \
     -DCMAKE_BUILD_TYPE=Release
 }
 
 build() {
-  cd "${pkgname}-${pkgver}-js-${_jsrel}"
+  cd "$pkgname-$_xvver-js-$pkgver"
   cmake --build tmp_cmake
 }
 
 package() {
-  cd "${pkgname}-${pkgver}-js-${_jsrel}"
+  cd "$pkgname-$_xvver-js-$pkgver"
   cmake --build tmp_cmake --target install
-  install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+  install -D -m644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 
 # installing source tarball (to comply with license)
-  install -D -m644 "${srcdir}/${pkgname}-${pkgver}-js-${_jsrel}.tar.gz" "${pkgdir}/usr/share/doc/xv/xv-${pkgver}-source.tar.gz"
-  ln -s "/usr/share/licenses/${pkgname}/license.txt" "${pkgdir}/usr/share/doc/xv/license.txt"
+  install -D -m644 "$srcdir/$pkgname-$_xvver-js-$pkgver.tar.gz" "$pkgdir/usr/share/doc/xv/xv-$pkgver-source.tar.gz"
+  ln -s "/usr/share/licenses/$pkgname/license.txt" "$pkgdir/usr/share/doc/xv/license.txt"
 }