Update deps and provides. Add gcc13 fix. libcttmetrics static lib.

Add vpl-runtime to intel-media-sdk provides.

Make libcttmetrics as a static library to avoid conflict with the
libvpl-tools package.

4 files changed, 43 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2d9ea6b06ec..f45b926ba05d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = intel-media-sdk-git
 	pkgdesc = Legacy API for hardware video acceleration on Intel GPUs (Broadwell to Rocket Lake) (git version)
 	pkgver = 2023.2.2.r1.g7a72de33
-	pkgrel = 1
+	pkgrel = 2
 	url = https://software.intel.com/en-us/media-sdk/
 	arch = x86_64
 	license = MIT
 	makedepends = libdrm
-	makedepends = libva-git
+	makedepends = libva
 	makedepends = wayland
 	makedepends = intel-media-driver
 	makedepends = git
@@ -18,16 +18,21 @@ pkgbase = intel-media-sdk-git
 	makedepends = python
 	source = git+https://github.com/Intel-Media-SDK/MediaSDK.git
 	source = 010-intel-media-sdk-fix-reproducible-build.patch::https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch
+	source = 020-intel-media-sdk-gcc13-fix.patch
+	source = 030-intel-media-libcttmetrics-static-only.patch
 	sha256sums = SKIP
 	sha256sums = f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc
+	sha256sums = 38fc06cdc31372d26f1dc2a7e5b1ea57c22f8f83fbf84e0af5638a8040aa7f4e
+	sha256sums = a473fd7dbd3c7240a3511471cfad6a39dc462b102c88cd23c35e25f2e8ec0246
 
 pkgname = intel-media-sdk-git
 	depends = libdrm
-	depends = libva-git
+	depends = libva
 	depends = wayland
 	depends = libmfx-git=2023.2.2.r1.g7a72de33
 	depends = intel-media-driver
 	provides = intel-media-sdk
+	provides = vpl-runtime
 	conflicts = intel-media-sdk
 	options = !emptydirs
 
diff --git a/020-intel-media-sdk-gcc13-fix.patch b/020-intel-media-sdk-gcc13-fix.patch
new file mode 100644
index 000000000000..8033d0f423dc
--- /dev/null
+++ b/020-intel-media-sdk-gcc13-fix.patch
@@ -0,0 +1,10 @@
+--- a/api/mfx_dispatch/linux/mfxparser.cpp
++++ b/api/mfx_dispatch/linux/mfxparser.cpp
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <cstdint>
+ #include <list>
+ 
+ #include "mfxloader.h"
diff --git a/030-intel-media-libcttmetrics-static-only.patch b/030-intel-media-libcttmetrics-static-only.patch
new file mode 100644
index 000000000000..ad2dba8e9a2e
--- /dev/null
+++ b/030-intel-media-libcttmetrics-static-only.patch
@@ -0,0 +1,12 @@
+--- a/samples/metrics_monitor/CMakeLists.txt
++++ b/samples/metrics_monitor/CMakeLists.txt
+@@ -11,8 +11,7 @@ if( PKG_LIBDRM_FOUND AND ("${PKG_LIBDRM_VERSION}" VERSION_GREATER 2.4.91))
+ 
+     set(DEPENDENCIES libdrm )
+ 
+-    make_library( cttmetrics none shared )
+-    make_library( cttmetrics_static none static )
++    make_library( cttmetrics none static )
+ 
+     install( TARGETS cttmetrics LIBRARY DESTINATION ${MFX_SAMPLES_INSTALL_BIN_DIR} )
+ 
diff --git a/PKGBUILD b/PKGBUILD
index b2647ba7c996..be7b634024b8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,21 @@
 pkgbase=intel-media-sdk-git
 pkgname=('intel-media-sdk-git' 'libmfx-git')
 pkgver=2023.2.2.r1.g7a72de33
-pkgrel=1
+pkgrel=2
 pkgdesc='Legacy API for hardware video acceleration on Intel GPUs (Broadwell to Rocket Lake) (git version)'
 arch=('x86_64')
 url='https://software.intel.com/en-us/media-sdk/'
 license=('MIT')
-makedepends=('libdrm' 'libva-git' 'wayland' 'intel-media-driver'
+makedepends=('libdrm' 'libva' 'wayland' 'intel-media-driver'
              'git' 'git-lfs' 'cmake' 'libpciaccess' 'libx11' 'libxcb' 'python')
 source=('git+https://github.com/Intel-Media-SDK/MediaSDK.git'
-        '010-intel-media-sdk-fix-reproducible-build.patch'::'https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch')
+        '010-intel-media-sdk-fix-reproducible-build.patch'::'https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch'
+        '020-intel-media-sdk-gcc13-fix.patch'
+        '030-intel-media-libcttmetrics-static-only.patch')
 sha256sums=('SKIP'
-            'f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc')
+            'f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc'
+            '38fc06cdc31372d26f1dc2a7e5b1ea57c22f8f83fbf84e0af5638a8040aa7f4e'
+            'a473fd7dbd3c7240a3511471cfad6a39dc462b102c88cd23c35e25f2e8ec0246')
 
 export GIT_LFS_SKIP_SMUDGE='1'
 
@@ -28,6 +32,8 @@ prepare() {
     git -C MediaSDK lfs install --local
     git -C MediaSDK lfs pull "${source[0]/git+/}"
     patch -d MediaSDK -Np1 -i "${srcdir}/010-intel-media-sdk-fix-reproducible-build.patch"
+    patch -d MediaSDK -Np1 -i "${srcdir}/020-intel-media-sdk-gcc13-fix.patch"
+    patch -d MediaSDK -Np1 -i "${srcdir}/030-intel-media-libcttmetrics-static-only.patch"
 }
 
 pkgver() {
@@ -57,13 +63,13 @@ check() {
 }
 
 package_intel-media-sdk-git() {
-    depends=('libdrm' 'libva-git' 'wayland' "libmfx-git=${pkgver}" 'intel-media-driver')
-    provides=('intel-media-sdk')
+    depends=('libdrm' 'libva' 'wayland' "libmfx-git=${pkgver}" 'intel-media-driver')
+    provides=('intel-media-sdk' 'vpl-runtime')
     conflicts=('intel-media-sdk')
     options=('!emptydirs')
     
     DESTDIR="$pkgdir" cmake --install build
-    ln -s mfx/samples/libcttmetrics.so "${pkgdir}/usr/lib/libcttmetrics.so"
+    mv "${pkgdir}/usr/lib/libcttmetrics.a" "${pkgdir}/usr/lib/mfx/samples"
     install -D -m644 MediaSDK/LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
     
     [ -d 'libmfx' ] && rm -rf libmfx