From 6231cfe2aa6570fd94840a95561f913854fa983d Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 14 May 2026 03:36:45 +0900 Subject: [PATCH] internal/rosa/x: libxcb-util-image artifact Required by xserver xephyr. Signed-off-by: Ophestra --- internal/rosa/all.go | 3 ++- internal/rosa/x.go | 42 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/internal/rosa/all.go b/internal/rosa/all.go index 7dfa0fc4..cf31f63f 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -114,6 +114,8 @@ const ( Libunistring LibxcbRenderUtil LibxcbUtil + LibxcbUtilImage + LibxcbUtilKeysyms Libxcvt Libxkbfile Libxml2 @@ -194,7 +196,6 @@ const ( WaylandProtocols XCB XCBProto - XCBUtilKeysyms XDGDBusProxy XZ Xkbcomp diff --git a/internal/rosa/x.go b/internal/rosa/x.go index c5d5b798..4b65ae6b 100644 --- a/internal/rosa/x.go +++ b/internal/rosa/x.go @@ -186,12 +186,12 @@ func init() { } } -func (t Toolchain) newXCBUtilKeysyms() (pkg.Artifact, string) { +func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) { const ( version = "0.4.1" checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4" ) - return t.NewPackage("xcb-util-keysyms", version, newTar( + return t.NewPackage("libxcb-util-keysyms", version, newTar( "https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz", checksum, pkg.TarGzip, @@ -202,10 +202,10 @@ func (t Toolchain) newXCBUtilKeysyms() (pkg.Artifact, string) { ), version } func init() { - artifactsM[XCBUtilKeysyms] = Metadata{ - f: Toolchain.newXCBUtilKeysyms, + artifactsM[LibxcbUtilKeysyms] = Metadata{ + f: Toolchain.newLibxcbUtilKeysyms, - Name: "xcb-util-keysyms", + Name: "libxcb-util-keysyms", Description: "standard X key constants and conversion to/from keycodes", Website: "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms", @@ -217,6 +217,38 @@ func init() { } } +func (t Toolchain) newLibxcbUtilImage() (pkg.Artifact, string) { + const ( + version = "0.4.1" + checksum = "47pvXmFwaUBZIrJ4CE9xjTQIFyxeqoNAL-DshlB11GZ_jjI3G1a6KF0K7mtBQ1E7" + ) + return t.NewPackage("libxcb-util-image", version, newTar( + "https://xcb.freedesktop.org/dist/xcb-util-image-"+version+".tar.gz", + checksum, + pkg.TarGzip, + ), nil, (*MakeHelper)(nil), + PkgConfig, + + XCB, + LibxcbUtil, + ), version +} +func init() { + artifactsM[LibxcbUtilImage] = Metadata{ + f: Toolchain.newLibxcbUtilImage, + + Name: "libxcb-util-image", + Description: "XCB port of Xlib's XImage and XShmImage functions.", + Website: "https://gitlab.freedesktop.org/xorg/lib/libxcb-image", + + Dependencies: P{ + LibxcbUtil, + }, + + ID: 5168, + } +} + func (t Toolchain) newLibxcbUtil() (pkg.Artifact, string) { const ( version = "0.4.1"