summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorLim Siew Hoon <siew.hoon.lim@intel.com>2021-07-02 18:39:09 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2021-07-03 14:48:10 (GMT)
commit7c288f85925a0caf86d4f2259d7adfcd82febe95 (patch)
tree98f92e3567dc50cf74ae13f4d81818977a1dd73b /recipes-multimedia
parentdb0de0a972cec8eef97847a883ab992e6f71adbd (diff)
downloadmeta-intel-7c288f85925a0caf86d4f2259d7adfcd82febe95.tar.gz
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 <siew.hoon.lim@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r--recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch44
-rw-r--r--recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb (renamed from recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb)3
2 files changed, 1 insertions, 46 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 d424b68..0000000
--- a/recipes-multimedia/mediasdk/files/0001-Don-t-try-to-autheticate-with-render-node.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a Mon Sep 17 00:00:00 2001
2From: Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com>
3Date: Wed, 7 Apr 2021 05:30:15 +0000
4Subject: [PATCH] Don't try to autheticate with render node
5
6Replicate similar libVA wayland change.
7https://github.com/intel/libva/commit/283f776a9649dcef58b47958c1269499adfa1cd4
8
9Platform: ADL-S, EHL, TGL
10OS: Yocto native wayland weston
11Tested:
12 ./sample_decode h265 -i Puppies_3840x2160.265 -rwld -rgb4
13
14Issue: #2592
15
16Upstream-Status: Backport [https://github.com/Intel-Media-SDK/MediaSDK/commit/6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a]
17
18Signed-off-by: Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com>
19---
20 samples/sample_misc/wayland/src/class_wayland.cpp | 8 ++++++--
21 1 file changed, 6 insertions(+), 2 deletions(-)
22
23diff --git a/samples/sample_misc/wayland/src/class_wayland.cpp b/samples/sample_misc/wayland/src/class_wayland.cpp
24index 62f326e3..4a0beed3 100644
25--- a/samples/sample_misc/wayland/src/class_wayland.cpp
26+++ b/samples/sample_misc/wayland/src/class_wayland.cpp
27@@ -433,8 +433,12 @@ void Wayland::DrmHandleDevice(const char *name)
28 m_device_name << "\n";
29 return;
30 }
31- drmGetMagic(m_fd, &magic);
32- wl_drm_authenticate(m_drm, magic);
33+
34+ int type = drmGetNodeTypeFromFd(m_fd);
35+ if (type != DRM_NODE_RENDER) {
36+ drmGetMagic(m_fd, &magic);
37+ wl_drm_authenticate(m_drm, magic);
38+ }
39 }
40
41 void Wayland::DrmHandleAuthenticated()
42--
432.24.3
44
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_21.1.3.bb b/recipes-multimedia/mediasdk/intel-mediasdk_21.2.3.bb
index b3a30bc..75faad3 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
33 33
34SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \ 34SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \
35 file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ 35 file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
36 file://0001-Don-t-try-to-autheticate-with-render-node.patch \
37 " 36 "
38 37
39SRCREV = "03164a0b491651c210abd4549ca5275ac974d105" 38SRCREV = "24b964e32692f68ed01aad73850bdaa440c2fcd7"
40S = "${WORKDIR}/git" 39S = "${WORKDIR}/git"
41 40
42UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" 41UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$"