Updated to version 2020.1.1

4 files changed, 45 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d0cfbfc071e..a59c3cc2598f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = intel-media-stack-bin
-	pkgdesc = Tools and libraries for developing media solutions on Intel products. Includes MediaSDK, Media Driver, libva and libva-utils.
-	pkgver = 2019.1.0
-	pkgrel = 2
+	pkgdesc = Tools and libraries for developing media solutions on Intel products (pre-compiled binaries)
+	pkgver = 2020.1.1
+	pkgrel = 1
 	url = https://github.com/Intel-Media-SDK/MediaSDK/
-	install = intel-media-stack-bin.install
 	arch = x86_64
 	license = MIT
-	makedepends = lsb-release
 	depends = gcc-libs
 	depends = libpciaccess
+	depends = libgl
+	depends = libdrm
 	depends = libx11
 	depends = libxext
 	depends = libxfixes
@@ -22,19 +22,18 @@ pkgbase = intel-media-stack-bin
 	provides = libva
 	provides = libva-utils
 	conflicts = intel-media-sdk
-	noextract = intel-media-stack-bin-2019.1.0.tar.gz
+	conflicts = libmfx
+	conflicts = intel-gmmlib
+	conflicts = intel-media-driver
+	conflicts = libva
+	conflicts = libva-utils
+	noextract = intel-media-stack-bin-2020.1.1.tar.gz
 	options = !strip
 	options = !emptydirs
-	backup = etc/profile.d/intel-mediasdk-devel.sh
-	backup = etc/profile.d/intel-mediasdk-devel.csh
-	backup = etc/profile.d/intel-mediasdk.sh
-	backup = etc/profile.d/intel-mediasdk.csh
-	source = intel-media-stack-bin-2019.1.0.tar.gz::https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-19.1.0/MediaStack.tar.gz
-	source = https://raw.githubusercontent.com/Intel-Media-SDK/MediaSDK/intel-mediasdk-19.1.0/LICENSE
-	source = intel-media-stack-bin-fix-install.patch
-	sha256sums = 863f837b156a66208adb1b4f0b977e2b8f2c6075d6ab93c147e15e1c8781c588
-	sha256sums = dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6
-	sha256sums = 5dabda9fbe6c26270c675ede993b395789d1d50be725b8bb8dbb6e206ee54fb1
+	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 = 010-intel-media-stack-bin-fix-install.patch
+	sha256sums = f411ded6381dc3ffc4827852e6ff56cfb32abad6669b45afed8a90cd7678a3d8
+	sha256sums = 660d31d03c64d40aa7c1c25304ce40469a159e415ba70957b8f21acecbb91af5
 
 pkgname = intel-media-stack-bin
 
diff --git a/intel-media-stack-bin-fix-install.patch b/010-intel-media-stack-bin-fix-install.patch
index 6866ec5093e7..64c438df2fb0 100644
--- a/intel-media-stack-bin-fix-install.patch
+++ b/010-intel-media-stack-bin-fix-install.patch
@@ -1,6 +1,6 @@
 diff -Naurp a/install_media.sh b/install_media.sh
---- a/install_media.sh	2019-03-27 20:53:54.000000000 +0000
-+++ b/install_media.sh	2019-04-25 02:22:52.094655835 +0000
+--- a/install_media.sh	2019-07-09 15:14:08.000000000 +0000
++++ b/install_media.sh	2020-06-07 12:51:16.920145955 +0000
 @@ -21,6 +21,8 @@
  # this notice or any other notice embedded in Materials by Intel or Intel's
  # suppliers or licensors in any way.
@@ -10,7 +10,7 @@ diff -Naurp a/install_media.sh b/install_media.sh
  # Set Bash color
  ECHO_PREFIX_INFO="\033[1;32;40mINFO...\033[0;0m"
  ECHO_PREFIX_ERROR="\033[1;31;40mError...\033[0;0m"
-@@ -87,10 +89,10 @@ fi
+@@ -87,21 +89,21 @@ fi
  
  # Install MSDK
  if [ -d $MEDIASDK_DIR ]; then
@@ -25,21 +25,6 @@ diff -Naurp a/install_media.sh b/install_media.sh
  else
      echo -e $ECHO_PREFIX_ERROR "MediaSDK missed in this package!"
  fi
-@@ -98,33 +100,33 @@ fi
- # Install MDF Runtime
- MDF_DIR=opt/intel/common/mdf
- if [ -d $MDF_DIR ]; then
--    try_command rm -fr /$MDF_DIR
--    try_command mkdir -p /$MDF_DIR
--    try_command cp -dfr $MDF_DIR/* /$MDF_DIR
--    echo -e $ECHO_PREFIX_INFO "MDF Runtime installed successfully in /$MDF_DIR!"
-+    try_command rm -fr ${pkgdir}/$MDF_DIR
-+    try_command mkdir -p ${pkgdir}/$MDF_DIR
-+    try_command cp -dfr $MDF_DIR/* ${pkgdir}/$MDF_DIR
-+    echo -e $ECHO_PREFIX_INFO "MDF Runtime installed successfully in ${pkgdir}/$MDF_DIR!"
- else
-     echo -e $ECHO_PREFIX_ERROR "MDF Runtime missed in this package!"
- fi
  
  echo -e $ECHO_PREFIX_INFO "Installing Config files..."
  if [ -f etc/profile.d/intel-mediasdk.sh ]; then
@@ -54,9 +39,8 @@ diff -Naurp a/install_media.sh b/install_media.sh
  fi
  
  # !!! IMPORTANT !!!
- # keep below as the final step for UMD installation to avoid
--#    'ldconfig'
-+##    'ldconfig'
+@@ -109,11 +111,8 @@ fi
+ #    'ldconfig'
  # missing anything
  if [ -d etc/ld.so.conf.d ]; then
 -    try_command mkdir -p /etc/ld.so.conf.d
@@ -66,9 +50,6 @@ diff -Naurp a/install_media.sh b/install_media.sh
 -    echo -e $ECHO_PREFIX_INFO "Calling to ldconfig is done."
 +    try_command mkdir -p ${pkgdir}/etc/ld.so.conf.d
 +    try_command cp -dfr etc/ld.so.conf.d/* ${pkgdir}/etc/ld.so.conf.d/
-+#    echo -e $ECHO_PREFIX_INFO "Calling ldconfig after all user-space drivers and config files are in place..."
-+#    try_command ldconfig
-+#    echo -e $ECHO_PREFIX_INFO "Calling to ldconfig is done."
  fi
  
 -echo -e $ECHO_PREFIX_INFO "Package installation Done. Please Reboot."
diff --git a/PKGBUILD b/PKGBUILD
index 0d3f0808eb47..51e781657d0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,84 +1,41 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=intel-media-stack-bin
-pkgver=2019.1.0
-_srcver="${pkgver:2}"
-pkgrel=2
-pkgdesc='Tools and libraries for developing media solutions on Intel products. Includes MediaSDK, Media Driver, libva and libva-utils.'
+pkgver=2020.1.1
+pkgrel=1
+pkgdesc='Tools and libraries for developing media solutions on Intel products (pre-compiled binaries)'
 arch=('x86_64')
 url='https://github.com/Intel-Media-SDK/MediaSDK/'
 license=('MIT')
-depends=('gcc-libs' 'libpciaccess' 'libx11' 'libxext' 'libxfixes' 'wayland')
+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=('lsb-release')
-provides=('intel-media-sdk' 'libmfx' 'intel-gmmlib' 'intel-media-driver' 'libva'
-          'libva-utils')
-conflicts=('intel-media-sdk')
-backup=('etc/profile.d/intel-mediasdk-devel.sh'
-        'etc/profile.d/intel-mediasdk-devel.csh'
-        'etc/profile.d/intel-mediasdk.sh'
-        'etc/profile.d/intel-mediasdk.csh')
+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="${pkgname}.install"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-${_srcver}/MediaStack.tar.gz"
-        "https://raw.githubusercontent.com/Intel-Media-SDK/MediaSDK/intel-mediasdk-${_srcver}/LICENSE"
-        'intel-media-stack-bin-fix-install.patch')
+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=('863f837b156a66208adb1b4f0b977e2b8f2c6075d6ab93c147e15e1c8781c588'
-            'dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6'
-            '5dabda9fbe6c26270c675ede993b395789d1d50be725b8bb8dbb6e206ee54fb1')
+sha256sums=('f411ded6381dc3ffc4827852e6ff56cfb32abad6669b45afed8a90cd7678a3d8'
+            '660d31d03c64d40aa7c1c25304ce40469a159e415ba70957b8f21acecbb91af5')
 
 prepare() {
     mkdir -p "${pkgname}-${pkgver}"
-    cd "${pkgname}-${pkgver}"
-    printf '%s\n' "  -> Extracting ${pkgname}-${pkgver}.tar.gz with bsdtar..."
-    bsdtar -xf "${srcdir}/${pkgname}-${pkgver}.tar.gz" -s'|[^/]*/||'
-    
-    patch -Np1 -i "${srcdir}/intel-media-stack-bin-fix-install.patch"
-    sed -i "/^pkgdir=/s|$|${pkgdir}|" install_media.sh
+    bsdtar -xf "${srcdir}/${pkgname}-${pkgver}.tar.gz" -C "${pkgname}-${pkgver}" -s'|[^/]*/||'
 }
 
 package() {
-    cd "${pkgname}-${pkgver}"
-    
-    local _command
-    local _file
-    
-    mkdir -p "$pkgdir"/{etc/{ld.so.conf.d,profile.d},usr/lib}
-    
-    ./install_media.sh
-    
-    # add bin folder to PATH
-    while read -rd '' _file
-    do
-        if printf '%s' "$_file" | grep -q '\.csh$'
-        then
-            _command='setenv'
-        else
-            _command='export'
-        fi
-        
-        printf '\n' >> "$_file"
-        printf '%s\n' '# add bin folder to PATH' >> "$_file"
-        printf '%s\n' "${_command} 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 -r "${pkgdir}/opt/intel/mediasdk/plugins"
-    rm    "${pkgdir}/opt/intel/mediasdk/lib64/mfx/plugins.cfg"
-    ln -s lib64/mfx                  "${pkgdir}/opt/intel/mediasdk/plugins"
-    ln -s ../../share/mfx/plugins.cfg "${pkgdir}/opt/intel/mediasdk/lib64/mfx/plugins.cfg"
-    
-    # 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
-    
-    # license
-    cd "$srcdir"
-    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    # install components
+    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}"
 }
diff --git a/intel-media-stack-bin.install b/intel-media-stack-bin.install
deleted file mode 100644
index 953b6ac25ae8..000000000000
--- a/intel-media-stack-bin.install
+++ /dev/null
@@ -1,10 +0,0 @@
-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).'
-}
-
-post_upgrade() {
-    post_install
-}