diff options
Diffstat (limited to 'recipes-multimedia/mediasdk/files')
2 files changed, 0 insertions, 93 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 @@ | |||
1 | From 6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com> | ||
3 | Date: Wed, 7 Apr 2021 05:30:15 +0000 | ||
4 | Subject: [PATCH] Don't try to autheticate with render node | ||
5 | |||
6 | Replicate similar libVA wayland change. | ||
7 | https://github.com/intel/libva/commit/283f776a9649dcef58b47958c1269499adfa1cd4 | ||
8 | |||
9 | Platform: ADL-S, EHL, TGL | ||
10 | OS: Yocto native wayland weston | ||
11 | Tested: | ||
12 | ./sample_decode h265 -i Puppies_3840x2160.265 -rwld -rgb4 | ||
13 | |||
14 | Issue: #2592 | ||
15 | |||
16 | Upstream-Status: Backport [https://github.com/Intel-Media-SDK/MediaSDK/commit/6945cd0ad84855ab4a2dc40016879fb5fc7f2b6a] | ||
17 | |||
18 | Signed-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 | |||
23 | diff --git a/samples/sample_misc/wayland/src/class_wayland.cpp b/samples/sample_misc/wayland/src/class_wayland.cpp | ||
24 | index 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 | -- | ||
43 | 2.24.3 | ||
44 | |||
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 @@ | |||
1 | From be7cec47777bd35c44a59f2af73f12ce9c26d65c Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 7 Oct 2020 09:33:06 +0800 | ||
4 | Subject: [PATCH] FindITT.cmake: fix detection of header/library | ||
5 | |||
6 | Use find_library to check for the library so distributions installing to | ||
7 | standard locations can also work in addition to custom paths specified | ||
8 | using CMAKE_ITT_HOME. | ||
9 | |||
10 | Also add ittnotify to PATH_SUFFIXES for header for cases when | ||
11 | ittnotify.h is installed in /usr/include/ittnotify for example. | ||
12 | |||
13 | Upstream-Status: Submitted | ||
14 | |||
15 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
16 | --- | ||
17 | builder/FindITT.cmake | 6 +++--- | ||
18 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/builder/FindITT.cmake b/builder/FindITT.cmake | ||
21 | index ba2542c5..d96acf2e 100644 | ||
22 | --- a/builder/FindITT.cmake | ||
23 | +++ b/builder/FindITT.cmake | ||
24 | @@ -35,19 +35,19 @@ if( ENABLE_ITT ) | ||
25 | |||
26 | find_path( ITT_INCLUDE_DIRS ittnotify.h | ||
27 | PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME} | ||
28 | - PATH_SUFFIXES include ) | ||
29 | + PATH_SUFFIXES include ittnotify) | ||
30 | |||
31 | # Unfortunately SEAPI and VTune uses different names for itt library: | ||
32 | # * SEAPI uses libittnotify${arch}.a | ||
33 | # * VTune uses libittnotify.a | ||
34 | # We are trying to check both giving preference to SEAPI name. | ||
35 | - find_path( ITT_LIBRARY_DIRS libittnotify${arch}.a | ||
36 | + find_library( ITT_LIBRARY_DIRS ittnotify${arch} | ||
37 | PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME} | ||
38 | PATH_SUFFIXES lib64 ) | ||
39 | if( NOT ITT_LIBRARY_DIRS MATCHES NOTFOUND ) | ||
40 | set( ITT_LIBRARIES "ittnotify${arch}" ) | ||
41 | else() | ||
42 | - find_path( ITT_LIBRARY_DIRS libittnotify.a | ||
43 | + find_library( ITT_LIBRARY_DIRS ittnotify | ||
44 | PATHS ${CMAKE_ITT_HOME} ${CMAKE_VTUNE_HOME} | ||
45 | PATH_SUFFIXES lib64 ) | ||
46 | if( NOT ITT_LIBRARY_PATH MATCHES NOTFOUND ) | ||
47 | -- | ||
48 | 2.26.2 | ||
49 | |||