From ec86f44fc428a78a69121c59aa46dee37a57a146 Mon Sep 17 00:00:00 2001 From: matthieu Date: Mon, 25 May 2026 06:45:51 +0000 Subject: [PATCH] Update to intel-media-driver 26.1.5 ok rsadowski@ --- graphics/intel-media-driver/Makefile | 2 +- graphics/intel-media-driver/distinfo | 4 +-- .../patch-media_driver_media_top_cmake_cmake | 4 +-- ...on_os_osservice_mos_utilities_specific_cpp | 2 +- ...mmon_os_osservice_mos_utilities_specific_h | 8 ++--- .../patch-media_softlet_media_top_cmake_cmake | 30 ------------------- 6 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 graphics/intel-media-driver/patches/patch-media_softlet_media_top_cmake_cmake diff --git a/graphics/intel-media-driver/Makefile b/graphics/intel-media-driver/Makefile index f9b4b0b54eb..7042d78ea72 100644 --- a/graphics/intel-media-driver/Makefile +++ b/graphics/intel-media-driver/Makefile @@ -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} diff --git a/graphics/intel-media-driver/distinfo b/graphics/intel-media-driver/distinfo index c08ec4a2c74..398b8efcaed 100644 --- a/graphics/intel-media-driver/distinfo +++ b/graphics/intel-media-driver/distinfo @@ -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 diff --git a/graphics/intel-media-driver/patches/patch-media_driver_media_top_cmake_cmake b/graphics/intel-media-driver/patches/patch-media_driver_media_top_cmake_cmake index a70b16de058..d879b76d64d 100644 --- a/graphics/intel-media-driver/patches/patch-media_driver_media_top_cmake_cmake +++ b/graphics/intel-media-driver/patches/patch-media_driver_media_top_cmake_cmake @@ -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}) diff --git a/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp b/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp index ac5dba2fa1d..d5efc1df158 100644 --- a/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp +++ b/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp @@ -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() { diff --git a/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_h b/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_h index 0e1202c95f3..8fc0b19855b 100644 --- a/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_h +++ b/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_h @@ -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 #include -#include + #include #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); diff --git a/graphics/intel-media-driver/patches/patch-media_softlet_media_top_cmake_cmake b/graphics/intel-media-driver/patches/patch-media_softlet_media_top_cmake_cmake deleted file mode 100644 index 244d4274672..00000000000 --- a/graphics/intel-media-driver/patches/patch-media_softlet_media_top_cmake_cmake +++ /dev/null @@ -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 "")