3 files changed, 26 insertions, 53 deletions

diff --git a/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch b/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch
deleted file mode 100644
index d424b68d..00000000
--- a/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a Mon Sep 17 00:00:00 2001
-From: Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com>
-Date: Wed, 7 Apr 2021 05:30:15 +0000
-Subject: [PATCH] Don't try to autheticate with render node
-
-Replicate similar libVA wayland change.
-https://github.com/intel/libva/commit/283f776a9649dcef58b47958c1269499adfa1cd4
-
-Platform: ADL-S, EHL, TGL
-OS: Yocto native wayland weston
-Tested:
-    ./sample_decode h265 -i Puppies_3840x2160.265 -rwld -rgb4
-
-Issue: #2592
-
-Upstream-Status: Backport [https://github.com/Intel-Media-SDK/MediaSDK/commit/6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a]
-
-Signed-off-by: Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com>
----
- samples/sample_misc/wayland/src/class_wayland.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/samples/sample_misc/wayland/src/class_wayland.cpp b/samples/sample_misc/wayland/src/class_wayland.cpp
-index 62f326e3..4a0beed3 100644
---- a/samples/sample_misc/wayland/src/class_wayland.cpp
-+++ b/samples/sample_misc/wayland/src/class_wayland.cpp
-@@ -433,8 +433,12 @@ void Wayland::DrmHandleDevice(const char *name)
-             m_device_name << "\n";
-         return;
-     }
--    drmGetMagic(m_fd, &magic);
--    wl_drm_authenticate(m_drm, magic);
-+
-+    int type = drmGetNodeTypeFromFd(m_fd);
-+    if (type != DRM_NODE_RENDER) {
-+        drmGetMagic(m_fd, &magic);
-+        wl_drm_authenticate(m_drm, magic);
-+    }
- }
- 
- void Wayland::DrmHandleAuthenticated()
--- 
-2.24.3
-
diff --git a/recipes-multimedia/mediasdk/files/fix-gcc13.patch b/recipes-multimedia/mediasdk/files/fix-gcc13.patch
new file mode 100644
index 00000000..fb973870
--- /dev/null
+++ b/recipes-multimedia/mediasdk/files/fix-gcc13.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inactive-Upstream
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+diff --git a/api/mfx_dispatch/linux/mfxparser.cpp b/api/mfx_dispatch/linux/mfxparser.cpp
+index 9d3823ec3e..12e46d1881 100644
+--- a/api/mfx_dispatch/linux/mfxparser.cpp
++++ b/api/mfx_dispatch/linux/mfxparser.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <ctype.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb
index b3a30bc4..f00a4404 100644
--- a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb
+++ b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb
@@ -12,12 +12,14 @@ CVE_DETAILS = "intel:media_sdk"
 
 # Only for 64 bit until media-driver issues aren't fixed
 COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_x86-x32 = "null"
+COMPATIBLE_HOST:x86-x32 = "null"
 
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 
-DEPENDS += "libdrm libva intel-media-driver"
+DEPENDS += "libva"
+
+RDEPENDS:${PN} += "intel-media-driver"
 
 PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \
                    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \
@@ -27,16 +29,16 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)
 
 PACKAGECONFIG[dri3]     = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF"
 PACKAGECONFIG[itt]      = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt"
-PACKAGECONFIG[opencl]   = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers"
+PACKAGECONFIG[opencl]   = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, virtual/opencl-icd opencl-clhpp opencl-headers"
 PACKAGECONFIG[samples]  = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF"
 PACKAGECONFIG[wayland]  = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native"
 
 SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \
            file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
-           file://0001-Don-t-try-to-autheticate-with-render-node.patch \
+           file://fix-gcc13.patch \
            "
 
-SRCREV = "03164a0b491651c210abd4549ca5275ac974d105"
+SRCREV = "869b60a6c3d7b5e9f7c3b3b914986322dca4bbae"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$"
@@ -45,17 +47,17 @@ inherit cmake pkgconfig
 
 EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include"
 
-do_install_append() {
+do_install:append() {
         mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples
 }
 
 PACKAGE_BEFORE_PN = " ${PN}-samples"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
                  ${libdir}/mfx \
                  ${datadir}/mfx/plugins.cfg \
                  "
 
-FILES_${PN}-samples = "${libdir}/mfx/samples"
+FILES:${PN}-samples = "${libdir}/mfx/samples"
 
-INSANE_SKIP_${PN}-samples += "staticdev"
+INSANE_SKIP:${PN}-samples += "staticdev"