Update pkgver(). General improvements.

2 files changed, 14 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5716c8a69da..a2ce37c6a84d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = libva-intel-driver-git
 	pkgdesc = VA-API implementation for Intel G45 and HD Graphics family (git version)
-	pkgver = 2.2.0.r15.gecfb0dbc
+	pkgver = 2.4.1.r6.gab755cb7
 	pkgrel = 1
 	url = https://01.org/linuxmedia/vaapi/
-	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
@@ -17,4 +16,3 @@ pkgbase = libva-intel-driver-git
 	sha256sums = SKIP
 
 pkgname = libva-intel-driver-git
-
diff --git a/PKGBUILD b/PKGBUILD
index edc96ecb079f..7657a17b7356 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,13 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=libva-intel-driver-git
-_srcname=intel-vaapi-driver
-pkgver=2.2.0.r15.gecfb0dbc
+pkgver=2.4.1.r6.gab755cb7
 pkgrel=1
 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family (git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://01.org/linuxmedia/vaapi/'
 license=('MIT')
-depends=(
-    # official repositories:
-        'libdrm'
-    # AUR:
-        'libva-git'
-)
+depends=('libdrm' 'libva-git')
 makedepends=('git' 'meson')
 provides=('libva-intel-driver')
 conflicts=('libva-intel-driver')
@@ -22,31 +16,25 @@ source=('git+https://github.com/intel/intel-vaapi-driver.git')
 sha256sums=('SKIP')
 
 prepare() {
-    cd "$_srcname"
-    
     # Only relevant if intel-gpu-tools is installed,
     # since then the shaders will be recompiled
-    sed -i '1s/python$/&2/' src/shaders/gpp.py
+    sed -i '1s/python$/&2/' intel-vaapi-driver/src/shaders/gpp.py
 }
 
 pkgver() {
-    cd "$_srcname"
-    
-    # git, tags available
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
+    local _version
+    _version="$(git -C intel-vaapi-driver tag --list --sort='-v:refname' | grep -E '^[0-9]+\.[0-9]+(\.[0-9]+)*$' | sort -rV | head -n1)"
+    printf '%s.r%s.g%s' "$_version" \
+                        "$(git -C intel-vaapi-driver rev-list --count "${_version}..HEAD")" \
+                        "$(git -C intel-vaapi-driver rev-parse --short HEAD)"
 }
 
 build() {
-    cd "$_srcname"
-    
-    arch-meson . build
+    arch-meson intel-vaapi-driver build
     ninja -C build
 }
 
 package() {
-    cd "$_srcname"
-    
-    DESTDIR="$pkgdir" ninja -C build install
-    
-    install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    meson install -C build --destdir "$pkgdir"
+    install -D -m644 intel-vaapi-driver/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }