Update intel-gmmlib and intel-media-driver to the latest upstrem
versions.
OK?
diff --git a/graphics/intel-gmmlib/Makefile b/graphics/intel-gmmlib/Makefile
index 6ad0a660b32..ce3bdde692c 100644
--- a/graphics/intel-gmmlib/Makefile
+++ b/graphics/intel-gmmlib/Makefile
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = amd64 i386
COMMENT = Intel Graphics Memory Management Library
-VERSION = 22.3.20
+VERSION = 22.5.5
GH_ACCOUNT = intel
GH_PROJECT = gmmlib
GH_TAGNAME = intel-gmmlib-${VERSION}
@@ -15,6 +15,8 @@ HOMEPAGE = https://01.org/intel-media-for-linux
CATEGORIES = graphics multimedia
+MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
+
WANTLIB += ${COMPILER_LIBCXX} m
# MIT & BSD-3-Clause
diff --git a/graphics/intel-gmmlib/distinfo b/graphics/intel-gmmlib/distinfo
index 2664451978b..c9c9e08344c 100644
--- a/graphics/intel-gmmlib/distinfo
+++ b/graphics/intel-gmmlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (intel-gmmlib-22.3.20.tar.gz) =
InwWFNSBcVS05vv7ZnuisjHqeqU3ltkfGACvmutwP1k=
-SIZE (intel-gmmlib-22.3.20.tar.gz) = 846257
+SHA256 (intel-gmmlib-22.5.5.tar.gz) =
CNtpYHFRC34Dqi2ftzdcbDX3wyfs1nR0JMZkxiK7Q3c=
+SIZE (intel-gmmlib-22.5.5.tar.gz) = 868894
diff --git a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_CMakeLists_txt
b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_CMakeLists_txt
index 7d485a02b8d..7ba28bfc176 100644
--- a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_CMakeLists_txt
+++ b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_CMakeLists_txt
@@ -3,29 +3,14 @@ https://github.com/intel/gmmlib/pull/67
Index: Source/GmmLib/CMakeLists.txt
--- Source/GmmLib/CMakeLists.txt.orig
+++ Source/GmmLib/CMakeLists.txt
-@@ -458,13 +458,13 @@ include(Linux.cmake)
- # create dll library
-
###################################################################################
- add_library( ${GMM_LIB_DLL_NAME} SHARED igdgmm.rc ${UMD_SOURCES}
${UMD_HEADERS})
-+GmmLibSetTargetConfig( ${GMM_LIB_DLL_NAME} )
-
- if(MSVC)
-
- set_target_properties(${GMM_LIB_DLL_NAME} PROPERTIES OUTPUT_NAME
"igdgmm${GMMLIB_ARCH}")
-
- bs_set_wdk(${GMM_LIB_DLL_NAME})
--GmmLibSetTargetConfig( ${GMM_LIB_DLL_NAME} )
-
- set_target_properties(${GMM_LIB_DLL_NAME} PROPERTIES
VS_GLOBAL_DriverTargetPlatform Universal)
- set_target_properties(${GMM_LIB_DLL_NAME} PROPERTIES VS_PLATFORM_TOOLSET
WindowsApplicationForDrivers10.0)
-@@ -504,10 +504,6 @@ bs_set_extra_target_properties(${GMM_LIB_DLL_NAME}
- __UMD
+@@ -508,10 +508,6 @@ bs_set_extra_target_properties(${GMM_LIB_DLL_NAME}
GMM_UNIFY_DAF_API
)
--
+
-if(CMAKE_BUILD_TYPE STREQUAL "ReleaseInternal")
- bs_set_extra_target_properties(${GMM_LIB_DLL_NAME} _RELEASE_INTERNAL)
-endif()
-
+-
target_include_directories(${GMM_LIB_DLL_NAME} INTERFACE
${BS_DIR_GMMLIB}/inc
+ ${BS_DIR_INC}
diff --git
a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_GlobalInfo_GmmInfo_cpp
b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_GlobalInfo_GmmInfo_cpp
index 31718cd18b4..ca51497f6f3 100644
--- a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_GlobalInfo_GmmInfo_cpp
+++ b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_GlobalInfo_GmmInfo_cpp
@@ -2,7 +2,7 @@ https://github.com/intel/gmmlib/pull/68
Index: Source/GmmLib/GlobalInfo/GmmInfo.cpp
--- Source/GmmLib/GlobalInfo/GmmInfo.cpp.orig
+++ Source/GmmLib/GlobalInfo/GmmInfo.cpp
-@@ -937,7 +937,7 @@ int32_t GmmLib::Context::IncrementRefCount()
+@@ -939,7 +939,7 @@ int32_t GmmLib::Context::IncrementRefCount()
{
int32_t *Ref = &RefCount;
@@ -11,7 +11,7 @@ Index: Source/GmmLib/GlobalInfo/GmmInfo.cpp
// returns 0 only when registering the first client
return (__sync_fetch_and_add(Ref, 1));
#endif
-@@ -972,7 +972,7 @@ int32_t GmmLib::Context::DecrementRefCount()
+@@ -974,7 +974,7 @@ int32_t GmmLib::Context::DecrementRefCount()
{
break;
}
diff --git
a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp
b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp
index e0467937046..fcd8222c1d9 100644
---
a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp
+++
b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp
@@ -2,7 +2,7 @@ https://github.com/intel/gmmlib/pull/68
Index: Source/GmmLib/Texture/GmmTextureAlloc.cpp
--- Source/GmmLib/Texture/GmmTextureAlloc.cpp.orig
+++ Source/GmmLib/Texture/GmmTextureAlloc.cpp
-@@ -812,7 +812,7 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize
+@@ -826,7 +826,7 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize
}
else
{
diff --git
a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_ULT_CMakeLists_txt
b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_ULT_CMakeLists_txt
index 7fe5ea3e502..703c8dc9935 100644
--- a/graphics/intel-gmmlib/patches/patch-Source_GmmLib_ULT_CMakeLists_txt
+++ b/graphics/intel-gmmlib/patches/patch-Source_GmmLib_ULT_CMakeLists_txt
@@ -2,7 +2,7 @@ https://github.com/intel/gmmlib/pull/68
Index: Source/GmmLib/ULT/CMakeLists.txt
--- Source/GmmLib/ULT/CMakeLists.txt.orig
+++ Source/GmmLib/ULT/CMakeLists.txt
-@@ -160,7 +160,7 @@ target_link_libraries(${EXE_NAME} igfx_gmmumd_dll)
+@@ -164,7 +164,7 @@ target_link_libraries(${EXE_NAME} igfx_gmmumd_dll)
target_link_libraries(${EXE_NAME}
pthread
diff --git a/graphics/intel-gmmlib/pkg/PLIST b/graphics/intel-gmmlib/pkg/PLIST
index 12c51949937..2973f82db85 100644
--- a/graphics/intel-gmmlib/pkg/PLIST
+++ b/graphics/intel-gmmlib/pkg/PLIST
@@ -10,6 +10,7 @@ include/igdgmm/GmmLib/CachePolicy/GmmGen12CachePolicy.h
include/igdgmm/GmmLib/CachePolicy/GmmGen12dGPUCachePolicy.h
include/igdgmm/GmmLib/CachePolicy/GmmGen8CachePolicy.h
include/igdgmm/GmmLib/CachePolicy/GmmGen9CachePolicy.h
+include/igdgmm/GmmLib/CachePolicy/GmmXe2_LPGCachePolicy.h
include/igdgmm/GmmLib/CachePolicy/GmmXe_LPGCachePolicy.h
include/igdgmm/GmmLib/GlobalInfo/
include/igdgmm/GmmLib/Platform/
@@ -38,6 +39,7 @@
include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen12.h
include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen12dGPU.h
include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen8.h
include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyGen9.h
+include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyXe2_LPG.h
include/igdgmm/GmmLib/inc/External/Common/CachePolicy/GmmCachePolicyXe_LPG.h
include/igdgmm/GmmLib/inc/External/Common/GmmCachePolicy.h
include/igdgmm/GmmLib/inc/External/Common/GmmCachePolicyCommon.h
diff --git a/graphics/intel-media-driver/Makefile
b/graphics/intel-media-driver/Makefile
index 4be2e13d6dd..d395bf4243a 100644
--- a/graphics/intel-media-driver/Makefile
+++ b/graphics/intel-media-driver/Makefile
@@ -3,18 +3,19 @@ BROKEN-i386 = ld: error: [...] is incompatible with
/usr/lib/crtbeginS.o
COMMENT = VAAPI driver for Intel HD 5000 (Gen8) or newer
-VERSION = 24.2.5
+VERSION = 24.3.4
GH_ACCOUNT = intel
GH_PROJECT = media-driver
GH_TAGNAME = intel-media-${VERSION}
DISTNAME = intel-media-driver-${VERSION}
-REVISION = 0
CATEGORIES = graphics multimedia
HOMEPAGE = https://github.com/intel/media-driver/wiki
+MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
+
# MIT & BSD-3-Clause
PERMIT_PACKAGE= Yes
@@ -24,7 +25,7 @@ MODULES = devel/cmake
COMPILER = base-clang ports-gcc
-LIB_DEPENDS = graphics/intel-gmmlib>=22.3.20
+LIB_DEPENDS = graphics/intel-gmmlib>=22.5.2
# XXX Unbundle googletest
CONFIGURE_ARGS = -DMEDIA_RUN_TEST_SUITE=ON
diff --git a/graphics/intel-media-driver/distinfo
b/graphics/intel-media-driver/distinfo
index febaa2c65e8..0e861f5454c 100644
--- a/graphics/intel-media-driver/distinfo
+++ b/graphics/intel-media-driver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (intel-media-driver-24.2.5.tar.gz) =
3sIhDB+CSnIeTqb2b1iZ4wCAGz5/riMtP4qU2zjC7dE=
-SIZE (intel-media-driver-24.2.5.tar.gz) = 25860224
+SHA256 (intel-media-driver-24.3.4.tar.gz) =
WJePnuSYFTLmC+LydoZzsfOCXbCZceu5j71+iBnKtus=
+SIZE (intel-media-driver-24.3.4.tar.gz) = 27623962
diff --git
a/graphics/intel-media-driver/patches/patch-media_driver_cmake_linux_media_compile_flags_linux_cmake
b/graphics/intel-media-driver/patches/patch-media_driver_cmake_linux_media_compile_flags_linux_cmake
index 46b62532071..16e39a35172 100644
---
a/graphics/intel-media-driver/patches/patch-media_driver_cmake_linux_media_compile_flags_linux_cmake
+++
b/graphics/intel-media-driver/patches/patch-media_driver_cmake_linux_media_compile_flags_linux_cmake
@@ -2,7 +2,7 @@ https://github.com/intel/media-driver/pull/1785
Index: media_driver/cmake/linux/media_compile_flags_linux.cmake
--- media_driver/cmake/linux/media_compile_flags_linux.cmake.orig
+++ media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -91,7 +91,6 @@ endif()
+@@ -92,7 +92,6 @@ endif()
if(NOT ${PLATFORM} STREQUAL "android")
set(MEDIA_COMPILER_FLAGS_COMMON
${MEDIA_COMPILER_FLAGS_COMMON}
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 6fb555b4bef..a70b16de058 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
-@@ -644,7 +644,7 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAG
+@@ -652,7 +652,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()
-@@ -672,7 +672,7 @@ if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" ST
+@@ -680,7 +680,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_mos_gpucontext_specific_next_cpp
b/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp
index 03d4209fc03..2984bea01bc 100644
---
a/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp
+++
b/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp
@@ -2,12 +2,12 @@ https://github.com/intel/media-driver/issues/1840
Index: media_softlet/linux/common/os/mos_gpucontext_specific_next.cpp
--- media_softlet/linux/common/os/mos_gpucontext_specific_next.cpp.orig
+++ media_softlet/linux/common/os/mos_gpucontext_specific_next.cpp
-@@ -1974,7 +1974,7 @@ PMOS_RESOURCE GpuContextSpecificNext::GetOcaRTLogResou
+@@ -1975,7 +1975,7 @@ PMOS_RESOURCE GpuContextSpecificNext::GetOcaRTLogResou
// than 2 video processors, the value may be overwritten and wrong
allocation Index in array may be used.
// To avoid this, use duplicate MOS_RESOURCE instance in GPU Context to
ensure differnt iAllocationIndex
// array of OcaRTLogResources being used for different GPU Context.
-- if (!m_ocaRtLogResInited)
-+ if (!m_ocaRtLogResInited && globalInst)
+- if (!m_ocaRtLogResInited && globalInst)
++ if (!m_ocaRtLogResInited)
{
m_ocaRtLogResource = *globalInst;
m_ocaRtLogResInited = true;
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 10e65bc4c21..1028d28113c 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
-@@ -2173,7 +2173,7 @@ uint32_t MosUtilities::MosGetThreadId(
+@@ -2144,7 +2144,7 @@ uint32_t MosUtilities::MosGetThreadId(
uint32_t MosUtilities::MosGetCurrentThreadId()
{
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
index adfde6d8486..244d4274672 100644
---
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
@@ -19,7 +19,7 @@ Index: media_softlet/media_top_cmake.cmake
if(NOT DEFINED SKIP_GMM_CHECK)
# checking dependencies
pkg_check_modules(LIBGMM REQUIRED igdgmm>=12.0.0)
-@@ -264,7 +273,7 @@ set_target_properties(${LIB_NAME_STATIC} PROPERTIES PR
+@@ -266,7 +275,7 @@ set_target_properties(${LIB_NAME_STATIC} PROPERTIES PR
bs_ufo_link_libraries_noBsymbolic(
${LIB_NAME}_softlet
"${INCLUDED_LIBS}"
