diff options
Diffstat (limited to 'graphics/mesa-devel')
| -rw-r--r-- | graphics/mesa-devel/Makefile | 22 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 10 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 34 | ||||
| -rw-r--r-- | graphics/mesa-devel/pkg-plist | 2 |
4 files changed, 27 insertions, 41 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index e674b5b9102c..154c286245a0 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,13 +1,13 @@ PORTNAME= mesa -DISTVERSION= 25.1-branchpoint-649 -DISTVERSIONSUFFIX= -ge7ce35f3c50 +DISTVERSION= 25.2-branchpoint-2680 +DISTVERSIONSUFFIX= -gb4bac915f0d CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/mesa3d/${GL_PROJECT}/commit/:github PATCHFILES+= 700efacda59c.patch:-p1:github PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= 2930dcbb3329.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246 +PATCHFILES+= de5cf0a44b50.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan) @@ -33,7 +33,7 @@ USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org BINARY_ALIAS= python=${PYTHON_CMD} SHEBANG_FILES= src/vulkan/*/*control.py -MESON_ARGS= -Dgallium-xa=disabled \ +MESON_ARGS= -Dgallium-mediafoundation=disabled \ -Dandroid-libbacktrace=disabled \ -Dlibunwind=disabled \ -Dlmsensors=disabled \ @@ -46,8 +46,8 @@ MESON_ARGS= -Dgallium-xa=disabled \ LDFLAGS+= -Wl,--undefined-version # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8003 PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} -OPTIONS_DEFINE= LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD -OPTIONS_DEFAULT= LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD +OPTIONS_DEFINE= DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD +OPTIONS_DEFAULT= DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= GALLIUM VULKAN OPTIONS_GROUP_GALLIUM= crocus iris panfrost r600 radeonsi OPTIONS_GROUP_VULKAN= anv hasvk radv @@ -81,7 +81,7 @@ VULKAN_DESC= Vulkan drivers anv_DESC= Skylake and newer (implies OPENCL) anv_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ glslangValidator:graphics/glslang -anv_MESON_ON= ${"${ARCH:Mamd64}":?:-Dintel-rt=disabled} # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +anv_MESON_ON= ${"${ARCH:Naarch64:Namd64}":?-Dintel-rt=disabled:} # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 anv_IMPLIES= OPENCL hasvk_DESC= Ivy Bridge, Haswell, Broadwell radv_DESC= Southern Islands and newer @@ -95,6 +95,11 @@ COINST_SUB_FILES= libmap.conf COINST_SUB_LIST= SUFFIX=${PKGNAMESUFFIX} COINST_PLIST_SUB_OFF= SUFFIX= +DRM_DESC= KMS console support for Vulkan (KHR_display) +DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ + libdisplay-info.so:sysutils/libdisplay-info +DRM_MESON_ENABLED= display-info + LLVM_DESC= Build with LLVM support (see implies) LLVM_USES= llvm:min=18,lib,noexport LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} @@ -112,6 +117,7 @@ OPENCL_LIB_DEPENDS= libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-tran OPENCL_RUN_DEPENDS= libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} OPENCL_SOVERSION= ${LLVM_VERSION}${${LLVM_VERSION}>=18:?.1:} OPENCL_CONFIGURE_ENV= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" +OPENCL_MESON_FALSE= b_lundef # environ OPENCL_MESON_TRUE= gallium-rusticl OPENCL_IMPLIES= LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM @@ -127,7 +133,7 @@ VDPAU_IMPLIES= X11 VKLAYERS_DESC= Vulkan layers: ${VKLAYERS_MESON_ON:C/.*=//} (implies ${VKLAYERS_IMPLIES}) VKLAYERS_BUILD_DEPENDS= glslangValidator:graphics/glslang VKLAYERS_LIB_DEPENDS= libpng.so:graphics/png -VKLAYERS_MESON_ON= -Dvulkan-layers=device-select,overlay,screenshot,vram-report-limit +VKLAYERS_MESON_ON= -Dvulkan-layers=anti-lag,device-select,overlay,screenshot,vram-report-limit VKLAYERS_IMPLIES= ${"${PORT_OPTIONS:Manv}":?anv:radv} # any from OPTIONS_GROUP_VULKAN WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 37d1a4cee293..4e286e98eb1d 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1746281352 -SHA256 (mesa-25.1-branchpoint-649-ge7ce35f3c50.tar.bz2) = 53ccad5ff27f2992f197fad2d9ebc27be0e8b88b39b2558a070fdc69b6b37edc -SIZE (mesa-25.1-branchpoint-649-ge7ce35f3c50.tar.bz2) = 58166366 +TIMESTAMP = 1756937246 +SHA256 (mesa-25.2-branchpoint-2680-gb4bac915f0d.tar.bz2) = 6c44b70830a637e39ba1f6238c7c6d75c268dfcc1d5c6c001dddbdecc396716f +SIZE (mesa-25.2-branchpoint-2680-gb4bac915f0d.tar.bz2) = 58679512 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 -SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8 -SIZE (2930dcbb3329.patch) = 1638 +SHA256 (de5cf0a44b50.patch) = c9e02e5eb1fb4e3aa2bc7a7e0a70f28f3ee609835ff0b59e827893a821983851 +SIZE (de5cf0a44b50.patch) = 1108 diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index c03c6ab8c5cc..8783f8460a0a 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -62,17 +62,6 @@ Library selection is handled by libglvnd and/or libmap.conf. egl_lib_version = '0.0.0' deps_for_egl += dep_glvnd files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] ---- src/gallium/auxiliary/pipe-loader/meson.build.orig 2023-02-01 23:53:26 UTC -+++ src/gallium/auxiliary/pipe-loader/meson.build -@@ -58,7 +58,7 @@ libpipe_loader_dynamic = static_library( - c_args : [ - libpipe_loader_defines, - '-DPIPE_SEARCH_DIR="@0@"'.format( -- join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe') -+ join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe' + get_option('egl-lib-suffix')) - ) - ], - gnu_symbol_visibility : 'hidden', --- src/gallium/targets/dri/meson.build.orig 2024-08-31 18:55:15 UTC +++ src/gallium/targets/dri/meson.build @@ -29,7 +29,7 @@ libgallium_dri = shared_library( @@ -84,17 +73,6 @@ Library selection is handled by libglvnd and/or libmap.conf. files('dri_target.c'), include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, ---- src/gallium/targets/pipe-loader/meson.build.orig 2023-02-01 23:53:26 UTC -+++ src/gallium/targets/pipe-loader/meson.build -@@ -44,7 +44,7 @@ endif - pipe_loader_link_deps += files('pipe.sym') - endif - --pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe') -+pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe' + get_option('egl-lib-suffix')) - - _kmsro_targets = [ - driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv, --- src/gbm/backends/dri/meson.build.orig 2024-11-27 22:48:04 UTC +++ src/gbm/backends/dri/meson.build @@ -9,7 +9,7 @@ shared_library( @@ -154,8 +132,8 @@ Library selection is handled by libglvnd and/or libmap.conf. [files('anv_gem.c'), anv_hasvk_entrypoints[0]], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, ---- src/mapi/es1api/meson.build.orig 2025-03-28 23:07:17 UTC -+++ src/mapi/es1api/meson.build +--- src/mesa/glapi/es1api/meson.build.orig 2025-08-06 21:21:09 UTC ++++ src/mesa/glapi/es1api/meson.build @@ -23,7 +23,7 @@ libglesv1_cm = shared_library( ) @@ -165,8 +143,8 @@ Library selection is handled by libglvnd and/or libmap.conf. ['libgles1_public.c', es1_glapi_mapi_tmp_h], vs_module_defs : gles1_def, c_args : [ ---- src/mapi/es2api/meson.build.orig 2025-03-28 23:07:17 UTC -+++ src/mapi/es2api/meson.build +--- src/mesa/glapi/es2api/meson.build.orig 2025-08-06 21:21:09 UTC ++++ src/mesa/glapi/es2api/meson.build @@ -23,7 +23,7 @@ libgles2 = shared_library( ) @@ -176,8 +154,8 @@ Library selection is handled by libglvnd and/or libmap.conf. ['libgles2_public.c', es2_glapi_mapi_tmp_h], vs_module_defs : gles2_def, c_args : [ ---- src/mapi/shared-glapi/meson.build.orig 2025-03-28 23:07:17 UTC -+++ src/mapi/shared-glapi/meson.build +--- src/mesa/glapi/shared-glapi/meson.build.orig 2025-08-06 21:21:09 UTC ++++ src/mesa/glapi/shared-glapi/meson.build @@ -11,7 +11,7 @@ libglapi = static_library( ) diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index a825e5bd2183..71eaba960928 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -26,6 +26,7 @@ lib/libEGL_mesa%%SUFFIX%%.so.0.0.0 %%OPENCL%%lib/libRusticlOpenCL.so %%OPENCL%%lib/libRusticlOpenCL.so.1 %%OPENCL%%lib/libRusticlOpenCL.so.1.0.0 +%%VKLAYERS%%lib/libVkLayer_MESA_anti_lag.so %%VKLAYERS%%lib/libVkLayer_MESA_device_select.so %%VKLAYERS%%lib/libVkLayer_MESA_overlay.so %%VKLAYERS%%lib/libVkLayer_MESA_screenshot.so @@ -56,4 +57,5 @@ share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json %%hasvk%%share/vulkan/icd.d/intel_hasvk_icd.%%ARCH%%.json %%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json +%%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_anti_lag.json %%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json |