modular-xorg-server: improve dtrace option on NetBSD

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Aug 25 15:42:42 2026 +0200
Changeset:	f6224bde5e3db2aac4eae21b0ec6fdc0373c929a

Modified Files:
	modular-xorg-server/distinfo
	modular-xorg-server/options.mk
Added Files:
	modular-xorg-server/patches/patch-dix_meson.build
	modular-xorg-server/patches/patch-include_Xserver.d
	modular-xorg-server/patches/patch-include_meson.build

Log Message:
modular-xorg-server: improve dtrace option on NetBSD

still doesn't build

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

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

diffstat:
 modular-xorg-server/distinfo                          |  3 +++
 modular-xorg-server/options.mk                        |  9 ++++-----
 modular-xorg-server/patches/patch-dix_meson.build     | 13 +++++++++++++
 modular-xorg-server/patches/patch-include_Xserver.d   | 13 +++++++++++++
 modular-xorg-server/patches/patch-include_meson.build | 13 +++++++++++++
 5 files changed, 46 insertions(+), 5 deletions(-)

diffs:
diff --git a/modular-xorg-server/distinfo b/modular-xorg-server/distinfo
index 7f13d1a782..dad4ae04bd 100644
--- a/modular-xorg-server/distinfo
+++ b/modular-xorg-server/distinfo
@@ -3,6 +3,7 @@ $NetBSD: distinfo,v 1.136 2026/07/08 07:37:42 wiz Exp $
 BLAKE2s (xorg-server-26.0.99.901.tar.xz) = 0cf9aa60f5929b7b77f1760f070f4c96e757e0e66b9d9d77454f04d4f0b64670
 SHA512 (xorg-server-26.0.99.901.tar.xz) = 67267e8af43cd8be0ee0bac984837114598a69817bda0219e703f0395c8624a81203a98f36240bfc74ce8524335ee0954104e99ece6b9ab3c1104adbf57c2c43
 Size (xorg-server-26.0.99.901.tar.xz) = 2974564 bytes
+SHA1 (patch-dix_meson.build) = 5822ac7e45319b3d9b440a28b9f0d6deeeccfb6b
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 3d95b2db4f1a6f76289a8dff1be019deb43919db
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
@@ -15,4 +16,6 @@ SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 25a47f3249856f4c31b292ed82e0fba6
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 683ef7d0d4d97fd630347e1afbe4b685fb250aae
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
+SHA1 (patch-include_Xserver.d) = 29be269d24581faa9b4ebb1bc481f3684d256717
+SHA1 (patch-include_meson.build) = 562a63fbe65124865aad08eb4b719b93e6f503a7
 SHA1 (patch-os_backtrace.c) = a2c5ab679a8855cd013fac924ab66166d5153fa7
diff --git a/modular-xorg-server/options.mk b/modular-xorg-server/options.mk
index 171fa13558..00ba314d90 100644
--- a/modular-xorg-server/options.mk
+++ b/modular-xorg-server/options.mk
@@ -6,12 +6,11 @@ PKG_SUGGESTED_OPTIONS=	dri
 
 .include "../../mk/bsd.options.mk"
 
-# not supported on NetBSD
+# does not build on NetBSD
+# [1/633] Generating 'dix/liblibxserver_dix.a.p/Xserver.o'
 # FAILED: [code=1] dix/liblibxserver_dix.a.p/Xserver.o
-# /usr/sbin/dtrace -G -s ../include/Xserver.d -o dix/liblibxserver_dix.a.p/Xserver.o
-# dtrace: failed to compile script ../include/Xserver.d: "/usr/lib/dtrace/psinfo.d", line 46: syntax error near "u_int"
-# and if that is fixed,
-# dtrace: failed to compile script ../include/Xserver.d: line 26: invalid control directive: #ifdef
+# /usr/sbin/dtrace -C -G -s ../include/Xserver.d -o dix/liblibxserver_dix.a.p/Xserver.o
+# dtrace: failed to link script ../include/Xserver.d: No probe sites found for declared provider
 .if ${OPSYS} != "NetBSD"
 PKG_SUPPORTED_OPTIONS+=	dtrace
 .endif
diff --git a/modular-xorg-server/patches/patch-dix_meson.build b/modular-xorg-server/patches/patch-dix_meson.build
new file mode 100644
index 0000000000..b88a2dcbbc
--- /dev/null
+++ b/modular-xorg-server/patches/patch-dix_meson.build
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dix/meson.build.orig	2026-08-25 13:36:40.903884046 +0000
++++ dix/meson.build
+@@ -38,7 +38,7 @@ if with_dtrace
+ if with_dtrace
+     dtrace_object = generator(dtrace,
+         output: '@BASENAME@.o',
+-        arguments: ['-G', '-s', '@INPUT@', '-o', '@OUTPUT@']
++        arguments: ['-C', '-G', '-s', '@INPUT@', '-o', '@OUTPUT@']
+     )
+ 
+     dtrace_src += dtrace_object.process(dtrace_tmpl)
diff --git a/modular-xorg-server/patches/patch-include_Xserver.d b/modular-xorg-server/patches/patch-include_Xserver.d
new file mode 100644
index 0000000000..e07ce66dba
--- /dev/null
+++ b/modular-xorg-server/patches/patch-include_Xserver.d
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- include/Xserver.d.orig	2026-08-20 01:02:10.000000000 +0000
++++ include/Xserver.d
+@@ -27,7 +27,7 @@
+ #define string char *
+ #define pid_t uint32_t
+ #define zoneid_t uint32_t
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #define zoneid_t id_t
+ #else
+ #include <sys/types.h>
diff --git a/modular-xorg-server/patches/patch-include_meson.build b/modular-xorg-server/patches/patch-include_meson.build
new file mode 100644
index 0000000000..838022fa21
--- /dev/null
+++ b/modular-xorg-server/patches/patch-include_meson.build
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- include/meson.build.orig	2026-08-20 01:02:10.000000000 +0000
++++ include/meson.build
+@@ -443,7 +443,7 @@ if with_dtrace
+ if with_dtrace
+     dtrace_header = generator(dtrace,
+         output: '@BASENAME@-dtrace.h',
+-        arguments: ['-h', '-s', '@INPUT@', '-o', '@OUTPUT@']
++        arguments: ['-C', '-h', '-s', '@INPUT@', '-o', '@OUTPUT@']
+     )
+ 
+     dtrace_hdr += dtrace_header.process(dtrace_tmpl)