From d684270cf4c3e8ff14288fbbf7097a8f34da28f4 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 | 40 ++++++++----------- srcpkgs/intel-media-driver/template | 4 +- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch index 17987b098d0a..4f2bcf734176 100644 --- a/srcpkgs/intel-media-driver/patches/execinfo.patch +++ b/srcpkgs/intel-media-driver/patches/execinfo.patch @@ -1,32 +1,24 @@ Fix builds on musl +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 bd1c5d1..82c8d35 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,6 @@ #include #include // fork #include -+#if defined(__GLIBC__) - #include // backtrace -+#endif - - const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE; - MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr; -@@ -2489,6 +2491,7 @@ - MOS_FreeMemory(pTraceBuf); - } - } -+#if defined(__GLIBC__) - if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) - { - // reserve space for header and stack size field. -@@ -2508,6 +2511,7 @@ - size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); - } - } -+#endif - } - return; - } - +-#include // backtrace + #include + #include // fstat + #include // System V IPC +@@ -2475,7 +2474,7 @@ void MosUtilities::MosTraceEvent( + // max 32-2=30 layers call stack in 64bit driver. + uint32_t nLen = 4*sizeof(uint32_t); + void **stack = (void **)(traceBuf + nLen); +- int num = backtrace(stack, ((sizeof(traceBuf)-nLen)/sizeof(void *))); ++ int num = 0; + if (num > 0) + { + uint32_t *header = (uint32_t *)traceBuf; 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"