wlroots: xwayland only on modular X11_TYPE, use pkgsrc's MesaLib

[kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon Nov 24 15:59:49 2025 +0100
Changeset:	9c52606084c68aa1ec130e800b30356d69665c1f

Modified Files:
	wlroots/Makefile
	wlroots/PLIST
	wlroots/TODO
	wlroots/buildlink3.mk

Log Message:
wlroots: xwayland only on modular X11_TYPE, use pkgsrc's MesaLib

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9c52606084c68aa1ec130e800b30356d69665c1f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wlroots/Makefile      | 6 +++++-
 wlroots/PLIST         | 2 +-
 wlroots/TODO          | 4 ++--
 wlroots/buildlink3.mk | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diffs:
diff --git a/wlroots/Makefile b/wlroots/Makefile
index cea1349344..bdc3f1fcf8 100644
--- a/wlroots/Makefile
+++ b/wlroots/Makefile
@@ -21,6 +21,7 @@ SUBST_MESSAGE.path=	Fixing pathes
 SUBST_FILES.path+=	xcursor/xcursor.c
 SUBST_VARS.path+=	PREFIX X11BASE
 
+PLIST_VARS+=		xwayland
 
 .include "../../devel/meson/build.mk"
 
@@ -32,13 +33,16 @@ SUBST_VARS.path+=	PREFIX X11BASE
 .include "../../wip/seatd/buildlink3.mk"
 .include "../../wip/vulkan-loader/buildlink3.mk"
 
+.if ${X11_TYPE} != "modular"
+PLIST.xwayland=		yes
 # need update
-#.include "../../wip/wayland/buildlink3.mk"
 .include "../../wip/modular-xorg-xwayland/buildlink3.mk"
+.endif
 
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+PREFER.MesaLib=	pkgsrc	# glesv2
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../sysutils/hwdata/buildlink3.mk"
diff --git a/wlroots/PLIST b/wlroots/PLIST
index 11bf7b275a..ef2d801a8a 100644
--- a/wlroots/PLIST
+++ b/wlroots/PLIST
@@ -114,7 +114,7 @@ include/wlroots-0.19/wlr/util/region.h
 include/wlroots-0.19/wlr/util/transform.h
 include/wlroots-0.19/wlr/version.h
 include/wlroots-0.19/wlr/xcursor.h
-include/wlroots-0.19/wlr/xwayland.h
+${PLIST.xwayland}include/wlroots-0.19/wlr/xwayland.h
 include/wlroots-0.19/wlr/xwayland/server.h
 include/wlroots-0.19/wlr/xwayland/shell.h
 include/wlroots-0.19/wlr/xwayland/xwayland.h
diff --git a/wlroots/TODO b/wlroots/TODO
index 7c93e1731d..ee08a5540a 100644
--- a/wlroots/TODO
+++ b/wlroots/TODO
@@ -17,6 +17,6 @@ with https://github.com/NetBSD/src/commit/003bb55d1d411ad2e8cf728c2e7a57f0348e97
 available from netbsd-11
 
 2) vulkan render issue: vkCreateInstance fails with VK_ERROR_INCOMPATIBLE_DRIVER
+   No vulkan drivers on NetBSD, software renders (lavapipe, swiftshader) don't work
 
-
-#NOTE: should restart on NetBSD-11 with native X11?
+* On NetBSD-11 with X11_TYPE=native builds with pkgsrc's MesaLib (glesv2)
diff --git a/wlroots/buildlink3.mk b/wlroots/buildlink3.mk
index 9076ef4dbb..b4e8c30a3c 100644
--- a/wlroots/buildlink3.mk
+++ b/wlroots/buildlink3.mk
@@ -11,6 +11,7 @@ BUILDLINK_PKGSRCDIR.wlroots?=	../../wip/wlroots
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
+PREFER.MesaLib=	pkgsrc	# glesv2
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libdisplay-info/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"