10 files changed, 165 insertions, 20 deletions

diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile
index 7be9603f5ef3..3d6f6e68f17a 100644
--- a/multimedia/libva-intel-media-driver/Makefile
+++ b/multimedia/libva-intel-media-driver/Makefile
@@ -1,32 +1,28 @@
 PORTNAME=	media-driver
 DISTVERSIONPREFIX=	intel-media-
-DISTVERSION=	23.4.3
-PORTREVISION=	1
+DISTVERSION=	26.1.5
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-intel-
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	d54347296.patch:-p1 #https://github.com/intel/media-driver/pull/1785
+PATCHFILES=	d54347296.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	7e26e598e.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	6e1f5e635.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	7485cf796.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	3297302d8.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	0f3012331.patch:-p1 #https://github.com/intel/media-driver/pull/1785
-PATCHFILES+=	695b56fe0.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	be6bd904b.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	daaa7172e.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	59c560101.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	2933bb51e.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	4ec9b2bd6.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	17d384458.patch:-p1 #https://github.com/intel/media-driver/pull/1785
-PATCHFILES+=	abb792cad.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	7d261abf2.patch:-p1 #https://github.com/intel/media-driver/pull/1785
 PATCHFILES+=	67961a267.patch:-p1 #https://github.com/intel/media-driver/pull/1785
-PATCHFILES+= 	4461a2703.patch:-p1 #https://github.com/intel/media-driver/commit/4461a2703eae517f678ed8d8270ff14f356b9b19
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tmp386@live.com
 COMMENT=	VAAPI driver for Intel HD 5000 (Gen8) or newer
-WWW=		https://01.org/intel-media-for-linux
+WWW=		https://github.com/intel/media-driver/
 
 LICENSE=	MIT BSD3CLAUSE
 LICENSE_COMB=	multi
@@ -35,8 +31,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	only Intel GPUs on x86 are supported
 
-BUILD_DEPENDS=	gmmlib>=19.3.1:multimedia/gmmlib \
-		libva>=2.7.0:multimedia/libva
+BUILD_DEPENDS=	gmmlib>=22.10.0:multimedia/gmmlib \
+		libva>=2.23.0:multimedia/libva
 LIB_DEPENDS=	libigdgmm.so:multimedia/gmmlib \
 		libva.so:multimedia/libva
 
@@ -63,7 +59,7 @@ post-patch:
 		${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake
 
 post-patch-X11-off:
-	@${REINPLACE_CMD} -i .nox11 '/find_package.*X11/d' \
+	@${REINPLACE_CMD} '/find_package.*X11/d' \
 		${WRKSRC}/media_driver/media_top_cmake.cmake
 
 .include <bsd.port.mk>
diff --git a/multimedia/libva-intel-media-driver/distinfo b/multimedia/libva-intel-media-driver/distinfo
index 24effd3a012a..0a04100bd99c 100644
--- a/multimedia/libva-intel-media-driver/distinfo
+++ b/multimedia/libva-intel-media-driver/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1743060507
-SHA256 (intel-media-driver-intel-media-23.4.3_GH0.tar.gz) = 83b95eefe86c9d58d92c2a77793541ea3cb643dff419599ffa87899fd58738cd
-SIZE (intel-media-driver-intel-media-23.4.3_GH0.tar.gz) = 25805389
+TIMESTAMP = 1779053880
+SHA256 (intel-media-driver-intel-media-26.1.5_GH0.tar.gz) = c56899fecc003d047ce6afbdf471851512e0ceac66c2ef22ac36f1e6ce46170c
+SIZE (intel-media-driver-intel-media-26.1.5_GH0.tar.gz) = 29364056
 SHA256 (d54347296.patch) = b02fa57c0eee1f0d9d388a1cce649841b4902c297ed3c3f609ec5ae03f1131c4
 SIZE (d54347296.patch) = 1241
 SHA256 (7e26e598e.patch) = 703f78ec4ec117fa67b224c5989a08b5c95b71db08d2b8bece16ef131caa9db3
@@ -13,8 +13,6 @@ SHA256 (3297302d8.patch) = 8b029a88e44567d120dec6a940c9ecf3e71cc387c026942668d7e
 SIZE (3297302d8.patch) = 1162
 SHA256 (0f3012331.patch) = ad7862e7717db30d6e1295e49737a06425bcc00bd286fe4b2fa480e44d4e7855
 SIZE (0f3012331.patch) = 3421
-SHA256 (695b56fe0.patch) = e190823ee8c45437bda97ee0acbf07e6ee02197e8bc8f7e137080953e0c7a769
-SIZE (695b56fe0.patch) = 5997
 SHA256 (be6bd904b.patch) = 23e3c93a92fd03aac75b53a99d6edf8a9ed31ac046b1bf3266e041559b1836fc
 SIZE (be6bd904b.patch) = 2378
 SHA256 (daaa7172e.patch) = 0ff9dff3cbf0344368a1d5ec313d5ba5c38a482e7c9cfcb8b513b8972b898cb8
@@ -27,11 +25,7 @@ SHA256 (4ec9b2bd6.patch) = 3fadd418328cda433788ead1cf911003023e3dab79c29120de99b
 SIZE (4ec9b2bd6.patch) = 1040
 SHA256 (17d384458.patch) = 846da2dd019172cb4ab64c8d094dceae9ab21483378c8ea35e5fe81f0182ab20
 SIZE (17d384458.patch) = 7680
-SHA256 (abb792cad.patch) = 32c71ff1849e161b77833f8b3925644756de80779fae3497a31e1a95cfd52a5b
-SIZE (abb792cad.patch) = 1596
 SHA256 (7d261abf2.patch) = 68d24418ead81595ea4729764abd51e930d99e45ac5023790f3bcea37c02cbc6
 SIZE (7d261abf2.patch) = 1950
 SHA256 (67961a267.patch) = be88e1a492b5b03d8dd516135fff4eb07e97a2f32d9b3ec7bd1a9a57f9c78cde
 SIZE (67961a267.patch) = 846
-SHA256 (4461a2703.patch) = 74270fedad7913d7f8802e9586d705578f575409cb016f8b2529e161fdd79a68
-SIZE (4461a2703.patch) = 1995
diff --git a/multimedia/libva-intel-media-driver/files/patch-cmrtlib_linux_share_cm__def__os.h b/multimedia/libva-intel-media-driver/files/patch-cmrtlib_linux_share_cm__def__os.h
new file mode 100644
index 000000000000..2a35d47ae171
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-cmrtlib_linux_share_cm__def__os.h
@@ -0,0 +1,29 @@
+--- cmrtlib/linux/share/cm_def_os.h.orig	2026-03-19 10:15:05 UTC
++++ cmrtlib/linux/share/cm_def_os.h
+@@ -32,15 +32,15 @@
+ #define Display unsigned int
+ #endif
+ 
++#include <cstdlib>
+ #include <cstring>
+ #include "pthread.h"
+-#include <malloc.h>
+ 
+ 
+ ////////////////////////////////////////////////////////////////////////////////////
+ // MS-specific defines/typedefs, which are absent under Linux but still used
+ ////////////////////////////////////////////////////////////////////////////////////
+-#define _aligned_malloc(size, alignment) memalign(alignment, size)
++#define _aligned_malloc(size, alignment) aligned_alloc(alignment, size)
+ #define _aligned_free(ptr) free(ptr)
+ typedef uint8_t BOOLEAN, *PBOOLEAN;
+ ////////////////////////////////////////////////////////////////////////////////////
+@@ -101,7 +101,7 @@ inline void * CM_ALIGNED_MALLOC(size_t size, size_t al
+ 
+ inline void * CM_ALIGNED_MALLOC(size_t size, size_t alignment)
+ {
+-  return memalign(alignment, size);
++  return aligned_alloc(alignment, size);
+ }
+ 
+ inline void CM_ALIGNED_FREE(void * memory)
diff --git a/multimedia/libva-intel-media-driver/files/patch-cmrtlib_linux_share_cm__rt__def__os.h b/multimedia/libva-intel-media-driver/files/patch-cmrtlib_linux_share_cm__rt__def__os.h
new file mode 100644
index 000000000000..e4b6d812ddae
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-cmrtlib_linux_share_cm__rt__def__os.h
@@ -0,0 +1,19 @@
+--- cmrtlib/linux/share/cm_rt_def_os.h.orig	2026-03-19 10:15:05 UTC
++++ cmrtlib/linux/share/cm_rt_def_os.h
+@@ -36,7 +36,6 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <math.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <sys/time.h>
+ #include <pthread.h>
+@@ -175,7 +174,7 @@ inline void * CM_ALIGNED_MALLOC(size_t size, size_t al
+ 
+ inline void * CM_ALIGNED_MALLOC(size_t size, size_t alignment) 
+ {
+-  return memalign(alignment, size);
++  return aligned_alloc(alignment, size);
+ } 
+ 
+ inline void CM_ALIGNED_FREE(void * memory) 
diff --git a/multimedia/libva-intel-media-driver/files/patch-media__driver_agnostic_ult_cm_buffer__up__test.cpp b/multimedia/libva-intel-media-driver/files/patch-media__driver_agnostic_ult_cm_buffer__up__test.cpp
new file mode 100644
index 000000000000..a3870e941013
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-media__driver_agnostic_ult_cm_buffer__up__test.cpp
@@ -0,0 +1,10 @@
+--- media_driver/agnostic/ult/cm/buffer_up_test.cpp.orig	2026-03-19 10:15:05 UTC
++++ media_driver/agnostic/ult/cm/buffer_up_test.cpp
+@@ -21,7 +21,6 @@
+ */
+ 
+ #include "cm_test.h"
+-#include <malloc.h>
+ 
+ class BufferUPTest: public CmTest
+ {
diff --git a/multimedia/libva-intel-media-driver/files/patch-media__driver_linux_ult_ult__app_cm_cm__test.h b/multimedia/libva-intel-media-driver/files/patch-media__driver_linux_ult_ult__app_cm_cm__test.h
new file mode 100644
index 000000000000..ebe3aaa30cc2
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-media__driver_linux_ult_ult__app_cm_cm__test.h
@@ -0,0 +1,19 @@
+--- media_driver/linux/ult/ult_app/cm/cm_test.h.orig	2026-03-19 10:15:05 UTC
++++ media_driver/linux/ult/ult_app/cm/cm_test.h
+@@ -23,7 +23,6 @@
+ #ifndef MEDIADRIVER_LINUX_CODECHAL_ULT_ULTAPP_CMTEST_H_
+ #define MEDIADRIVER_LINUX_CODECHAL_ULT_ULTAPP_CMTEST_H_
+ 
+-#include <malloc.h>
+ #include "gtest/gtest.h"
+ #include "mock_device.h"
+ #include "../memory_leak_detector.h"
+@@ -34,7 +33,7 @@ class CmTest: public testing::Test (public)
+ {
+ public:
+     static void* AllocateAlignedMemory(size_t size, size_t alignment)
+-    { return memalign(alignment, size); }
++    { return aligned_alloc(alignment, size); }
+ 
+     static void FreeAlignedMemory(void *memory) { free(memory); }
+ 
diff --git a/multimedia/libva-intel-media-driver/files/patch-media__driver_media__top__cmake.cmake b/multimedia/libva-intel-media-driver/files/patch-media__driver_media__top__cmake.cmake
new file mode 100644
index 000000000000..3d84c3b82083
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-media__driver_media__top__cmake.cmake
@@ -0,0 +1,28 @@
+--- media_driver/media_top_cmake.cmake.orig	2026-03-19 10:15:05 UTC
++++ media_driver/media_top_cmake.cmake
+@@ -32,7 +32,11 @@ include(${MEDIA_DRIVER_CMAKE}/media_feature_flags.cmak
+ option (MEDIA_RUN_TEST_SUITE "run google test module after install" ON) 
+ include(${MEDIA_DRIVER_CMAKE}/media_gen_flags.cmake)
+ include(${MEDIA_DRIVER_CMAKE}/media_feature_flags.cmake)
++include(CheckIncludeFileCXX)
++include(CheckLibraryExists)
+ 
++check_include_file_cxx("execinfo.h" HAVE_EXECINFO_H)
++check_library_exists(execinfo backtrace "" HAVE_LIBEXECINFO)
+ 
+ if(NOT DEFINED SKIP_GMM_CHECK)
+     # checking dependencies
+@@ -588,6 +592,13 @@ add_library(${LIB_NAME} SHARED
+     $<TARGET_OBJECTS:${LIB_NAME}_SOFTLET_CODEC>
+     $<TARGET_OBJECTS:${LIB_NAME}_SOFTLET_COMMON>)
+ 
++if(HAVE_EXECINFO_H)
++    target_compile_definitions(${LIB_NAME} PRIVATE HAVE_EXECINFO_H)
++endif()
++
++if(HAVE_LIBEXECINFO)
++    target_link_libraries (${LIB_NAME} execinfo)
++endif()
+ 
+ add_library(${LIB_NAME_STATIC} STATIC
+     $<TARGET_OBJECTS:${LIB_NAME}_mos>
diff --git a/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_osservice_mos__utilities__specific.h b/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_osservice_mos__utilities__specific.h
new file mode 100644
index 000000000000..58c77fa8b0b2
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_osservice_mos__utilities__specific.h
@@ -0,0 +1,19 @@
+--- media_softlet/linux/common/os/osservice/mos_utilities_specific.h.orig	2026-03-19 10:15:05 UTC
++++ media_softlet/linux/common/os/osservice/mos_utilities_specific.h
+@@ -27,7 +27,6 @@
+ #define __MOS_UTILITIES_SPECIFIC_H__
+ 
+ #include <map>
+-#include <malloc.h>
+ #include <string>
+ #include "mos_defs.h"
+ #include "media_class_trace.h"
+@@ -36,7 +35,7 @@
+ 
+ #define NOT_FOUND            -1
+ 
+-#define _aligned_malloc(size, alignment)  memalign(alignment, size)
++#define _aligned_malloc(size, alignment)  aligned_alloc(alignment, size)
+ #define _aligned_free(ptr)                free(ptr)
+ 
+ typedef void (*MOS_UserFeatureCallback)( void*, bool);
diff --git a/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_xe_include_dma-buf.h b/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_xe_include_dma-buf.h
new file mode 100644
index 000000000000..194f13125248
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_xe_include_dma-buf.h
@@ -0,0 +1,15 @@
+--- media_softlet/linux/common/os/xe/include/dma-buf.h.orig	2026-03-19 10:15:05 UTC
++++ media_softlet/linux/common/os/xe/include/dma-buf.h
+@@ -20,7 +20,11 @@
+ #ifndef _DMA_BUF_UAPI_H_
+ #define _DMA_BUF_UAPI_H_
+ 
+-#include <linux/types.h>
++#if defined(__FreeBSD__)
++    #include "freebsd_compat_linux_types.h"
++#else
++    #include <linux/types.h>
++#endif
+ 
+ /**
+  * struct dma_buf_sync - Synchronize with CPU access.
diff --git a/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_xe_include_freebsd__compat__linux__types.h b/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_xe_include_freebsd__compat__linux__types.h
new file mode 100644
index 000000000000..d84062e314a1
--- /dev/null
+++ b/multimedia/libva-intel-media-driver/files/patch-media__softlet_linux_common_os_xe_include_freebsd__compat__linux__types.h
@@ -0,0 +1,16 @@
+--- media_softlet/linux/common/os/xe/include/freebsd_compat_linux_types.h.orig	2026-05-18 12:43:46 UTC
++++ media_softlet/linux/common/os/xe/include/freebsd_compat_linux_types.h
+@@ -0,0 +1,13 @@
++#ifndef _FREEBSD_COMPAT_LINUX_TYPES_H
++#define _FREEBSD_COMPAT_LINUX_TYPES_H
++
++#include <sys/types.h>
++#include <stdint.h>
++
++typedef uint8_t __u8;
++typedef uint16_t __u16;
++typedef uint32_t __u32;
++typedef uint64_t __u64;
++typedef int32_t __s32;
++
++#endif