update to 5.0.0

2 files changed, 31 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c3b4d7abadb..aa5243389e9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
 pkgbase = xv
 	pkgdesc = A nice image viewer
-	pkgver = 4.2.0
+	pkgver = 5.0.0
 	pkgrel = 1
 	url = https://github.com/jasper-software/xv
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
-	license = custom
+	license = LicenseRef-xv
 	makedepends = cmake
-	makedepends = libxt
+	makedepends = git
 	depends = libpng
 	depends = libx11
 	depends = libtiff
 	depends = libwebp
 	depends = jasper
+	depends = libxt
+	depends = libjpeg-turbo
+	depends = zlib
+	depends = glibc
 	options = !emptydirs
-	source = https://github.com/jasper-software/xv/releases/download/v4.2.0/xv-3.10a-js-4.2.0.tar.gz
+	source = git+https://github.com/jasper-software/xv.git#commit=bc95540a69b845b8b33c31225e6092bd07c51d9d
 	source = license.txt
-	sha1sums = c2376669af1540d1142cccf2c1be45b637fd6d98
+	sha1sums = 17ed1cb8ff3a8397005b350cc3efb5fa4602d39e
 	sha1sums = 4561344e8f2c30eee9c55b14a14f062d89d6e7b7
 
 pkgname = xv
diff --git a/PKGBUILD b/PKGBUILD
index 2b126cbe3922..146c6b1f5510 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,44 @@
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xv
-pkgver=4.2.0
+pkgver=5.0.0
 pkgrel=1
-_xvver=3.10a
+_commit=bc95540a69b845b8b33c31225e6092bd07c51d9d
 pkgdesc='A nice image viewer'
 arch=(i686 x86_64 armv7h aarch64)
 url='https://github.com/jasper-software/xv'
-license=(custom)
-depends=('libpng' 'libx11' 'libtiff' 'libwebp' 'jasper')
-makedepends=('cmake' 'libxt')
+license=(LicenseRef-xv)
+depends=(libpng libx11 libtiff libwebp jasper libxt libjpeg-turbo zlib glibc)
+makedepends=(cmake git)
 options=(!emptydirs)
-source=(https://github.com/jasper-software/xv/releases/download/v$pkgver/$pkgname-$_xvver-js-$pkgver.tar.gz
+source=(git+$url.git#commit=$_commit
         license.txt)
-sha1sums=('c2376669af1540d1142cccf2c1be45b637fd6d98'
+sha1sums=('17ed1cb8ff3a8397005b350cc3efb5fa4602d39e'
           '4561344e8f2c30eee9c55b14a14f062d89d6e7b7')
 
 prepare() {
-  cd "$pkgname-$_xvver-js-$pkgver"
-  cmake -H. -Btmp_cmake \
-    -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \
-    -DCMAKE_INSTALL_SYSCONFDIR="$pkgdir/etc" \
+  cd "$pkgname"
+  cmake -B tmp_cmake \
+    -DCMAKE_C_FLAGS="$CFLAGS" \
+    -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS" \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_SYSCONFDIR="/etc" \
     -DCMAKE_BUILD_TYPE=Release
 }
 
 build() {
-  cd "$pkgname-$_xvver-js-$pkgver"
+  cd "$pkgname"
   cmake --build tmp_cmake
+  # Preparing source tarball
+  git archive --format tar.gz -o "$srcdir/$pkgname-$pkgver-source.tar.gz" HEAD
 }
 
 package() {
-  cd "$pkgname-$_xvver-js-$pkgver"
-  cmake --build tmp_cmake --target install
-  install -D -m644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+  cd "$pkgname"
+  DESTDIR="$pkgdir" cmake --build tmp_cmake --target install
+  install -Dvm644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 
-# installing source tarball (to comply with license)
-  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"
+  # installing source tarball (to comply with license)
+  install -Dvm644 "$srcdir/$pkgname-$pkgver-source.tar.gz" "$pkgdir/usr/share/doc/$pkgname/$pkgname-$pkgver-source.tar.gz"
+  ln -s "/usr/share/licenses/$pkgname/license.txt" "$pkgdir/usr/share/doc/$pkgname/license.txt"
 }