Update to version 2021.1.3

This version makes to package to install into /opt again.
The pre-built libraries have the path /opt/intel/mediasdk
hardcoded on it, so we should install into this prefix.

4 files changed, 61 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a59c3cc2598f..2a54ff707e86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,14 @@
 pkgbase = intel-media-stack-bin
 	pkgdesc = Tools and libraries for developing media solutions on Intel products (pre-compiled binaries)
-	pkgver = 2020.1.1
+	pkgver = 2021.1.3
 	pkgrel = 1
 	url = https://github.com/Intel-Media-SDK/MediaSDK/
+	install = intel-media-stack-bin.install
 	arch = x86_64
 	license = MIT
+	makedepends = chrpath
+	makedepends = lsb-release
+	makedepends = ocl-icd
 	depends = gcc-libs
 	depends = libpciaccess
 	depends = libgl
@@ -21,19 +25,13 @@ pkgbase = intel-media-stack-bin
 	provides = intel-media-driver
 	provides = libva
 	provides = libva-utils
-	conflicts = intel-media-sdk
-	conflicts = libmfx
-	conflicts = intel-gmmlib
-	conflicts = intel-media-driver
-	conflicts = libva
-	conflicts = libva-utils
-	noextract = intel-media-stack-bin-2020.1.1.tar.gz
+	noextract = intel-media-stack-bin-2021.1.3.tar.gz
 	options = !strip
 	options = !emptydirs
-	source = intel-media-stack-bin-2020.1.1.tar.gz::https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-20.1.1/MediaStack.tar.gz
+	source = intel-media-stack-bin-2021.1.3.tar.gz::https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-21.1.3/MediaStack.tar.gz
 	source = 010-intel-media-stack-bin-fix-install.patch
-	sha256sums = f411ded6381dc3ffc4827852e6ff56cfb32abad6669b45afed8a90cd7678a3d8
-	sha256sums = 660d31d03c64d40aa7c1c25304ce40469a159e415ba70957b8f21acecbb91af5
+	sha256sums = a99197dcc57cbbc34863141ace5aaa5bf6da604bbe41176a0582ac834cf6e585
+	sha256sums = 500c2236c71812ca816dbc0752fa5038b41fc73a71c8d1d6684ea770f8918f74
 
 pkgname = intel-media-stack-bin
 
diff --git a/010-intel-media-stack-bin-fix-install.patch b/010-intel-media-stack-bin-fix-install.patch
index 64c438df2fb0..d9d2d060e18d 100644
--- a/010-intel-media-stack-bin-fix-install.patch
+++ b/010-intel-media-stack-bin-fix-install.patch
@@ -1,6 +1,5 @@
-diff -Naurp a/install_media.sh b/install_media.sh
---- a/install_media.sh	2019-07-09 15:14:08.000000000 +0000
-+++ b/install_media.sh	2020-06-07 12:51:16.920145955 +0000
+--- a/install_media.sh
++++ b/install_media.sh
 @@ -21,6 +21,8 @@
  # this notice or any other notice embedded in Materials by Intel or Intel's
  # suppliers or licensors in any way.
diff --git a/PKGBUILD b/PKGBUILD
index 6594ca67b2b4..f670bcfa40f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=intel-media-stack-bin
-pkgver=2020.1.1
+pkgver=2021.1.3
 pkgrel=1
 pkgdesc='Tools and libraries for developing media solutions on Intel products (pre-compiled binaries)'
 arch=('x86_64')
@@ -11,30 +11,60 @@ depends=('gcc-libs' 'libpciaccess' 'libgl' 'libdrm' 'libx11' 'libxext'
          'libxfixes' 'wayland')
 optdepends=('ocl-icd: for rotate_opencl plugin'
             'intel-compute-runtime: for rotate_opencl plugin')
+makedepends=('chrpath' 'lsb-release' 'ocl-icd')
 provides=('intel-media-sdk' 'libmfx' 'intel-gmmlib' 'intel-media-driver'
           'libva' 'libva-utils')
-conflicts=('intel-media-sdk' 'libmfx' 'intel-gmmlib' 'intel-media-driver'
-           'libva' 'libva-utils')
 options=('!strip' '!emptydirs')
+install=intel-media-stack-bin.install
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-${pkgver:2}/MediaStack.tar.gz"
         '010-intel-media-stack-bin-fix-install.patch')
 noextract=("${pkgname}-${pkgver}.tar.gz")
-sha256sums=('f411ded6381dc3ffc4827852e6ff56cfb32abad6669b45afed8a90cd7678a3d8'
-            '660d31d03c64d40aa7c1c25304ce40469a159e415ba70957b8f21acecbb91af5')
+sha256sums=('a99197dcc57cbbc34863141ace5aaa5bf6da604bbe41176a0582ac834cf6e585'
+            '500c2236c71812ca816dbc0752fa5038b41fc73a71c8d1d6684ea770f8918f74')
 
 prepare() {
     mkdir -p "${pkgname}-${pkgver}"
     bsdtar -xf "${pkgname}-${pkgver}.tar.gz" -C "${pkgname}-${pkgver}" -s '|[^/]*/||'
+    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-intel-media-stack-bin-fix-install.patch"
+    sed -i "/^pkgdir=/s|$|${pkgdir}|" "${pkgname}-${pkgver}/install_media.sh"
+    chmod a+x "${pkgname}-${pkgver}/install_media.sh"
 }
 
 package() {
-    install -D -m755 "${pkgname}-${pkgver}/opt/intel/mediasdk/bin"/* -t "${pkgdir}/usr/bin"
-    cp -a "${pkgname}-${pkgver}/opt/intel/mediasdk/"{include,share} "${pkgdir}/usr"
-    cp -a "${pkgname}-${pkgver}/opt/intel/mediasdk/doc" "${pkgdir}/usr/share"
-    cp -a "${pkgname}-${pkgver}/opt/intel/mediasdk/lib64" "${pkgdir}/usr/lib"
-    mkdir -p "${pkgdir}/usr/lib/dri"
-    mv "${pkgdir}/usr/lib/iHD_drv_video.so" "${pkgdir}/usr/lib/dri"
-    ln -sf ../../share/mfx/plugins.cfg "${pkgdir}/usr/lib/mfx/plugins.cfg"
-    ln -s ../share/mfx/samples/_bin/libcttmetrics.so "${pkgdir}/usr/lib/libcttmetrics.so"
-    install -D -m644 "${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    cd "${pkgname}-${pkgver}"
+    install -d -m755 "$pkgdir"/{etc/{ld.so.conf.d,profile.d},usr/lib}
+    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    ./install_media.sh
+    
+    # add bin folder to PATH
+    local _cmd
+    local _file
+    while read -r -d '' _file
+    do
+        if grep -q '\.csh$' <<< "$_file"
+        then
+            _cmd='setenv'
+        else
+            _cmd='export'
+        fi
+        
+        printf '\n%s\n' '# add bin folder to PATH' >> "$_file"
+        printf '%s\n' "${_cmd} PATH=\"\${PATH:+\"\${PATH}\":}/opt/intel/mediasdk/bin\"" >> "$_file"
+    done < <(find "${pkgdir}/etc/profile.d" -maxdepth 1 -mindepth 1 -type f -name 'intel-mediasdk.*sh' -print0)
+    
+    # add symlink for libcttmetrics.so (required by 'metrics_monitor' sample)
+    ln -s ../share/mfx/samples/_bin/libcttmetrics.so "${pkgdir}/opt/intel/mediasdk/lib64/libcttmetrics.so"
+    
+    # fix broken symlinks for plugins
+    rm "${pkgdir}/opt/intel/mediasdk"/{lib64/mfx/plugins.cfg,plugins}
+    ln -s lib64/mfx "${pkgdir}/opt/intel/mediasdk/plugins"
+    ln -s ../../share/mfx/plugins.cfg "${pkgdir}/opt/intel/mediasdk/lib64/mfx/plugins.cfg"
+    
+    # remove insecure and unneeded '/docker/...' rpath
+    chrpath -d "${pkgdir}/opt/intel/mediasdk/lib64/iHD_drv_video.so"
+    
+    # do not force the use of 'iHD' libva driver by default (let user choose)
+    local _info='# uncomment the LIBVA lines bellow to use the Intel Media Driver (iHD) for VAAPI'
+    sed -i "2i${_info}" "$pkgdir/etc/profile.d"/intel-mediasdk.{,c}sh
+    sed -i '3,4s/^/#/'  "$pkgdir/etc/profile.d"/intel-mediasdk.{,c}sh
 }
diff --git a/intel-media-stack-bin.install b/intel-media-stack-bin.install
new file mode 100644
index 000000000000..e5305c0a3f91
--- /dev/null
+++ b/intel-media-stack-bin.install
@@ -0,0 +1,6 @@
+post_install() {
+    printf '%s\n' 'In order to use the the Intel Media Driver for VAAPI you need to set the'
+    printf '%s\n' "'LIBVA_DRIVER_NAME' environment variable to 'iHD'. You can do this, for"
+    printf '%s\n' "example, by uncommenting the proper lines in '/etc/profile.d/intel-mediasdk.sh'"
+    printf '%s\n' '(relogin after).'
+}