From dd1c8879c503a093b807ea8ab04c31f685e7b340 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Jun 2022 22:54:19 +0200 Subject: [PATCH] package/intel-mediadriver: bump version to 22.4.3 Added patch to fix uClibc build. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0001-Fix-uClibc-build.patch | 65 +++++++++++++++++++ .../intel-mediadriver/intel-mediadriver.hash | 2 +- .../intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 package/intel-mediadriver/0001-Fix-uClibc-build.patch diff --git a/package/intel-mediadriver/0001-Fix-uClibc-build.patch b/package/intel-mediadriver/0001-Fix-uClibc-build.patch new file mode 100644 index 0000000000..2a14a260d0 --- /dev/null +++ b/package/intel-mediadriver/0001-Fix-uClibc-build.patch @@ -0,0 +1,65 @@ +From 2007edc683499d2e82772f84241b453bdf319372 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 10 Jun 2022 18:42:34 +0200 +Subject: [PATCH] Fix uClibc build + +uClibc does not provide execinfo.h + +Patch sent upstream: https://github.com/intel/media-driver/pull/1437 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 6 ++++++ + .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8305acfdb..6bec00f7d 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) + + option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) + ++include(CheckIncludeFileCXX) ++check_include_file_cxx("execinfo.h" HAVE_EXECINFO) ++if (HAVE_EXECINFO) ++ add_definitions(-DHAVE_EXECINFO) ++endif() ++ + include(GNUInstallDirs) + + 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 +index ff0b68655..8ea621f0e 100644 +--- a/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 @@ + #include + #include // fork + #include ++#ifdef HAVE_EXECINFO + #include // backtrace ++#endif + + const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE; + MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr; +@@ -2492,6 +2494,7 @@ void MosUtilities::MosTraceEvent( + MOS_FreeMemory(pTraceBuf); + } + } ++#ifdef HAVE_EXECINFO + if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) + { + // reserve space for header and stack size field. +@@ -2511,6 +2514,7 @@ void MosUtilities::MosTraceEvent( + size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); + } + } ++#endif + } + return; + } +-- +2.30.2 + diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 92346e9dae..fadea2b18d 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e8e7faeb40e523b0daf61336853e09f59f810598093d65737cd119107cf933f8 intel-media-22.4.2.tar.gz +sha256 c30a63414d4aaf1a3b5c09db02b6c4da23b5998620ff8c950bb8258104576568 intel-media-22.4.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9f500346e6..d38d4e99fd 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.4.2 +INTEL_MEDIADRIVER_VERSION = 22.4.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause