From 7c288f85925a0caf86d4f2259d7adfcd82febe95 Mon Sep 17 00:00:00 2001 From: Lim Siew Hoon Date: Sat, 3 Jul 2021 02:39:09 +0800 Subject: intel-mediasdk: upgrade 21.1.3 -> 21.2.3 Drops patches already merged: * 0001-Don-t-try-to-autheticate-with-render-node.patch Signed-off-by: Lim Siew Hoon Signed-off-by: Anuj Mittal --- ...Don-t-try-to-autheticate-with-render-node.patch | 44 ---------------- .../mediasdk/intel-mediasdk_21.1.3.bb | 61 ---------------------- .../mediasdk/intel-mediasdk_21.2.3.bb | 60 +++++++++++++++++++++ 3 files changed, 60 insertions(+), 105 deletions(-) delete mode 100644 recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch delete mode 100644 recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb create mode 100644 recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb (limited to 'recipes-multimedia') 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 -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 ---- - 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/intel-mediasdk_21.1.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb deleted file mode 100644 index b3a30bc4..00000000 --- a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb +++ /dev/null @@ -1,61 +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 += "libdrm libva 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, ocl-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 \ - " - -SRCREV = "03164a0b491651c210abd4549ca5275ac974d105" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P(\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" diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb new file mode 100644 index 00000000..75faad35 --- /dev/null +++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb @@ -0,0 +1,60 @@ +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 += "libdrm libva 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, ocl-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 \ + " + +SRCREV = "24b964e32692f68ed01aad73850bdaa440c2fcd7" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P(\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" -- cgit v1.2.3-54-g00ecf