Adjust pkgver according to latest upstream changes

3 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5673f937e63..dd0efd91e8e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = intel-media-driver-git
 	pkgdesc = Intel Media Driver for VAAPI (git version)
-	pkgver = 600.0130.r82.gaf83cef.gmmlib.r38.b7ce36f
-	pkgrel = 2
+	pkgver = 2018.Q2.1.r42.g4cbb2c8.gmmlib.r44.d0a4870
+	pkgrel = 1
 	url = https://github.com/intel/media-driver/
 	install = intel-media-driver-git.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 59fe6bf35e6e..0ec97cf7a0f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
 pkgname=intel-media-driver-git
-pkgver=600.0130.r82.gaf83cef.gmmlib.r38.b7ce36f
-pkgrel=2
+pkgver=2018.Q2.1.r42.g4cbb2c8.gmmlib.r44.d0a4870
+pkgrel=1
 pkgdesc='Intel Media Driver for VAAPI (git version)'
 arch=('x86_64')
 url='https://github.com/intel/media-driver/'
@@ -28,12 +28,13 @@ pkgver() {
     cd "$pkgname"
     
     # git, tags available
-    _driver_ver="$(git describe --long --tags | sed 's/^intel-media-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//')"
+    local _prefix='driver-for-Intel-Media-SDK-'
+    local _driver_ver="$(git describe --long --tags | sed "s/^${_prefix}//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/Q/\.Q/")"
     
     cd "${srcdir}/gmmlib-git"
     
     # git, no tags available
-    _gmmlib_ver="$(printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
+    local _gmmlib_ver="$(printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
     
     printf '%s.gmmlib.%s' "$_driver_ver" "$_gmmlib_ver"
 }
@@ -67,9 +68,9 @@ package() {
     make DESTDIR="$pkgdir" install
     
     # do not force the use of 'iHD' libva driver by default (let user choose)
-    local _info='uncomment the LIBVA_DRIVER_NAME line to use the Intel Media Driver (iHD) for VAAPI'
-    sed -i "2i\\ \\${_info}" "${pkgdir}/etc/profile.d/intel-media.sh"
-    sed -i '/LIBVA_DRIVER_NAME/s/^/#/' "${pkgdir}/etc/profile.d/intel-media.sh"
+    local _info='# uncomment the LIBVA_DRIVER_NAME line to use the Intel Media Driver (iHD) for VAAPI'
+    sed -i "2i${_info}" "${pkgdir}/etc/profile.d/intel-media.sh"
+    sed -i '/^export[[:space:]]LIBVA_DRIVER_NAME/s/^/#/' "${pkgdir}/etc/profile.d/intel-media.sh"
     
     # license
     cd "${srcdir}/${pkgname}"
diff --git a/intel-media-driver-git.install b/intel-media-driver-git.install
index bed3c13f5b17..5b6a7d563c6c 100644
--- a/intel-media-driver-git.install
+++ b/intel-media-driver-git.install
@@ -1,7 +1,8 @@
 post_install() {
     printf '%s\n' 'In order to use the the Intel Media Driver for VAAPI you need to set the'
-    printf '%s\n' "environment variable 'LIBVA_DRIVER_NAME' to 'iHD'. You can do this, for"
-    printf '%s\n' "example, by uncommenting the proper line in '/etc/profile.d/intel-media.sh'."
+    printf '%s\n' "'LIBVA_DRIVER_NAME' environment variable to 'iHD'. You can do this, for"
+    printf '%s\n' "example, by uncommenting the proper line in '/etc/profile.d/intel-media.sh'"
+    printf '%s\n' '(and relogin (or source this file) after).'
 }
 
 post_upgrade() {