Update pkgver(). Match base package. General improvements.

1 files changed, 21 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3d1e1068fe88..80a5e73d640a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,42 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=libva-git
-_srcname=libva
-pkgver=2.2.1.pre1.20180921.r6.gcf11abe
+pkgver=2.17.0.r24.g97cbc87c
 pkgrel=1
 pkgdesc='Video Acceleration (VA) API for Linux (git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://01.org/linuxmedia/vaapi/'
 license=('MIT')
 depends=('libdrm' 'libgl' 'libx11' 'libxext' 'libxfixes' 'wayland')
 makedepends=('git' 'libglvnd' 'mesa' 'meson')
-optdepends=('libva-vdpau-driver: backend for Nvidia and AMD cards'
-            'libva-intel-driver: backend for Intel cards')
+optdepends=('intel-media-driver: backend for Intel GPUs (Broadwell and later)'
+            'libva-intel-driver: backend for Intel GPUs (up until Haswell)'
+            'libva-mesa-driver: backend for NVIDIA and AMD GPUs')
 provides=('libva' 'libva-drm.so' 'libva-glx.so' 'libva-wayland.so'
           'libva-x11.so' 'libva.so')
 conflicts=('libva')
+backup=('etc/libva.conf')
 source=('git+https://github.com/intel/libva.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$_srcname"
-    
-    # git, tags available
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^libva\.//;s/^v//'
+    local _version
+    _version="$(git -C libva 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 libva rev-list --count "${_version}..HEAD")" \
+                        "$(git -C libva rev-parse --short HEAD)"
 }
 
 build() {
-    cd "$_srcname"
-  
-    arch-meson . build
-    ninja -C build
+    export CFLAGS+=' -DENABLE_VA_MESSAGING'
+    arch-meson libva build
+    meson compile -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 libva/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 /dev/stdin "${pkgdir}/etc/libva.conf" <<__EOF__
+LIBVA_MESSAGING_LEVEL=1
+__EOF__
+}