git: a26876a1e5f8 - main - graphics/mesa: Fix X11 options
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 Jul 2024 08:18:33 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a26876a1e5f8629e203f98d279dad670be735652
commit a26876a1e5f8629e203f98d279dad670be735652
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-06-26 14:27:07 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-07-01 08:17:57 +0000
graphics/mesa: Fix X11 options
We need to disable xlib-lease otherwise meson will fail to configure the port
Differential Revision: https://reviews.freebsd.org/D45744
Reviewed by: bapt
Sponsored by: Beckhoff Automation GmbH & Co. KG
---
graphics/mesa-dri/Makefile | 2 ++
graphics/mesa-libs/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index b656f81d0a7d..b0f9f3699612 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -56,6 +56,8 @@ LDFLAGS_i386= -Wl,-znotext
.if ${PORT_OPTIONS:MX11}
MESA_PLATFORMS+= x11
USE_XORG+= xcb xorgproto xrandr x11 xdamage xext xfixes xshmfence xv
+.else
+MESON_ARGS+= -Dxlib-lease=disabled
.endif
.if ${PORT_OPTIONS:MWAYLAND}
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index c1e04551a089..e2d8f3f8e860 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -57,7 +57,7 @@ USE_XORG+= xorgproto x11 xcb xdamage xext \
xfixes xshmfence xxf86vm xrandr
PLIST_SUB+= GLX=""
.else
-MESON_ARGS+= -Dglx=disabled
+MESON_ARGS+= -Dglx=disabled -Dxlib-lease=disabled
PLIST_SUB+= GLX="@comment "
.endif