Update to intel-media-driver 26.1.5 ok rsadowski@

This commit is contained in:
matthieu
2026-05-25 06:45:51 +00:00
parent 03c33789d0
commit ec86f44fc4
6 changed files with 9 additions and 41 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ BROKEN-i386 = ld: error: [...] is incompatible with /usr/lib/crtbeginS.o
COMMENT = VAAPI driver for Intel HD 5000 (Gen8) or newer
VERSION = 25.3.4
VERSION = 26.1.5
GH_ACCOUNT = intel
GH_PROJECT = media-driver
GH_TAGNAME = intel-media-${VERSION}
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (intel-media-driver-25.3.4.tar.gz) = 75p6CIGyUNI999RnY0GjcpsoiHvPQEp01I219E/6AiA=
SIZE (intel-media-driver-25.3.4.tar.gz) = 28429128
SHA256 (intel-media-driver-26.1.5.tar.gz) = xWiZ/swAPQR85q+99HGFFRLgzqxmwu8irDbx5s5GFww=
SIZE (intel-media-driver-26.1.5.tar.gz) = 29364056
@@ -2,7 +2,7 @@ https://github.com/intel/media-driver/pull/1785
Index: media_driver/media_top_cmake.cmake
--- media_driver/media_top_cmake.cmake.orig
+++ media_driver/media_top_cmake.cmake
@@ -652,7 +652,7 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAG
@@ -625,7 +625,7 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAG
set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "")
@@ -11,7 +11,7 @@ Index: media_driver/media_top_cmake.cmake
if(Backtrace_FOUND)
set(MEDIA_LINK_EXTERNAL_LIBS "${MEDIA_LINK_EXTERNAL_LIBS} ${Backtrace_LIBRARY}")
endif()
@@ -680,7 +680,7 @@ if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" ST
@@ -653,7 +653,7 @@ if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" ST
endif()
target_compile_options( ${LIB_NAME} PUBLIC ${LIBGMM_CFLAGS_OTHER})
@@ -2,7 +2,7 @@ https://github.com/intel/media-driver/pull/1785
Index: media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
--- media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp.orig
+++ media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
@@ -2142,7 +2142,7 @@ uint32_t MosUtilities::MosGetThreadId(
@@ -2164,7 +2164,7 @@ uint32_t MosUtilities::MosGetThreadId(
uint32_t MosUtilities::MosGetCurrentThreadId()
{
@@ -2,18 +2,17 @@ https://github.com/intel/media-driver/pull/1785
Index: media_softlet/linux/common/os/osservice/mos_utilities_specific.h
--- media_softlet/linux/common/os/osservice/mos_utilities_specific.h.orig
+++ media_softlet/linux/common/os/osservice/mos_utilities_specific.h
@@ -26,16 +26,24 @@
@@ -26,8 +26,8 @@
#ifndef __MOS_UTILITIES_SPECIFIC_H__
#define __MOS_UTILITIES_SPECIFIC_H__
+#include <cstdlib>
#include <map>
-#include <malloc.h>
#include <string>
#include "mos_defs.h"
#include "media_class_trace.h"
+
#define LINUX_OS_VERSION_FILE "/proc/version"
@@ -36,7 +36,13 @@
#define NOT_FOUND -1
@@ -25,7 +24,6 @@ Index: media_softlet/linux/common/os/osservice/mos_utilities_specific.h
+#define _aligned_malloc(size, alignment) ({ void* ptr; posix_memalign(&ptr, alignment, size) ? NULL : ptr; })
+#endif
+#endif
+
#define _aligned_free(ptr) free(ptr)
typedef void (*MOS_UserFeatureCallback)( void*, bool);
@@ -1,30 +0,0 @@
https://github.com/intel/media-driver/pull/1785
Index: media_softlet/media_top_cmake.cmake
--- media_softlet/media_top_cmake.cmake.orig
+++ media_softlet/media_top_cmake.cmake
@@ -29,7 +29,16 @@ option (MEDIA_RUN_TEST_SUITE "run google test module a
include(${MEDIA_SOFTLET_CMAKE}/media_gen_flags.cmake)
include(${MEDIA_SOFTLET_CMAKE}/media_feature_flags.cmake)
+check_include_file_cxx("execinfo.h" HAVE_EXECINFO_H)
+if(HAVE_EXECINFO_H)
+ target_compile_definitions(${LIB_NAME} PRIVATE HAVE_EXECINFO_H)
+endif()
+check_library_exists(execinfo backtrace "" HAVE_LIBEXECINFO)
+if(HAVE_LIBEXECINFO)
+ target_link_libraries (${LIB_NAME} PRIVATE execinfo)
+endif()
+
if(NOT DEFINED SKIP_GMM_CHECK)
# checking dependencies
pkg_check_modules(LIBGMM REQUIRED igdgmm>=12.0.0)
@@ -266,7 +275,7 @@ set_target_properties(${LIB_NAME_STATIC} PROPERTIES PR
bs_ufo_link_libraries_noBsymbolic(
${LIB_NAME}_softlet
"${INCLUDED_LIBS}"
- "${PKG_PCIACCESS_LIBRARIES} m pthread dl"
+ "${PKG_PCIACCESS_LIBRARIES} m pthread"
)
if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" STREQUAL "")