graphics/mesa-devel: update to 24.2.b.2023

Changes:	https://gitlab.freedesktop.org/mesa/mesa/-/compare/c8d64860ec7...2d10233f2f1

4 files changed, 23 insertions, 27 deletions

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index cbacf3066d6a..b6f4f45932bb 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	24.1-branchpoint-3782
-DISTVERSIONSUFFIX=	-gc8d64860ec7
-PORTREVISION=	2
+DISTVERSION=	24.2-branchpoint-2023
+DISTVERSIONSUFFIX=	-g2d10233f2f1
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -10,7 +9,6 @@ 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+=	11aaf934112c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22941
-PATCHFILES+=	93e96da9458c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30710
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan)
@@ -23,7 +21,8 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	Limited scope: no old drivers and no software rendering. \
 			See also https://mesamatrix.net/
 
-BUILD_DEPENDS=	libglvnd>=1.3.2:graphics/libglvnd \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \
+		libglvnd>=1.3.2:graphics/libglvnd \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2
@@ -44,6 +43,7 @@ MESON_ARGS=	-Dgallium-omx=disabled \
 		-Dvalgrind=disabled \
 		-Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \
 		-Dvideo-codecs=all \
+		-Dunversion-libgallium=true \
 		${NULL}
 LDFLAGS+=	-Wl,--undefined-version # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8003
 PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 2db3c348a05e..40837201d449 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1721257011
-SHA256 (mesa-24.1-branchpoint-3782-gc8d64860ec7.tar.bz2) = acff95d4a30e4cec00e713a7c40f0be8138debc07ad8e9e83a679d01ae1296dd
-SIZE (mesa-24.1-branchpoint-3782-gc8d64860ec7.tar.bz2) = 37842672
+TIMESTAMP = 1725130515
+SHA256 (mesa-24.2-branchpoint-2023-g2d10233f2f1.tar.bz2) = 4356de53fddbe096247c872fe80ec3021dac13a84dfa6dc3fc6c38ba865dbdcb
+SIZE (mesa-24.2-branchpoint-2023-g2d10233f2f1.tar.bz2) = 38121384
 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
 SIZE (700efacda59c.patch) = 983
 SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8
 SIZE (2930dcbb3329.patch) = 1638
 SHA256 (11aaf934112c.patch) = 4408d8c0c4bf559ddf32ddbd06766f4fd28cc30b199a1991b20c89cf99bb9121
 SIZE (11aaf934112c.patch) = 780
-SHA256 (93e96da9458c.patch) = 7c5cfd5c767668cfc7e91542e0f837b0b4749d67a7eafe849a6565b8fc54e512
-SIZE (93e96da9458c.patch) = 2076
diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix
index 610e7244a02b..02fefbc5e3d6 100644
--- a/graphics/mesa-devel/files/patch-suffix
+++ b/graphics/mesa-devel/files/patch-suffix
@@ -73,6 +73,17 @@ Library selection is handled by libglvnd and/or libmap.conf.
      )
    ],
    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(
+ endif
+ 
+ libgallium_dri = shared_library(
+-  libgallium_name,
++  libgallium_name + get_option('egl-lib-suffix'),
+   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/opencl/meson.build.orig	2023-02-01 23:53:26 UTC
 +++ src/gallium/targets/opencl/meson.build
 @@ -30,7 +30,7 @@ llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBR
@@ -104,23 +115,6 @@ Library selection is handled by libglvnd and/or libmap.conf.
  
  _kmsro_targets = [
     driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
---- src/gbm/backends/dri/gbm_dri.c.orig	2020-05-30 21:28:01 UTC
-+++ src/gbm/backends/dri/gbm_dri.c
-@@ -307,14 +307,6 @@ dri_bind_extensions(struct gbm_dri_device *dri,
- static const __DRIextension **
- dri_open_driver(struct gbm_dri_device *dri)
- {
--   /* Temporarily work around dri driver libs that need symbols in libglapi
--    * but don't automatically link it in.
--    */
--   /* XXX: Library name differs on per platforms basis. Update this as
--    * osx/cygwin/windows/bsd gets support for GBM..
--    */
--   dlopen("libglapi.so.0", RTLD_LAZY | RTLD_GLOBAL);
--
-    static const char *search_path_vars[] = {
-       /* Read GBM_DRIVERS_PATH first for compatibility, but LIBGL_DRIVERS_PATH
-        * is recommended over GBM_DRIVERS_PATH.
 --- src/gbm/meson.build.orig	2022-09-12 22:59:56 UTC
 +++ src/gbm/meson.build
 @@ -52,7 +52,7 @@ libgbm = shared_library(
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index 3a43b378fa2b..b291a3b66e01 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -8,6 +8,8 @@
 %%NO_COINST%%include/gbm.h
 %%crocus%%lib/dri%%SUFFIX%%/crocus_dri.so
 %%iris%%lib/dri%%SUFFIX%%/iris_dri.so
+%%X11%%lib/dri%%SUFFIX%%/libdril_dri.so
+%%VAAPI%%lib/dri%%SUFFIX%%/libgallium_drv_video.so
 %%panfrost%%lib/dri%%SUFFIX%%/panfrost_dri.so
 %%r600%%lib/dri%%SUFFIX%%/r600_dri.so
 %%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_dri.so
@@ -32,6 +34,7 @@ lib/libEGL_mesa%%SUFFIX%%.so.0.0.0
 %%OPENCL%%lib/libRusticlOpenCL.so.1.0.0
 %%VKLAYERS%%lib/libVkLayer_MESA_device_select.so
 %%VKLAYERS%%lib/libVkLayer_MESA_overlay.so
+lib/libgallium_dri%%SUFFIX%%.so
 %%NO_COINST%%lib/libgbm%%SUFFIX%%.so
 lib/libgbm%%SUFFIX%%.so.1
 lib/libgbm%%SUFFIX%%.so.1.0.0
@@ -41,6 +44,7 @@ lib/libglapi%%SUFFIX%%.so.0.0.0
 %%anv%%lib/libvulkan_intel%%SUFFIX%%.so
 %%hasvk%%lib/libvulkan_intel_hasvk%%SUFFIX%%.so
 %%radv%%lib/libvulkan_radeon%%SUFFIX%%.so
+%%VDPAU%%lib/vdpau%%SUFFIX%%/libvdpau_gallium.so.1.0.0
 %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so
 %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1
 %%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0