Fix build. Add metrics_monitor. Other fixes.

2 files changed, 16 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e07988cab83..25c9ff3bcc8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = intel-media-sdk-git
 	pkgdesc = API to access hardware-accelerated video decode, encode and filtering on Intel platforms with integrated graphics (git version)
-	pkgver = 2018.3.pre2.r76.g954207a
+	pkgver = 2018.3.pre3.r77.g53c73e5
 	pkgrel = 1
 	url = https://github.com/Intel-Media-SDK/MediaSDK/
 	install = intel-media-sdk-git.install
@@ -12,17 +12,14 @@ pkgbase = intel-media-sdk-git
 	makedepends = libpciaccess
 	makedepends = libx11
 	makedepends = libxcb
-	makedepends = gtest
 	depends = gcc-libs
 	depends = libdrm
 	depends = wayland
-	depends = libva-git
 	depends = intel-media-driver
+	depends = libva-git
 	provides = intel-media-sdk
 	provides = libmfx
 	conflicts = intel-media-sdk
-	conflicts = intel-media-stack-bin
-	conflicts = intel-media-server-studio
 	source = intel-media-sdk-git.conf
 	source = intel-media-sdk-git.sh
 	sha256sums = 63e76d28140486871a3ffc29ce19c84914583bf243201946c76943bf54df374a
diff --git a/PKGBUILD b/PKGBUILD
index 1e409c6c1a3f..e950e0e5b203 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
 # To enable the Instrumentation and Tracing Technology API (ittnotify):
 #   - install the package intel-seapi
@@ -8,7 +8,7 @@
 # Currently it will not be a mandatory makedepend.
 
 pkgname=intel-media-sdk-git
-pkgver=2018.3.pre2.r76.g954207a
+pkgver=2018.3.pre3.r77.g53c73e5
 pkgrel=1
 pkgdesc='API to access hardware-accelerated video decode, encode and filtering on Intel platforms with integrated graphics (git version)'
 arch=('x86_64')
@@ -16,13 +16,13 @@ url='https://github.com/Intel-Media-SDK/MediaSDK/'
 license=('MIT')
 depends=(
     # official repositories:
-        'gcc-libs' 'libdrm' 'wayland'
+        'gcc-libs' 'libdrm' 'wayland' 'intel-media-driver'
     # AUR:
-        'libva-git' 'intel-media-driver'
+        'libva-git'
 )
-makedepends=('git' 'git-lfs' 'cmake' 'libpciaccess' 'libx11' 'libxcb' 'gtest')
+makedepends=('git' 'git-lfs' 'cmake' 'libpciaccess' 'libx11' 'libxcb')
 provides=('intel-media-sdk' 'libmfx')
-conflicts=('intel-media-sdk' 'intel-media-stack-bin' 'intel-media-server-studio')
+conflicts=('intel-media-sdk')
 install="${pkgname}.install"
 source=('intel-media-sdk-git.conf'
         'intel-media-sdk-git.sh')
@@ -33,11 +33,11 @@ prepare() {
     # makepkg does not support cloning git-lfs repositories
     if [ -d "$pkgname" ] 
     then
-        msg2 "Updating ${pkgname} git repo..."
+        printf '%s\n' "  -> Updating ${pkgname} git repo..."
         cd "$pkgname"
         git pull origin
     else
-        msg2 "Cloning ${pkgname} git repo..."
+        printf '%s\n' "  -> Cloning ${pkgname} git repo..."
         git lfs install
         git clone https://github.com/Intel-Media-SDK/MediaSDK.git "$pkgname"
         cd "$pkgname"
@@ -64,6 +64,7 @@ build() {
         -DBUILD_DISPATCHER:BOOL='ON' \
         -DBUILD_RUNTIME:BOOL='ON' \
         -DBUILD_SAMPLES:BOOL='ON' \
+        -DBUILD_TESTS:BOOL='OFF' \
         -DBUILD_TOOLS:BOOL='ON' \
         -DENABLE_ALL:BOOL='ON' \
         -DENABLE_ITT:BOOL='OFF' \
@@ -83,6 +84,11 @@ package() {
     
     make DESTDIR="$pkgdir" install
     
+    # metrics_monitor
+    install -D -m755 __bin/release/libcttmetrics.so -t "${pkgdir}/opt/intel/mediasdk/share/mfx/samples"
+    install -D -m755 __bin/release/metrics_monitor  -t "${pkgdir}/opt/intel/mediasdk/share/mfx/samples"
+    ln -s ../share/mfx/samples/libcttmetrics.so "${pkgdir}/opt/intel/mediasdk/lib64/libcttmetrics.so"
+    
     # ld.so and profile configuration files
     cd "$srcdir"
     install -D -m644 intel-media-sdk-git.conf -t "${pkgdir}/etc/ld.so.conf.d"