Drops patches already merged: * 0001-Don-t-try-to-autheticate-with-render-node.patch
Signed-off-by: Lim Siew Hoon <[email protected]> --- ...-try-to-autheticate-with-render-node.patch | 44 ------------------- ...sdk_21.1.3.bb => intel-mediasdk_21.2.3.bb} | 3 +- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch rename recipes-multimedia/mediasdk/{intel-mediasdk_21.1.3.bb => intel-mediasdk_21.2.3.bb} (94%) 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 <[email protected]> -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 <[email protected]> ---- - 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.2.3.bb similarity index 94% rename from recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb rename to recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb index b3a30bc4..75faad35 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb @@ -33,10 +33,9 @@ PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland way 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" +SRCREV = "24b964e32692f68ed01aad73850bdaa440c2fcd7" S = "${WORKDIR}/git" UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7134): https://lists.yoctoproject.org/g/meta-intel/message/7134 Mute This Topic: https://lists.yoctoproject.org/mt/83935630/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
