summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-09-03 17:05:52 +0000
committerDaniel Bermond2018-09-03 17:05:52 +0000
commite66064021b485039b1fa82f832d47567305423ff (patch)
tree5c220deb69f14b6870e73b18408fb6d5eefc6575
parent054b6d06694e96ac78a01a596d005af9c4c46b99 (diff)
downloadaur-e66064021b485039b1fa82f832d47567305423ff.tar.gz
Switch back to use gmmlib source due to upstream reverting changes
Ustream was previously requiring gmmlib source (and providing gmmlib in package) in order to build, then it switched to require gmmlib installed on system and then it switched back to require gmmlib sources due to regressions. In the future, upstream intends to switch to require gmmlib installed on system as the final solution, so be prepared for another change(s) in this approach some upstream commits ahead. That's the cost that you pay for using a development (-git) package ;) References ---------- https://github.com/intel/media-driver/issues/299#issuecomment-418156001
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD38
2 files changed, 35 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad66cd415d33..1110b797c1e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = intel-media-driver-git
pkgdesc = Intel Media Driver for VAAPI (git version)
- pkgver = 2018.3.pre1.r130.g10f382d1
+ pkgver = 2018.3.pre2.r28.gad8945ce.gmmlib.18.3.pre1.r0.g99ff764
pkgrel = 1
url = https://github.com/intel/media-driver/
install = intel-media-driver-git.install
@@ -11,13 +11,18 @@ pkgbase = intel-media-driver-git
makedepends = cmake
depends = gcc-libs
depends = libpciaccess
- depends = gmmlib-git
depends = libva-git
provides = intel-media-driver
+ provides = gmmlib
+ provides = gmmlib-git
conflicts = intel-media-driver
+ conflicts = gmmlib
+ 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 08b1b152e821..76f942b5fb72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=intel-media-driver-git
-pkgver=2018.3.pre1.r130.g10f382d1
+pkgver=2018.3.pre2.r28.gad8945ce.gmmlib.18.3.pre1.r0.g99ff764
pkgrel=1
pkgdesc='Intel Media Driver for VAAPI (git version)'
arch=('x86_64')
@@ -11,23 +11,35 @@ depends=(
# official repositories:
'gcc-libs' 'libpciaccess'
# AUR:
- 'gmmlib-git' 'libva-git'
+ 'libva-git'
)
makedepends=('git' 'cmake')
-provides=('intel-media-driver')
-conflicts=('intel-media-driver')
+provides=('intel-media-driver' 'gmmlib' 'gmmlib-git')
+conflicts=('intel-media-driver' 'gmmlib' 'gmmlib-git')
backup=('etc/profile.d/intel-media.sh')
options=('!emptydirs')
install="${pkgname}.install"
-source=("$pkgname"::'git+https://github.com/intel/media-driver.git')
-sha256sums=('SKIP')
+source=("$pkgname"::'git+https://github.com/intel/media-driver.git'
+ 'gmmlib-git'::'git+https://github.com/intel/gmmlib.git')
+sha256sums=('SKIP'
+ 'SKIP')
pkgver() {
cd "$pkgname"
- # git, tags available
local _prefix='intel-media-'
- git describe --long --tags | sed "s/^${_prefix}//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/^18\./2018./"
+ local _driver_ver
+ local _gmmlib_ver
+
+ # git, tags available
+
+ _driver_ver="$(git describe --long --tags | sed "s/^${_prefix}//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/^18\./2018./")"
+
+ cd "${srcdir}/gmmlib-git"
+
+ _gmmlib_ver="$(git describe --long --tags | sed 's/^intel-gmmlib-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//')"
+
+ printf '%s.gmmlib.%s' "$_driver_ver" "$_gmmlib_ver"
}
build() {
@@ -35,13 +47,19 @@ build() {
cd build
cmake \
- -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"
-
+
make
}