Update to version 23.1.5. Change source. General improvements.

5 files changed, 68 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39d868c96a0a..55315c06fd7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = intel-media-stack-bin
 	pkgdesc = Tools and libraries for developing media solutions on Intel products (pre-compiled binaries)
-	pkgver = 2021.2.3
+	pkgver = 23.1.5
 	pkgrel = 1
-	url = https://github.com/Intel-Media-SDK/MediaSDK/
+	epoch = 1
+	url = https://github.com/oneapi-src/oneVPL-intel-gpu//
 	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
-	depends = libdrm
 	depends = libx11
+	depends = libxcb
 	depends = libxext
 	depends = libxfixes
-	depends = wayland
 	optdepends = ocl-icd: for rotate_opencl plugin
 	optdepends = intel-compute-runtime: for rotate_opencl plugin
 	provides = intel-media-sdk
@@ -25,12 +23,16 @@ pkgbase = intel-media-stack-bin
 	provides = intel-media-driver
 	provides = libva
 	provides = libva-utils
-	noextract = intel-media-stack-bin-2021.2.3.tar.gz
+	provides = onevpl
+	provides = onevpl-intel-gpu
+	noextract = intel-media-stack-bin-23.1.5.tar.gz
 	options = !strip
 	options = !emptydirs
-	source = intel-media-stack-bin-2021.2.3.tar.gz::https://github.com/Intel-Media-SDK/MediaSDK/releases/download/intel-mediasdk-21.2.3/MediaStack.tar.gz
+	source = intel-media-stack-bin-23.1.5.tar.gz::https://github.com/oneapi-src/oneVPL-intel-gpu//releases/download/intel-onevpl-23.1.5/MediaStack.tar.gz
 	source = 010-intel-media-stack-bin-fix-install.patch
-	sha256sums = 230ce1418677c4bf9162d98c434aca3cf802d2ad4eb6a2a549488b3353d99a0d
-	sha256sums = 500c2236c71812ca816dbc0752fa5038b41fc73a71c8d1d6684ea770f8918f74
+	source = 020-intel-media-stack-bin-fix-profile.patch
+	sha256sums = bf3442edbe185ef87c1199f176d772997735f1115c48cea89b4d7ffbe858664e
+	sha256sums = 769757c058e750a7c4e00382719f34aa27d4d804423af0e55984b719c9332cb3
+	sha256sums = b6c8e3d9db6195b3d0d2299774b1f57ef09c2f80eda8c7f1d0507d769dcfb62f
 
 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 d9d2d060e18d..ebc565c721de 100644
--- a/010-intel-media-stack-bin-fix-install.patch
+++ b/010-intel-media-stack-bin-fix-install.patch
@@ -3,42 +3,44 @@
 @@ -21,6 +21,8 @@
  # this notice or any other notice embedded in Materials by Intel or Intel's
  # suppliers or licensors in any way.
- 
+
 +pkgdir=
 +
  # Set Bash color
  ECHO_PREFIX_INFO="\033[1;32;40mINFO...\033[0;0m"
  ECHO_PREFIX_ERROR="\033[1;31;40mError...\033[0;0m"
-@@ -87,21 +89,21 @@ fi
+@@ -87,11 +89,11 @@ fi
  
  # Install MSDK
- if [ -d $MEDIASDK_DIR ]; then
--    try_command rm -fr /$MEDIASDK_DIR
--    try_command mkdir -p /$MEDIASDK_DIR
--    try_command cp -dfr $MEDIASDK_DIR/* /$MEDIASDK_DIR
--    echo -e $ECHO_PREFIX_INFO "MediaSDK installed successfully in /$MEDIASDK_DIR!"
-+    try_command rm -fr ${pkgdir}/$MEDIASDK_DIR
-+    try_command mkdir -p ${pkgdir}/$MEDIASDK_DIR
-+    try_command cp -dfr $MEDIASDK_DIR/* ${pkgdir}/$MEDIASDK_DIR
-+    echo -e $ECHO_PREFIX_INFO "MediaSDK installed successfully in ${pkgdir}/$MEDIASDK_DIR!"
+ if [ -d $MEDIA_DIR ]; then
+-    try_command rm -fr /$MEDIA_DIR
+-    try_command mkdir -p /$MEDIA_DIR
+-    try_command cp -dfr $MEDIA_DIR/* /$MEDIA_DIR
+-    try_command cp LICENSE /$MEDIA_DIR/
+-    try_command cp README.md /$MEDIA_DIR/
++    try_command rm -fr "${pkgdir}/$MEDIA_DIR"
++    try_command mkdir -p "${pkgdir}/$MEDIA_DIR"
++    try_command cp -dfr $MEDIA_DIR/* "${pkgdir}/$MEDIA_DIR"
++    try_command cp LICENSE "${pkgdir}/$MEDIA_DIR/"
++    try_command cp README.md "${pkgdir}/$MEDIA_DIR/"
+     echo -e $ECHO_PREFIX_INFO "Media Stack installed successfully in /$MEDIA_DIR!"
  else
-     echo -e $ECHO_PREFIX_ERROR "MediaSDK missed in this package!"
- fi
+     echo -e $ECHO_PREFIX_ERROR "Media Stack missed in this package!"
+@@ -99,11 +101,11 @@ fi
  
  echo -e $ECHO_PREFIX_INFO "Installing Config files..."
- if [ -f etc/profile.d/intel-mediasdk.sh ]; then
--    try_command cp -f etc/profile.d/intel-mediasdk.* /etc/profile.d/
--    echo -e  $ECHO_PREFIX_INFO "The LIBVA_DRIVERS_PATH/LIBVA_DRIVER_NAME will be exported through /etc/profile.d/intel-mediasdk.(c)sh for intel media solution. Please reboot to make it effective."
-+    try_command cp -f etc/profile.d/intel-mediasdk.* ${pkgdir}/etc/profile.d/
-+    echo -e  $ECHO_PREFIX_INFO "The LIBVA_DRIVERS_PATH/LIBVA_DRIVER_NAME will be exported through ${pkgdir}/etc/profile.d/intel-mediasdk.(c)sh for intel media solution."
+ if [ -f etc/profile.d/intel-media.sh ]; then
+-    try_command cp -f etc/profile.d/intel-media.* /etc/profile.d/
++    try_command cp -f etc/profile.d/intel-media.* "${pkgdir}/etc/profile.d/"
+     echo -e  $ECHO_PREFIX_INFO "The LIBVA_DRIVERS_PATH/LIBVA_DRIVER_NAME will be exported through /etc/profile.d/intel-media.(c)sh for intel media solution. Please reboot to make it effective."
  fi
- if [ -f etc/profile.d/intel-mediasdk-devel.sh ]; then
--    try_command cp -f etc/profile.d/intel-mediasdk-devel.* /etc/profile.d/
-+    try_command cp -f etc/profile.d/intel-mediasdk-devel.* ${pkgdir}/etc/profile.d/
+ if [ -f etc/profile.d/intel-media-devel.sh ]; then
+-    try_command cp -f etc/profile.d/intel-media-devel.* /etc/profile.d/
++    try_command cp -f etc/profile.d/intel-media-devel.* "${pkgdir}/etc/profile.d/"
  fi
  
  # !!! IMPORTANT !!!
-@@ -109,11 +111,8 @@ fi
+@@ -111,11 +113,8 @@ fi
  #    'ldconfig'
  # missing anything
  if [ -d etc/ld.so.conf.d ]; then
@@ -47,8 +49,8 @@
 -    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."
-+    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/
++    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/"
  fi
  
 -echo -e $ECHO_PREFIX_INFO "Package installation Done. Please Reboot."
diff --git a/020-intel-media-stack-bin-fix-profile.patch b/020-intel-media-stack-bin-fix-profile.patch
new file mode 100644
index 000000000000..69e63928c3fd
--- /dev/null
+++ b/020-intel-media-stack-bin-fix-profile.patch
@@ -0,0 +1,8 @@
+--- a/etc/profile.d/intel-media.sh
++++ b/etc/profile.d/intel-media.sh
+@@ -1,4 +1,4 @@
+ # add libva driver path/name exporting for intel media solution
+ export LIBVA_DRIVERS_PATH=/opt/intel/media/lib64
+ export LIBVA_DRIVER_NAME=iHD
+-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel/media/lib64
++export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"${LD_LIBRARY_PATH}":}/opt/intel/media/bin"
diff --git a/PKGBUILD b/PKGBUILD
index 53ef4e300356..0cd504ba2f93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,35 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=intel-media-stack-bin
-pkgver=2021.2.3
+pkgver=23.1.5
 pkgrel=1
+epoch=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/'
+url='https://github.com/oneapi-src/oneVPL-intel-gpu//'
 license=('MIT')
-depends=('gcc-libs' 'libpciaccess' 'libgl' 'libdrm' 'libx11' 'libxext'
-         'libxfixes' 'wayland')
+depends=('gcc-libs' 'libgl' 'libx11' 'libxcb' 'libxext' 'libxfixes')
 optdepends=('ocl-icd: for rotate_opencl plugin'
             'intel-compute-runtime: for rotate_opencl plugin')
-makedepends=('chrpath' 'lsb-release' 'ocl-icd')
+makedepends=('chrpath' 'lsb-release')
 provides=('intel-media-sdk' 'libmfx' 'intel-gmmlib' 'intel-media-driver'
-          'libva' 'libva-utils')
+          'libva' 'libva-utils' 'onevpl' 'onevpl-intel-gpu')
 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')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/oneapi-src/oneVPL-intel-gpu//releases/download/intel-onevpl-${pkgver}/MediaStack.tar.gz"
+        '010-intel-media-stack-bin-fix-install.patch'
+        '020-intel-media-stack-bin-fix-profile.patch')
 noextract=("${pkgname}-${pkgver}.tar.gz")
-sha256sums=('230ce1418677c4bf9162d98c434aca3cf802d2ad4eb6a2a549488b3353d99a0d'
-            '500c2236c71812ca816dbc0752fa5038b41fc73a71c8d1d6684ea770f8918f74')
+sha256sums=('bf3442edbe185ef87c1199f176d772997735f1115c48cea89b4d7ffbe858664e'
+            '769757c058e750a7c4e00382719f34aa27d4d804423af0e55984b719c9332cb3'
+            'b6c8e3d9db6195b3d0d2299774b1f57ef09c2f80eda8c7f1d0507d769dcfb62f')
 
 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"
+    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/020-intel-media-stack-bin-fix-profile.patch"
+    sed -i "/^pkgdir=/s|$|'${pkgdir}'|" "${pkgname}-${pkgver}/install_media.sh"
     chmod a+x "${pkgname}-${pkgver}/install_media.sh"
 }
 
@@ -49,22 +52,17 @@ package() {
         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)
+        printf '%s\n' "${_cmd} PATH=\"\${PATH:+\"\${PATH}\":}/opt/intel/media/bin\"" >> "$_file"
+    done < <(find "${pkgdir}/etc/profile.d" -maxdepth 1 -mindepth 1 -type f -name 'intel-media.*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"
+    ln -s ../share/mfx/samples/_bin/libcttmetrics.so "${pkgdir}/opt/intel/media/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"
+    # remove insecure rpath
+    chrpath -d "${pkgdir}/opt/intel/media/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
+    sed -i "2i${_info}" "${pkgdir}/etc/profile.d"/intel-media.{,c}sh
+    sed -i '3,4s/^/#/'  "${pkgdir}/etc/profile.d"/intel-media.{,c}sh
 }
diff --git a/intel-media-stack-bin.install b/intel-media-stack-bin.install
index e5305c0a3f91..43d0644865fc 100644
--- a/intel-media-stack-bin.install
+++ b/intel-media-stack-bin.install
@@ -1,6 +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' "example, by uncommenting the proper lines in '/etc/profile.d/intel-media.sh'"
     printf '%s\n' '(relogin after).'
 }