summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorLim Siew Hoon <siew.hoon.lim@intel.com>2023-02-08 10:40:20 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-02-08 15:54:42 +0800
commitd4bba3cc53c5edc4514f497097f515ebde6593cb (patch)
treef7fd0e3a3b800f7d79c2d4ddd0f3a57de2a983c4 /recipes-multimedia
parent15c9cc795d53153f50c89f48121eeaa7bd4c9151 (diff)
downloadmeta-intel-d4bba3cc53c5edc4514f497097f515ebde6593cb.tar.gz
intel-media-driver: upgrade 22.5.4 -> 23.1.0
Drops patches already fixed and merged: * 0001-Fix-uClibc-build.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/libva/files/0001-Fix-uClibc-build.patch64
-rw-r--r--recipes-multimedia/libva/intel-media-driver_23.1.0.bb (renamed from recipes-multimedia/libva/intel-media-driver_22.5.4.bb)3
2 files changed, 1 insertions, 66 deletions
diff --git a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch b/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch
deleted file mode 100644
index 7fbf6d3a..00000000
--- a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From 1b737d3711826757a16eed382eb5d436072e4945 Mon Sep 17 00:00:00 2001
2From: Bernd Kuhls <bernd.kuhls@t-online.de>
3Date: Fri, 10 Jun 2022 18:42:34 +0200
4Subject: [PATCH] Fix uClibc build
5
6uClibc does not provide execinfo.h
7
8Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1437]
9Signed-off-by: hilmanzafri <hilman.zafri.mazlan@intel.com>
10---
11 CMakeLists.txt | 6 ++++++
12 .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++
13 2 files changed, 10 insertions(+)
14
15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 72b512087..db4ae54f8 100755
17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt
19@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
20
21 option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
22
23+include(CheckIncludeFileCXX)
24+check_include_file_cxx("execinfo.h" HAVE_EXECINFO)
25+if (HAVE_EXECINFO)
26+ add_definitions(-DHAVE_EXECINFO)
27+endif()
28+
29 include(GNUInstallDirs)
30
31 if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX)
32diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
33index 8b5d92da9..6d52e09ea 100644
34--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
35+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
36@@ -34,7 +34,9 @@
37 #include <signal.h>
38 #include <unistd.h> // fork
39 #include <algorithm>
40+#ifdef HAVE_EXECINFO
41 #include <execinfo.h> // backtrace
42+#endif
43 #include <sys/types.h>
44 #include <sys/stat.h> // fstat
45 #include <sys/ipc.h> // System V IPC
46@@ -2457,6 +2459,7 @@ void MosUtilities::MosTraceEvent(
47 MOS_FreeMemory(pTraceBuf);
48 }
49 }
50+#ifdef HAVE_EXECINFO
51 if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
52 {
53 // reserve space for header and stack size field.
54@@ -2476,6 +2479,7 @@ void MosUtilities::MosTraceEvent(
55 size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
56 }
57 }
58+#endif
59 }
60 return;
61 }
62--
632.34.1
64
diff --git a/recipes-multimedia/libva/intel-media-driver_22.5.4.bb b/recipes-multimedia/libva/intel-media-driver_23.1.0.bb
index c838154a..579cea08 100644
--- a/recipes-multimedia/libva/intel-media-driver_22.5.4.bb
+++ b/recipes-multimedia/libva/intel-media-driver_23.1.0.bb
@@ -19,10 +19,9 @@ REQUIRED_DISTRO_FEATURES = "opengl"
19DEPENDS += "libva gmmlib" 19DEPENDS += "libva gmmlib"
20 20
21SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ 21SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
22 file://0001-Fix-uClibc-build.patch \
23 " 22 "
24 23
25SRCREV = "e461c0558c87a327c5a133efbcb5295e85c7d7f5" 24SRCREV = "012af72d1fc55dfc89c29fc148dcfea939f2e9d9"
26S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
27 26
28COMPATIBLE_HOST:x86-x32 = "null" 27COMPATIBLE_HOST:x86-x32 = "null"