Apply upstream changes: use dynamic gmmlib, simplify cmake command

Upstream intel-media-driver now uses dynamic gmmlib instead of
building it in-source. It also does not install the gmmlib files
anymore. As a result, this package now depends on gmmlib-git.

cmake command was also simplified by upstream.

References
----------
https://github.com/intel/media-driver/pull/270
https://github.com/intel/media-driver/commit/87fadbe90c0bbba64bdf47ed8640ed023858b300
https://github.com/intel/media-driver/commit/54ca9bed5eb383dc89a253fb1a49313cc04b048f

2 files changed, 8 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 197b52e61f9a..ad66cd415d33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = intel-media-driver-git
 	pkgdesc = Intel Media Driver for VAAPI (git version)
-	pkgver = 2018.2.pre2.r106.gd5b0618.gmmlib.r62.1a4cf50
+	pkgver = 2018.3.pre1.r130.g10f382d1
 	pkgrel = 1
 	url = https://github.com/intel/media-driver/
 	install = intel-media-driver-git.install
@@ -11,15 +11,13 @@ pkgbase = intel-media-driver-git
 	makedepends = cmake
 	depends = gcc-libs
 	depends = libpciaccess
+	depends = gmmlib-git
 	depends = libva-git
 	provides = intel-media-driver
 	conflicts = intel-media-driver
-	conflicts = gmmlib-git
 	options = !emptydirs
 	backup = etc/profile.d/intel-media.sh
 	source = intel-media-driver-git::git+https://github.com/intel/media-driver.git
-	source = gmmlib-git::git+https://github.com/intel/gmmlib.git
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = intel-media-driver-git
diff --git a/PKGBUILD b/PKGBUILD
index aebd93539462..08b1b152e821 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
 pkgname=intel-media-driver-git
-pkgver=2018.2.pre2.r106.gd5b0618.gmmlib.r62.1a4cf50
+pkgver=2018.3.pre1.r130.g10f382d1
 pkgrel=1
 pkgdesc='Intel Media Driver for VAAPI (git version)'
 arch=('x86_64')
@@ -11,32 +11,23 @@ depends=(
     # official repositories:
         'gcc-libs' 'libpciaccess'
     # AUR:
-        'libva-git'
+        'gmmlib-git' 'libva-git'
 )
 makedepends=('git' 'cmake')
 provides=('intel-media-driver')
-conflicts=('intel-media-driver' 'gmmlib-git')
+conflicts=('intel-media-driver')
 backup=('etc/profile.d/intel-media.sh')
 options=('!emptydirs')
 install="${pkgname}.install"
-source=("$pkgname"::'git+https://github.com/intel/media-driver.git'
-        'gmmlib-git'::'git+https://github.com/intel/gmmlib.git')
-sha256sums=('SKIP'
-            'SKIP')
+source=("$pkgname"::'git+https://github.com/intel/media-driver.git')
+sha256sums=('SKIP')
 
 pkgver() {
     cd "$pkgname"
     
     # git, tags available
     local _prefix='intel-media-'
-    local _driver_ver="$(git describe --long --tags | sed "s/^${_prefix}//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/^18\./2018./")"
-    
-    cd "${srcdir}/gmmlib-git"
-    
-    # git, no tags available
-    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"
+    git describe --long --tags | sed "s/^${_prefix}//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/^18\./2018./"
 }
 
 build() {
@@ -44,18 +35,10 @@ build() {
     cd build
     
     cmake \
-        -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
         -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL='OFF' \
         -DCMAKE_INSTALL_LIBDIR:PATH='lib' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DCMAKE_INSTALL_SYSCONFDIR:PATH='etc' \
-        -DINSTALL_DRIVER_SYSCONF:BOOL='ON' \
-        -DMEDIA_BUILD_FATAL_WARNINGS:BOOL='OFF' \
-        -DMEDIA_VERSION='2.0.0' \
-        -DBS_DIR_GMMLIB="$(pwd)/../gmmlib-git/Source/GmmLib/" \
-        -DBS_DIR_COMMON="$(pwd)/../gmmlib-git/Source/Common/" \
-        -DBS_DIR_INC="$(pwd)/../gmmlib-git/Source/inc/" \
-        -DBS_DIR_MEDIA="$(pwd)/../${pkgname}" \
         -Wno-dev \
         ../"$pkgname"