git: 1202fd6e3b44 - main - x11-servers/xorg-server: fix wrong types string instead of bool
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Nov 2025 14:42:31 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1202fd6e3b449f4b34355e7c59fadad7322c1251
commit 1202fd6e3b449f4b34355e7c59fadad7322c1251
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2025-11-04 14:40:49 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-11-04 14:42:24 +0000
x11-servers/xorg-server: fix wrong types string instead of bool
meson has a bug which makes those wrong type being ignored, but muon
chokes on it.
No functional changes intented.
---
.../xorg-server/files/patch-meson__options.txt | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/x11-servers/xorg-server/files/patch-meson__options.txt b/x11-servers/xorg-server/files/patch-meson__options.txt
new file mode 100644
index 000000000000..4fa23197ddd9
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-meson__options.txt
@@ -0,0 +1,28 @@
+--- meson_options.txt.orig 2025-06-18 16:25:56 UTC
++++ meson_options.txt
+@@ -57,12 +57,12 @@ option('int10', type: 'combo', choices: ['stub', 'x86e
+ option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'false'],
+ value: 'auto',
+ description: 'Xorg int10 backend (default: usually x86emu)')
+-option('suid_wrapper', type: 'boolean', value: 'false',
++option('suid_wrapper', type: 'boolean', value: false,
+ description: 'SUID wrapper for legacy driver support')
+-option('pciaccess', type: 'boolean', value: 'true',
++option('pciaccess', type: 'boolean', value: true,
+ description: 'Xorg pciaccess support')
+-option('udev', type: 'boolean', value: 'true')
+-option('udev_kms', type: 'boolean', value: 'true')
++option('udev', type: 'boolean', value: true)
++option('udev_kms', type: 'boolean', value: true)
+ option('hal', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+ description: 'Enable HAL integration')
+ option('systemd_logind', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+@@ -107,7 +107,7 @@ option('dri3', type: 'combo', choices: ['true', 'false
+ option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
+ option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
+ option('dri3', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI3 extension (default: auto)')
+-option('drm', type: 'boolean', value: 'true',
++option('drm', type: 'boolean', value: true,
+ description: 'Build Xorg with libdrm support')
+
+ option('apple-applications-dir', type: 'string', value: '/Applications/Utilities',