From bbed7a9558afcec2eb63dc8ff563ade739388752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Fri, 12 Aug 2022 14:45:56 +0100 Subject: [PATCH] intel-media-driver: update to 22.5.2. --- .../intel-media-driver/patches/execinfo.patch | 48 ++++++++++++++----- srcpkgs/intel-media-driver/template | 4 +- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch index 17987b098d0a..25d21192d5a1 100644 --- a/srcpkgs/intel-media-driver/patches/execinfo.patch +++ b/srcpkgs/intel-media-driver/patches/execinfo.patch @@ -1,26 +1,54 @@ -Fix builds on musl +From b17354142563b45e0ebf427485591426481368fd Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 29 Jul 2022 19:51:39 +0200 +Subject: [PATCH] Fix uClibc build +uClibc does not provide execinfo.h +--- + 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 053904748..4a3f0869e 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 bde216b83..120b02d55 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 @@ +@@ -34,7 +34,9 @@ #include #include // fork #include -+#if defined(__GLIBC__) ++#ifdef HAVE_EXECINFO #include // backtrace +#endif - - const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE; - MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr; -@@ -2489,6 +2491,7 @@ + #include + #include // fstat + #include // System V IPC +@@ -2473,6 +2475,7 @@ void MosUtilities::MosTraceEvent( MOS_FreeMemory(pTraceBuf); } } -+#if defined(__GLIBC__) ++#ifdef HAVE_EXECINFO if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) { // reserve space for header and stack size field. -@@ -2508,6 +2511,7 @@ +@@ -2492,6 +2495,7 @@ void MosUtilities::MosTraceEvent( size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); } } @@ -28,5 +56,3 @@ Fix builds on musl } return; } - - diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template index 855cfbdc3e0a..add82f6564fc 100644 --- a/srcpkgs/intel-media-driver/template +++ b/srcpkgs/intel-media-driver/template @@ -1,6 +1,6 @@ # Template file for 'intel-media-driver' pkgname=intel-media-driver -version=22.4.4 +version=22.5.2 revision=1 archs="x86_64*" wrksrc=media-driver-intel-media-${version} @@ -13,7 +13,7 @@ maintainer="Stefano Ragni " license="MIT, BSD-3-Clause" homepage="https://github.com/intel/media-driver" distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz" -checksum=19c3ef965ca155913719d138e297963b759f9b9d34d4ea85414d1c7b9d204253 +checksum=3b53bb6fb7793ef6c498ff086327ceefeef0a72d1f41b1fcaeae552a694fbcd8 build_options="nonfree" desc_option_nonfree="Enable nonfree kernels"