From cf0dffa0f5efaac91b3ae7935f0d3283834cd348 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 14 May 2026 04:35:50 +0900 Subject: [PATCH] internal/rosa/mesa: libglvnd enable glx Required to break circular dependency. Signed-off-by: Ophestra --- internal/rosa/mesa.go | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/internal/rosa/mesa.go b/internal/rosa/mesa.go index 612400b2..21ace480 100644 --- a/internal/rosa/mesa.go +++ b/internal/rosa/mesa.go @@ -12,8 +12,22 @@ func (t Toolchain) newLibglvnd() (pkg.Artifact, string) { "glvnd/libglvnd", "v"+version, checksum, - ), nil, (*MesonHelper)(nil), + ), nil, &MesonHelper{ + Setup: []KV{ + {"Dx11", "enabled"}, + {"Dglx", "enabled"}, + }, + ScriptCompiled: ` +export DISPLAY=':0' +Xvfb & +XVFB_PID="$!" +trap 'kill $XVFB_PID && wait $XVFB_PID' EXIT +`, + }, Binutils, // symbols check fail with llvm nm + Xserver, // test suite wants X server + + LibXext, ), version } func init() { @@ -24,6 +38,10 @@ func init() { Description: "The GL Vendor-Neutral Dispatch library", Website: "https://gitlab.freedesktop.org/glvnd/libglvnd", + Dependencies: P{ + LibXext, + }, + ID: 12098, } }