From 686d7ec63a5334062101d82009affbe09be93525 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 14 May 2026 04:15:48 +0900 Subject: [PATCH] internal/rosa/x: xserver artifact Required by libglvnd test suite. Signed-off-by: Ophestra --- internal/rosa/all.go | 1 + internal/rosa/x.go | 84 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/internal/rosa/all.go b/internal/rosa/all.go index 55904f0b..0776c615 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -202,6 +202,7 @@ const ( Xkbcomp XkeyboardConfig XorgProto + Xserver Zlib Zstd diff --git a/internal/rosa/x.go b/internal/rosa/x.go index f103a3df..e67be3b5 100644 --- a/internal/rosa/x.go +++ b/internal/rosa/x.go @@ -902,3 +902,87 @@ func init() { ID: 1703, } } + +func (t Toolchain) newXserver() (pkg.Artifact, string) { + const ( + version = "21.1.22" + checksum = "prLT2wKecBu5m9w1ThgIt0GvenNpjKXoOyvTiMA1oQTlP0QHh6QiWsdvH3OmUwNo" + ) + return t.NewPackage("xserver", version, newFromGitLab( + "gitlab.freedesktop.org", + "xorg/xserver", + "xorg-server-"+version, + checksum, + ), nil, &MesonHelper{ + Setup: []KV{ + {"Dxorg", "true"}, + {"Dxephyr", "true"}, + {"Dxnest", "true"}, + {"Dipv6", "false"}, + + {"Dudev", "false"}, + {"Dudev_kms", "false"}, + {"Dglx", "false"}, + // ../../usr/src/xserver/glamor/glamor_glx.c:24:10: fatal error: 'epoxy/glx.h' file not found + {"Dglamor", "false"}, + }, + }, + Gawk, + + XorgProto, + Libxtrans, + Libxshmfence, + Pixman, + Libbsd, + Xkbcomp, + XkeyboardConfig, + LibXfont2, + DBus, + FontUtil, + Libxcvt, + LibXext, + Libmd, + LibXdmcp, + Libtirpc, + Libepoxy, + LibxcbUtil, + LibxcbUtilImage, + LibxcbUtilWM, + LibxcbUtilKeysyms, + LibxcbRenderUtil, + Libpciaccess, + KernelHeaders, + ), version +} +func init() { + artifactsM[Xserver] = Metadata{ + f: Toolchain.newXserver, + + Name: "xserver", + Description: "X server", + Website: "https://gitlab.freedesktop.org/xorg/xserver", + + Dependencies: P{ + Xkbcomp, + XkeyboardConfig, + + XCB, + Pixman, + Libmd, + Libbsd, + Libtirpc, + Libxcvt, + LibXdmcp, + LibXfont2, + Libpciaccess, + + // Xephyr + LibxcbUtilImage, + LibxcbUtilWM, + LibxcbUtilKeysyms, + LibxcbRenderUtil, + }, + + ID: 5250, + } +}