From 4cf235675a587b98ba51ac7300d5b17367713aac Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 14 Jul 2026 22:13:04 +0900 Subject: [PATCH] internal/rosa/meson: always prepend D All flags in practice use this convention. An escape hatch is available by leaving the value empty. Signed-off-by: Ophestra --- internal/rosa/meson.go | 17 +++++++---------- internal/rosa/package/cairo.az | 18 +++++++++--------- internal/rosa/package/dbus.az | 8 ++++---- internal/rosa/package/dtc.az | 2 +- internal/rosa/package/fribidi.az | 2 +- internal/rosa/package/fuse.az | 8 ++++---- internal/rosa/package/glib/package.az | 2 +- internal/rosa/package/harfbuzz.az | 8 ++++---- internal/rosa/package/kmod.az | 12 ++++++------ internal/rosa/package/libdrm.az | 2 +- internal/rosa/package/libepoxy.az | 4 ++-- internal/rosa/package/libevdev.az | 2 +- internal/rosa/package/libglvnd.az | 4 ++-- internal/rosa/package/libinput.az | 6 +++--- internal/rosa/package/libva.az | 6 +++--- internal/rosa/package/mesa.az | 20 ++++++++++---------- internal/rosa/package/p11-kit.az | 4 ++-- internal/rosa/package/pango.az | 6 +++--- internal/rosa/package/pixman.az | 2 +- internal/rosa/package/seatd.az | 6 +++--- internal/rosa/package/wayland.az | 6 +++--- internal/rosa/package/wlroots.az | 6 +++--- internal/rosa/package/x.az | 24 ++++++++++++------------ internal/rosa/package/xkbcommon.az | 2 +- 24 files changed, 87 insertions(+), 90 deletions(-) diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index 569db9b7..b304ffc8 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -56,8 +56,8 @@ func (*MesonHelper) wantsDir() (string, bool) { return `"$(mktemp -d)"`, false } // isPython returns whether the legacy python implementation is used. func (attr *MesonHelper) isPython() bool { - return attr != nil && - (!attr.Muon || len(attr.SkipTests) != 0 || attr.InteractiveTest) + return attr == nil || + !attr.Muon || len(attr.SkipTests) != 0 || attr.InteractiveTest } // script generates the cure script. @@ -106,16 +106,13 @@ func (attr *MesonHelper) script(t Toolchain, name string) string { ` + muon + ` setup \ ` + strings.Join(slices.Collect(func(yield func(string) bool) { for _, v := range append([]KV{ - {"Dwrap_mode", "nofallback"}, - {"Dprefix", "/system"}, - {"Dbuildtype", "release"}, + {"wrap_mode", "nofallback"}, + {"prefix", "/system"}, + {"buildtype", "release"}, }, attr.Setup...) { - s := "-" + v[0] - if len(v[0]) > 0 && v[0][0] != 'D' { - s = "-" + s - } + s := v[0] if v[1] != "" { - s += "=" + v[1] + s = "-D" + s + "=" + v[1] } if !yield(s) { return diff --git a/internal/rosa/package/cairo.az b/internal/rosa/package/cairo.az index 4da4cbea..289098c8 100644 --- a/internal/rosa/package/cairo.az +++ b/internal/rosa/package/cairo.az @@ -13,16 +13,16 @@ package cairo { exec = meson { setup = { - "Ddwrite": "enabled"; - "Dfontconfig": "enabled"; - "Dfreetype": "enabled"; + "dwrite": "enabled"; + "fontconfig": "enabled"; + "freetype": "enabled"; - "Dpng": "enabled"; - "Dtee": "enabled"; - "Dxcb": "enabled"; - "Dxlib": "disabled"; - "Dxlib-xcb": "disabled"; - "Dzlib": "enabled"; + "png": "enabled"; + "tee": "enabled"; + "xcb": "enabled"; + "xlib": "disabled"; + "xlib-xcb": "disabled"; + "zlib": "enabled"; }; // runs the entire test suite in a single meson test interactiveTest = true; diff --git a/internal/rosa/package/dbus.az b/internal/rosa/package/dbus.az index 8df149af..7bdf343d 100644 --- a/internal/rosa/package/dbus.az +++ b/internal/rosa/package/dbus.az @@ -19,9 +19,9 @@ package dbus { exec = meson { setup = { - "Depoll": "enabled"; - "Dinotify": "enabled"; - "Dx11_autolaunch": "disabled"; + "epoll": "enabled"; + "inotify": "enabled"; + "x11_autolaunch": "disabled"; }; }; @@ -50,7 +50,7 @@ package xdg-dbus-proxy { exec = meson { setup = { - "Dman": "disabled"; + "man": "disabled"; }; }; diff --git a/internal/rosa/package/dtc.az b/internal/rosa/package/dtc.az index f715482a..e894ad48 100644 --- a/internal/rosa/package/dtc.az +++ b/internal/rosa/package/dtc.az @@ -18,7 +18,7 @@ package dtc { exec = meson { setup = { - "Dyaml": "disabled"; + "yaml": "disabled"; }; }; diff --git a/internal/rosa/package/fribidi.az b/internal/rosa/package/fribidi.az index c18e98eb..0bd45693 100644 --- a/internal/rosa/package/fribidi.az +++ b/internal/rosa/package/fribidi.az @@ -12,7 +12,7 @@ package fribidi { exec = meson { setup = { - "Ddocs": "false"; + "docs": "false"; }; }; } diff --git a/internal/rosa/package/fuse.az b/internal/rosa/package/fuse.az index 61107377..72bc568a 100644 --- a/internal/rosa/package/fuse.az +++ b/internal/rosa/package/fuse.az @@ -14,10 +14,10 @@ package fuse { exec = meson { setup = { - "Ddefault_library": "both"; - "Dtests": "true"; - "Duseroot": "false"; - "Dinitscriptdir": "/system/etc"; + "default_library": "both"; + "tests": "true"; + "useroot": "false"; + "initscriptdir": "/system/etc"; }; postCompile = "python3 -m pytest test/"; diff --git a/internal/rosa/package/glib/package.az b/internal/rosa/package/glib/package.az index 37b6e379..0e49fcd2 100644 --- a/internal/rosa/package/glib/package.az +++ b/internal/rosa/package/glib/package.az @@ -17,7 +17,7 @@ package glib { exec = meson { setup = { - "Ddefault_library": "both"; + "default_library": "both"; }; // fails with ipv6 disabled skipTests = [ "gio" ]; diff --git a/internal/rosa/package/harfbuzz.az b/internal/rosa/package/harfbuzz.az index 85eda444..a64ab8f4 100644 --- a/internal/rosa/package/harfbuzz.az +++ b/internal/rosa/package/harfbuzz.az @@ -12,10 +12,10 @@ package harfbuzz { exec = meson { setup = { - "Dcairo": "enabled"; - "Dpng": "enabled"; - "Dzlib": "enabled"; - "Dfreetype": "enabled"; + "cairo": "enabled"; + "png": "enabled"; + "zlib": "enabled"; + "freetype": "enabled"; }; }; diff --git a/internal/rosa/package/kmod.az b/internal/rosa/package/kmod.az index 9ff77cbc..d5b99ecb 100644 --- a/internal/rosa/package/kmod.az +++ b/internal/rosa/package/kmod.az @@ -13,12 +13,12 @@ package kmod { exec = meson { setup = { - "Dmoduledir": "/system/lib/modules"; - "Dsysconfdir": "/system/etc"; - "Dbashcompletiondir": "no"; - "Dfishcompletiondir": "no"; - "Dxz": "disabled"; - "Dmanpages": "false"; + "moduledir": "/system/lib/modules"; + "sysconfdir": "/system/etc"; + "bashcompletiondir": "no"; + "fishcompletiondir": "no"; + "xz": "disabled"; + "manpages": "false"; }; // makes assumptions about the running kernel diff --git a/internal/rosa/package/libdrm.az b/internal/rosa/package/libdrm.az index 43fa66f6..efa6f166 100644 --- a/internal/rosa/package/libdrm.az +++ b/internal/rosa/package/libdrm.az @@ -13,7 +13,7 @@ package libdrm { exec = meson { setup = { - "Dintel": "enabled"; + "intel": "enabled"; }; }; diff --git a/internal/rosa/package/libepoxy.az b/internal/rosa/package/libepoxy.az index e6859ca1..f8762a00 100644 --- a/internal/rosa/package/libepoxy.az +++ b/internal/rosa/package/libepoxy.az @@ -12,8 +12,8 @@ package libepoxy { exec = meson { setup = { - "Dglx": "yes"; - "Degl": "yes"; + "glx": "yes"; + "egl": "yes"; }; }; diff --git a/internal/rosa/package/libevdev.az b/internal/rosa/package/libevdev.az index bb5244cb..1ddd0834 100644 --- a/internal/rosa/package/libevdev.az +++ b/internal/rosa/package/libevdev.az @@ -13,7 +13,7 @@ package libevdev { exec = meson { setup = { - "Ddocumentation": "disabled"; + "documentation": "disabled"; }; }; diff --git a/internal/rosa/package/libglvnd.az b/internal/rosa/package/libglvnd.az index b5ddc025..02ce0bd7 100644 --- a/internal/rosa/package/libglvnd.az +++ b/internal/rosa/package/libglvnd.az @@ -13,8 +13,8 @@ package libglvnd { exec = meson { setup = { - "Dx11": "enabled"; - "Dglx": "enabled"; + "x11": "enabled"; + "glx": "enabled"; }; postCompile = ` diff --git a/internal/rosa/package/libinput.az b/internal/rosa/package/libinput.az index 272f33c1..4cb1b764 100644 --- a/internal/rosa/package/libinput.az +++ b/internal/rosa/package/libinput.az @@ -14,9 +14,9 @@ package libinput { bin = [ "bash" ]; exec = meson { setup = { - "Dmtdev": "false"; - "Dlibwacom": "false"; - "Ddebug-gui": "false"; + "mtdev": "false"; + "libwacom": "false"; + "debug-gui": "false"; }; }; diff --git a/internal/rosa/package/libva.az b/internal/rosa/package/libva.az index 5d5c86ef..5cb3a9b4 100644 --- a/internal/rosa/package/libva.az +++ b/internal/rosa/package/libva.az @@ -12,9 +12,9 @@ package libva { exec = meson { setup = { - "Dwith_x11": "yes"; - "Dwith_glx": "yes"; - "Dwith_wayland": "yes"; + "with_x11": "yes"; + "with_glx": "yes"; + "with_wayland": "yes"; }; }; diff --git a/internal/rosa/package/mesa.az b/internal/rosa/package/mesa.az index 78445561..b45e98f7 100644 --- a/internal/rosa/package/mesa.az +++ b/internal/rosa/package/mesa.az @@ -14,14 +14,14 @@ package mesa { exec = meson { setup = { - "Dplatforms": "x11,wayland"; - "Dvideo-codecs": "all"; + "platforms": "x11,wayland"; + "video-codecs": "all"; - "Dglvnd": "enabled"; - "Dgbm": "enabled"; - "Degl": "enabled"; + "glvnd": "enabled"; + "gbm": "enabled"; + "egl": "enabled"; - "Dgallium-drivers": join { + "gallium-drivers": join { elems = [ "asahi", // Apple AGX "crocus", // Intel legacy @@ -51,7 +51,7 @@ package mesa { sep = ","; }; - "Dvulkan-drivers": join { + "vulkan-drivers": join { elems = [ "amd", // AMD (aka RADV) "broadcom", // Broadcom VC5 (Raspberry Pi 4, aka V3D) @@ -72,7 +72,7 @@ package mesa { sep = ","; }; - "Dvulkan-layers": join { + "vulkan-layers": join { elems = [ "device-select", "intel-nullhw", @@ -84,8 +84,8 @@ package mesa { sep = ","; }; - "Dfreedreno-kmds": "msm,virtio"; - "Damdgpu-virtio": "true"; + "freedreno-kmds": "msm,virtio"; + "amdgpu-virtio": "true"; }; }; diff --git a/internal/rosa/package/p11-kit.az b/internal/rosa/package/p11-kit.az index 286ded38..913aca9b 100644 --- a/internal/rosa/package/p11-kit.az +++ b/internal/rosa/package/p11-kit.az @@ -12,8 +12,8 @@ package p11-kit { exec = meson { setup = { - "Dsystemd": "disabled"; - "Dlibffi": "enabled"; + "systemd": "disabled"; + "libffi": "enabled"; }; }; diff --git a/internal/rosa/package/pango.az b/internal/rosa/package/pango.az index c32ea763..20c9f018 100644 --- a/internal/rosa/package/pango.az +++ b/internal/rosa/package/pango.az @@ -13,9 +13,9 @@ package pango { exec = meson { setup = { - "Dfontconfig": "enabled"; - "Dfreetype": "enabled"; - "Dcairo": "enabled"; + "fontconfig": "enabled"; + "freetype": "enabled"; + "cairo": "enabled"; }; // Fontconfig error: Cannot load default config file: File not found: /etc/fonts/fonts.conf skipTest = true; diff --git a/internal/rosa/package/pixman.az b/internal/rosa/package/pixman.az index e375300c..aeb36e0c 100644 --- a/internal/rosa/package/pixman.az +++ b/internal/rosa/package/pixman.az @@ -13,7 +13,7 @@ package pixman { exec = meson { setup = { - "Dtests": "enabled"; + "tests": "enabled"; }; }; } diff --git a/internal/rosa/package/seatd.az b/internal/rosa/package/seatd.az index d95cd88a..a9e88eb9 100644 --- a/internal/rosa/package/seatd.az +++ b/internal/rosa/package/seatd.az @@ -17,9 +17,9 @@ package seatd { exec = meson { setup = { - "Dlibseat-logind": "disabled"; - "Dlibseat-seatd": "enabled"; - "Dlibseat-builtin": "enabled"; + "libseat-logind": "disabled"; + "libseat-seatd": "enabled"; + "libseat-builtin": "enabled"; }; }; diff --git a/internal/rosa/package/wayland.az b/internal/rosa/package/wayland.az index de39b5fb..82aa8f4d 100644 --- a/internal/rosa/package/wayland.az +++ b/internal/rosa/package/wayland.az @@ -19,9 +19,9 @@ echo 'int main(){}' > tests/sanity-test.c exec = meson { setup = { - "Ddefault_library": "both"; - "Ddocumentation": "false"; - "Dtests": "true"; + "default_library": "both"; + "documentation": "false"; + "tests": "true"; }; }; diff --git a/internal/rosa/package/wlroots.az b/internal/rosa/package/wlroots.az index ae90ea08..62593779 100644 --- a/internal/rosa/package/wlroots.az +++ b/internal/rosa/package/wlroots.az @@ -13,9 +13,9 @@ package wlroots { exec = meson { setup = { - "Dxwayland": "enabled"; - "Dallocators": "gbm"; - "Dbackends": "drm,libinput"; + "xwayland": "enabled"; + "allocators": "gbm"; + "backends": "drm,libinput"; }; }; diff --git a/internal/rosa/package/x.az b/internal/rosa/package/x.az index 078c5d96..cb5e51f6 100644 --- a/internal/rosa/package/x.az +++ b/internal/rosa/package/x.az @@ -80,7 +80,7 @@ package libXau { exec = meson { setup = { - "Ddefault_library": "both"; + "default_library": "both"; }; }; @@ -682,7 +682,7 @@ package libpciaccess { exec = meson { setup = { - "Dzlib": "enabled"; + "zlib": "enabled"; }; }; @@ -705,17 +705,17 @@ package xserver { exec = meson { setup = { - "Dxorg": "true"; - "Dxephyr": "true"; - "Dxnest": "true"; - "Dipv6": "false"; + "xorg": "true"; + "xephyr": "true"; + "xnest": "true"; + "ipv6": "false"; - "Dudev": "false"; - "Dudev_kms": "false"; - "Dglx": "false"; + "udev": "false"; + "udev_kms": "false"; + "glx": "false"; // ../../usr/src/xserver/glamor/glamor_glx.c:24:10: fatal error: 'epoxy/glx.h' file not found - "Dglamor": "false"; + "glamor": "false"; }; }; @@ -784,8 +784,8 @@ package xwayland { bin = [ "bash" ]; exec = meson { setup = { - "Dipv6": "false"; - "Dsystemd_notify": "false"; + "ipv6": "false"; + "systemd_notify": "false"; }; }; diff --git a/internal/rosa/package/xkbcommon.az b/internal/rosa/package/xkbcommon.az index 33bac6ed..42bc89d4 100644 --- a/internal/rosa/package/xkbcommon.az +++ b/internal/rosa/package/xkbcommon.az @@ -16,7 +16,7 @@ package xkbcommon { exec = meson { setup = { - "Denable-x11": "false"; + "enable-x11": "false"; }; };