Date: Sat, 6 Apr 2024 21:33:00 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e2aacd12c294 - main - graphics/mesa-devel: update to 24.0.b.4478 Message-ID: <202404062133.436LX03V065027@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2aacd12c294a3b2e76a42c2836d7d9a5a73cd72 commit e2aacd12c294a3b2e76a42c2836d7d9a5a73cd72 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-04-06 07:33:29 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-04-06 21:32:23 +0000 graphics/mesa-devel: update to 24.0.b.4478 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/5fa70730da1...d5aefb7a16d --- graphics/mesa-devel/Makefile | 5 ++--- graphics/mesa-devel/distinfo | 6 +++--- graphics/mesa-devel/files/patch-suffix | 32 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index c1521c02172d..a7e6c1472ed2 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 24.0-branchpoint-4226 -DISTVERSIONSUFFIX= -g5fa70730da1 +DISTVERSION= 24.0-branchpoint-4478 +DISTVERSIONSUFFIX= -gd5aefb7a16d CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -38,7 +38,6 @@ MESON_ARGS= -Dgallium-omx=disabled \ -Dlmsensors=disabled \ -Dmicrosoft-clc=disabled \ -Dvalgrind=disabled \ - -Dglvnd=true \ -Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \ -Dvideo-codecs=all \ ${NULL} diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 01d742b260fa..9f69d47a407b 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1712187633 -SHA256 (mesa-24.0-branchpoint-4226-g5fa70730da1.tar.bz2) = 55bb98e6a9fb27a0852276a25373bdfd87a36e56feadec83c3356f18f4d679c2 -SIZE (mesa-24.0-branchpoint-4226-g5fa70730da1.tar.bz2) = 37240384 +TIMESTAMP = 1712388809 +SHA256 (mesa-24.0-branchpoint-4478-gd5aefb7a16d.tar.bz2) = 6cf032546ae6c7e07c1f0238e46f0736383b68dbf45dfe3692ec6f03068c241a +SIZE (mesa-24.0-branchpoint-4478-gd5aefb7a16d.tar.bz2) = 37237737 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8 diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index a5b531aca1e2..610e7244a02b 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -1,9 +1,9 @@ Add library suffix to avoid conflict with mesa-libs + mesa-dri. Library selection is handled by libglvnd and/or libmap.conf. ---- meson.build.orig 2020-05-30 21:28:01 UTC +--- meson.build.orig 2024-04-06 18:40:47 UTC +++ meson.build -@@ -79,7 +79,7 @@ with_imgui = with_intel_tools or with_vulkan_overlay_l +@@ -100,7 +100,7 @@ if dri_drivers_path == '' dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' @@ -12,26 +12,26 @@ Library selection is handled by libglvnd and/or libmap.conf. endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' -@@ -427,9 +427,6 @@ if with_glvnd - elif with_glx == 'disabled' and not with_egl - error('glvnd requires DRI based GLX and/or EGL') - endif -- if get_option('egl-lib-suffix') != '' -- error('''EGL lib suffix can't be used with libglvnd''') -- endif - endif +@@ -550,8 +550,7 @@ _glvnd = get_option('glvnd') \ + error_message: 'Cannot build glvnd support for GLX that is not DRI based.') \ + .require(with_glx != 'disabled' or with_egl, + error_message: 'glvnd requires DRI based GLX and/or EGL') \ +- .require(get_option('egl-lib-suffix') == '', +- error_message: '''EGL lib suffix can't be used with libglvnd''') ++ + dep_glvnd = dependency('libglvnd', version : '>= 1.3.2', required : _glvnd) + with_glvnd = dep_glvnd.found() + if with_glvnd +@@ -622,7 +621,7 @@ if vdpau_drivers_path == '' - if with_vulkan_icd_dir == '' -@@ -491,7 +488,7 @@ if with_gallium_vdpau - endif vdpau_drivers_path = get_option('vdpau-libs-path') if vdpau_drivers_path == '' - vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') + vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau' + get_option('egl-lib-suffix')) endif - if with_gallium_zink -@@ -638,7 +635,7 @@ endif + prog_glslang = find_program('glslangValidator', native : true, required : with_vulkan_overlay_layer or with_aco_tests or with_amd_vk or with_intel_vk) +@@ -739,7 +738,7 @@ if va_drivers_path == '' va_drivers_path = get_option('va-libs-path') if va_drivers_path == '' @@ -39,7 +39,7 @@ Library selection is handled by libglvnd and/or libmap.conf. + va_drivers_path = join_paths(get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) endif - _xa = get_option('gallium-xa') + with_gallium_xa = get_option('gallium-xa') \ --- src/amd/vulkan/meson.build.orig 2024-03-20 22:46:44 UTC +++ src/amd/vulkan/meson.build @@ -207,7 +207,7 @@ libvulkan_radeon = shared_library(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404062133.436LX03V065027>