6 files changed, 2 insertions, 130 deletions

diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index b6ee370f..fb8b0b12 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -13,7 +13,6 @@ RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@i
 RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
 RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
 RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 968395fe..947f72d4 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "pcbios efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver vpl-gpu-rt', d)} gstreamer1.0-vaapi"
 
 # Enable optional dpdk:
 COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index a2b392c2..bfaf08dd 100644
--- a/conf/machine/intel-skylake-64.conf
+++ b/conf/machine/intel-skylake-64.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES += "efi"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-media-driver vpl-gpu-rt gstreamer1.0-vaapi"
 
 COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64"
 COMPATIBLE_MACHINE:pn-dpdk-module = "intel-skylake-64"
diff --git a/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch b/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch
deleted file mode 100644
index 87c4e82e..00000000
--- a/recipes-multimedia/mediasdk/files/0001-FindITT.cmake-fix-detection-of-header-library.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From be7cec47777bd35c44a59f2af73f12ce9c26d65c Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 7 Oct 2020 09:33:06 +0800
-Subject: [PATCH] FindITT.cmake: fix detection of header/library
-
-Use find_library to check for the library so distributions installing to
-standard locations can also work in addition to custom paths specified
-using CMAKE_ITT_HOME.
-
-Also add ittnotify to PATH_SUFFIXES for header for cases when
-ittnotify.h is installed in /usr/include/ittnotify for example.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- builder/FindITT.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/builder/FindITT.cmake b/builder/FindITT.cmake
-index ba2542c5..d96acf2e 100644
---- a/builder/FindITT.cmake
-+++ b/builder/FindITT.cmake
-@@ -35,19 +35,19 @@ if( ENABLE_ITT )
- 
-     find_path( ITT_INCLUDE_DIRS ittnotify.h
-       PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
--      PATH_SUFFIXES include )
-+      PATH_SUFFIXES include ittnotify)
- 
-     # Unfortunately SEAPI and VTune uses different names for itt library:
-     #  * SEAPI uses libittnotify${arch}.a
-     #  * VTune uses libittnotify.a
-     # We are trying to check both giving preference to SEAPI name.
--    find_path( ITT_LIBRARY_DIRS libittnotify${arch}.a
-+    find_library( ITT_LIBRARY_DIRS ittnotify${arch}
-       PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
-       PATH_SUFFIXES lib64 )
-     if( NOT ITT_LIBRARY_DIRS MATCHES NOTFOUND )
-       set( ITT_LIBRARIES "ittnotify${arch}" )
-     else()
--      find_path( ITT_LIBRARY_DIRS libittnotify.a
-+      find_library( ITT_LIBRARY_DIRS ittnotify
-         PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME}
-         PATH_SUFFIXES lib64 )
-       if( NOT ITT_LIBRARY_PATH MATCHES NOTFOUND )
--- 
-2.26.2
-
diff --git a/recipes-multimedia/mediasdk/files/fix-gcc13.patch b/recipes-multimedia/mediasdk/files/fix-gcc13.patch
deleted file mode 100644
index fb973870..00000000
--- a/recipes-multimedia/mediasdk/files/fix-gcc13.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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_23.2.2.bb b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb
deleted file mode 100644
index f00a4404..00000000
--- a/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-SUMMARY = "Intel(R) Media SDK for hardware accelerated media processing"
-DESCRIPTION = "Intel(R) Media SDK provides an API to access hardware-accelerated \
-video decode, encode and filtering on Intel® platforms with integrated graphics."
-
-HOMEPAGE = "https://github.com/Intel-Media-SDK/MediaSDK"
-BUGTRACKER = "https://github.com/Intel-Media-SDK/MediaSDK/issues"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3cb331af679cd8f968bf799a9c55b46e"
-
-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"
-
-inherit features_check
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-DEPENDS += "libva"
-
-RDEPENDS:${PN} += "intel-media-driver"
-
-PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d)} \
-                   ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \
-                   samples \
-                   itt \
-                   "
-
-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, 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://fix-gcc13.patch \
-           "
-
-SRCREV = "869b60a6c3d7b5e9f7c3b3b914986322dca4bbae"
-S = "${WORKDIR}/git"
-
-UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$"
-
-inherit cmake pkgconfig
-
-EXTRA_OECMAKE += "-DMFX_INCLUDE=${S}/api/include"
-
-do_install:append() {
-        mv ${D}${datadir}/mfx/samples ${D}${libdir}/mfx/samples
-}
-
-PACKAGE_BEFORE_PN = " ${PN}-samples"
-
-FILES:${PN} += " \
-                 ${libdir}/mfx \
-                 ${datadir}/mfx/plugins.cfg \
-                 "
-
-FILES:${PN}-samples = "${libdir}/mfx/samples"
-
-INSANE_SKIP:${PN}-samples += "staticdev"