intel-media-driver: upgrade 22.4.4 -> 22.5.3

Add patch to fix fails when applying
* 0001-Fix-uClibc-build.patch

Signed-off-by: hilmanzafri <hilman.zafri.mazlan@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
hilmanzafri 2022-09-21 19:18:25 +00:00 committed by Anuj Mittal
parent 61a2e69d2e
commit c4f1331c49
2 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
From 2e0a1de5fee7899cc7d4e67ec9893a621a3cf024 Mon Sep 17 00:00:00 2001 From 1b737d3711826757a16eed382eb5d436072e4945 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de> From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Fri, 10 Jun 2022 18:42:34 +0200 Date: Fri, 10 Jun 2022 18:42:34 +0200
Subject: [PATCH] Fix uClibc build Subject: [PATCH] Fix uClibc build
@ -6,14 +6,14 @@ Subject: [PATCH] Fix uClibc build
uClibc does not provide execinfo.h uClibc does not provide execinfo.h
Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1437] Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1437]
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> Signed-off-by: hilmanzafri <hilman.zafri.mazlan@intel.com>
--- ---
CMakeLists.txt | 6 ++++++ CMakeLists.txt | 6 ++++++
.../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++
2 files changed, 10 insertions(+) 2 files changed, 10 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8305acfdb..6bec00f7d 100755 index 72b512087..db4ae54f8 100755
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) @@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
@ -30,20 +30,20 @@ index 8305acfdb..6bec00f7d 100755
if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX) if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX)
diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
index ff0b68655..8ea621f0e 100644 index 8b5d92da9..6d52e09ea 100644
--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
@@ -51,7 +51,9 @@ @@ -34,7 +34,9 @@
#include <signal.h> #include <signal.h>
#include <unistd.h> // fork #include <unistd.h> // fork
#include <algorithm> #include <algorithm>
+#ifdef HAVE_EXECINFO +#ifdef HAVE_EXECINFO
#include <execinfo.h> // backtrace #include <execinfo.h> // backtrace
+#endif +#endif
#include <sys/types.h>
const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE; #include <sys/stat.h> // fstat
MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr; #include <sys/ipc.h> // System V IPC
@@ -2492,6 +2494,7 @@ void MosUtilities::MosTraceEvent( @@ -2457,6 +2459,7 @@ void MosUtilities::MosTraceEvent(
MOS_FreeMemory(pTraceBuf); MOS_FreeMemory(pTraceBuf);
} }
} }
@ -51,7 +51,7 @@ index ff0b68655..8ea621f0e 100644
if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
{ {
// reserve space for header and stack size field. // reserve space for header and stack size field.
@@ -2511,6 +2514,7 @@ void MosUtilities::MosTraceEvent( @@ -2476,6 +2479,7 @@ void MosUtilities::MosTraceEvent(
size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
} }
} }

View File

@ -22,7 +22,7 @@ SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
file://0001-Fix-uClibc-build.patch \ file://0001-Fix-uClibc-build.patch \
" "
SRCREV = "9ca43202d5ff3d1bf22f1b7ff1fe3bd2980b90dc" SRCREV = "a825bea1bcdd37bc2e7a773a9c92a52fc6363fae"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
COMPATIBLE_HOST:x86-x32 = "null" COMPATIBLE_HOST:x86-x32 = "null"