internal/rosa/package: migrate X packages

This also improves naming consistency.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/rosa/package/mesa.az

@@ -116,7 +116,7 @@ package mesa {
 		libxshmfence,
 		libXxf86vm,
 		libXrandr,
-		libxcb-util-keysyms,
+		libxcb-keysyms,
 		libpng,
 		libarchive,
 		kernel-headers,
@@ -131,7 +131,7 @@ package mesa {
 		libxshmfence,
 		libXxf86vm,
 		libXrandr,
-		libxcb-util-keysyms,
+		libxcb-keysyms,
 		libpng,
 	];
 }

internal/rosa/package/x.az

@@ -0,0 +1,770 @@
+package util-macros {
+	description = "X.Org Autotools macros";
+	website = "https://xorg.freedesktop.org";
+	anitya = 5252;
+
+	version* = "1.20.2";
+	source = remoteTar {
+		url = "https://www.x.org/releases/individual/util/"+
+			"util-macros-"+version+".tar.gz";
+		checksum = "Ze8QH3Z3emC0pWFP-0nUYeMy7aBW3L_dxBBmVgcumIHNzEKc1iGTR-yUFR3JcM1G";
+		compress = gzip;
+	};
+
+	exec = make {};
+}
+
+package libxtrans {
+	description = "X Window System Protocols Transport layer shared code";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxtrans";
+	anitya = 13441;
+
+	version* = "1.6.0";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxtrans";
+		ref = "xtrans-"+version;
+		checksum = "1cxDCF59fLf1HyGDMcjR1L50ZbjD0RTTEDUpOJYcHXu6HUK_Ds0x-KREY7rLNxu9";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+	];
+}
+
+package xorgproto {
+	description = "X Window System unified protocol definitions";
+	website = "https://gitlab.freedesktop.org/xorg/proto/xorgproto";
+	anitya = 17190;
+
+	version* = "2025.1";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/proto/xorgproto";
+		ref = "xorgproto-"+version;
+		checksum = "pTwJiBJHKA6Rgm3cVDXy1lyvXNIUzTRaukvvYdk1xWoJ_1G-Dfjm9MyewuyIjoHz";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		pkg-config,
+
+		util-macros,
+	];
+}
+
+package libXau {
+	description = "functions for handling Xauthority files and entries";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxau";
+	anitya = 1765;
+
+	version* = "1.0.12";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxau";
+		ref = "libXau-"+version;
+		checksum = "aCRhtP9ERNpqEtH7T6xSifPKguPppiPYCq7ah3M-i732nrPu_-g8tPSgMslHdB5p";
+	};
+
+	exec = meson {
+		setup = {
+			"Ddefault_library": "both";
+		};
+	};
+
+	inputs = [ xorgproto ];
+	runtime = [ xorgproto ];
+}
+
+package xcb-proto {
+	description = "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions";
+	website = "https://gitlab.freedesktop.org/xorg/proto/xcbproto";
+	anitya = 13646;
+
+	version* = "1.17.0";
+	source = remoteTar {
+		url = "https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz";
+		checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [ python ];
+}
+
+package xcb {
+	description = "The X protocol C-language Binding";
+	website = "https://xcb.freedesktop.org";
+	anitya = 1767;
+
+	version* = "1.17.0";
+	source = remoteTar {
+		url = "https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz";
+		checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [
+		python,
+		pkg-config,
+
+		xcb-proto,
+		libXau,
+	];
+
+	runtime = [
+		xcb-proto,
+		libXau,
+	];
+}
+
+package libxcb-keysyms {
+	description = "standard X key constants and conversion to/from keycodes";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms";
+	anitya = 5168;
+
+	version* = "0.4.1";
+	source = remoteTar {
+		url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz";
+		checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [
+		pkg-config,
+
+		xcb,
+	];
+
+	runtime = [ xcb ];
+}
+
+package libxcb-wm {
+	description = "XCB client and window-manager helpers for ICCCM & EWMH";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm";
+	anitya = 5170;
+
+	version* = "0.4.2";
+	source = remoteTar {
+		url = "https://xcb.freedesktop.org/dist/xcb-util-wm-"+version+".tar.gz";
+		checksum = "g0VZgMU9hcIgyXb3XxBR9xqsvUMBd9qt_Dbmwoj2h5y24pODr_S_D0DhRsuXUNjF";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [
+		m4,
+		pkg-config,
+
+		xcb,
+	];
+
+	runtime = [ xcb ];
+}
+
+package libxcb-util {
+	description = "XCB utility libraries";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxcb-util";
+	anitya = 5165;
+
+	version* = "0.4.1";
+	source = remoteTar {
+		url = "https://www.x.org/releases/individual/xcb/"+
+			"xcb-util-"+version+".tar.gz";
+		checksum = "YMXGQUQbF6PoEAGflvYnJYsLWjti6sL_ifY47wIXTNGVM3tQ8u41nkBYN4K1D5CD";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [
+		pkg-config,
+
+		util-macros,
+		xcb,
+	];
+
+	runtime = [ xcb ];
+}
+
+package libxcb-image {
+	description = "XCB port of Xlib's XImage and XShmImage functions";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxcb-image";
+	anitya = 5168;
+
+	version* = "0.4.1";
+	source = remoteTar {
+		url = "https://xcb.freedesktop.org/dist/xcb-util-image-"+version+".tar.gz";
+		checksum = "47pvXmFwaUBZIrJ4CE9xjTQIFyxeqoNAL-DshlB11GZ_jjI3G1a6KF0K7mtBQ1E7";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [
+		pkg-config,
+
+		libxcb-util,
+	];
+
+	runtime = [ libxcb-util ];
+}
+
+package libxcb-render-util {
+	description = "XCB convenience functions for the Render extension";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util";
+	anitya = 5169;
+
+	version* = "0.3.10";
+	source = remoteTar {
+		url = "https://www.x.org/releases/individual/xcb/"+
+			"xcb-util-renderutil-"+version+".tar.gz";
+		checksum = "n08L8PyCoOd7v2vb6fSVq5Pq6JtteXVh9K2wrQMTNwGMf_Fjpi6i3HWF-TMFSVTI";
+		compress = gzip;
+	};
+
+	exec = make {};
+
+	inputs = [
+		pkg-config,
+
+		util-macros,
+		xcb,
+	];
+
+	runtime = [ xcb ];
+}
+
+package libX11 {
+	description = `Core X11 protocol client library (aka "Xlib")`;
+	website = "https://gitlab.freedesktop.org/xorg/lib/libx11";
+	anitya = 1764;
+
+	version* = "1.8.13";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libx11";
+		ref = "libX11-"+version;
+		checksum = "ARh-cuZY_U2v3DbPS1byc7ybh9NInZc-yav7SJiusk_C7408s058qWV83ocMd2pT";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+
+		configure = {
+			"enable-static";
+			"without-xmlto";
+		};
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		libxtrans,
+		xorgproto,
+		xcb,
+	];
+
+	runtime = [ xcb ];
+}
+
+package libXext {
+	description = "Xlib-based library for common extensions to the X11 protocol";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxext";
+	anitya = 1774;
+
+	version* = "1.3.7";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxext";
+		ref = "libXext-"+version;
+		checksum = "-0wvUDaucLPLNOrK1pcKhHNoO-5nUqQyyw6JAbhx65gRjuMiNKKaF2_tcrbC_KNq";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		libX11,
+	];
+
+	runtime = [ libX11 ];
+}
+
+package libXfixes {
+	description = "Xlib-based library for the XFIXES Extension";
+	website = "https://www.freedesktop.org/wiki/Software/FixesExt";
+	anitya = 1775;
+
+	version* = "6.0.2";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxfixes";
+		ref = "libXfixes-"+version;
+		checksum = "_-kJfKZ7cE3NNeMr6NLSXCmsyP7MVEHVPLNfxatz2qBy3_fZJvPMQwZNOC9y6V5L";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		xorgproto,
+		libX11,
+	];
+
+	runtime = [ libX11 ];
+}
+
+package libXrender {
+	description = "Xlib library for the Render Extension to the X11 protocol";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxrender";
+	anitya = 1789;
+
+	version* = "0.9.12";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxrender";
+		ref = "libXrender-"+version;
+		checksum = "s6nWn-r17X_W-7anaS7wIcq5_Levf9zAigwJDD9Klp-cCJTVDhLo7GufuVOrxVP0";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		libX11,
+	];
+
+	runtime = [ libX11 ];
+}
+
+package libxshmfence {
+	description = "shared memory 'SyncFence' synchronization primitive";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxshmfence";
+	anitya = 1792;
+
+	version* = "1.3.3";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxshmfence";
+		ref = "libxshmfence-"+version;
+		checksum = "JamExTPg81By2fs3vWdeo_dzlpBQeAwXr2sDXeHJqm9XBoLW5pamiD6FgAWtAKyA";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		xorgproto,
+	];
+}
+
+package libXxf86vm {
+	description = "Xlib-based library for the XFree86-VidMode X extension";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm";
+	anitya = 1799;
+
+	version* = "1.1.7";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxxf86vm";
+		ref = "libXxf86vm-"+version;
+		checksum = "mS4cgKWrwz6M1Lb6Qu4ZVh8Xn2Ca_4HXPxr3LDad4iYY1LecZfeLUPW1hkp6amX_";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		libXext,
+		xorgproto,
+	];
+
+	runtime = [ libXext ];
+}
+
+package libXrandr {
+	description = "Xlib Resize, Rotate and Reflection (RandR) extension library";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxrandr";
+	anitya = 1788;
+
+	version* = "1.5.5";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxrandr";
+		ref = "libXrandr-"+version;
+		checksum = "OF7C7VC5MwnFue9UX5UnIkG1PIWvn9bBMq6d4mVyJJ_rcF0w4Kedn1lfxBsXEKAP";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		libXext,
+		libXrender,
+		xorgproto,
+	];
+
+	runtime = [
+		libXext,
+		libXrender,
+	];
+}
+
+package font-util {
+	description = "X.Org font package creation/installation utilities";
+	website = "https://gitlab.freedesktop.org/xorg/font/util";
+	anitya = 15055;
+
+	version* = "1.4.2";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/font/util";
+		ref = "font-util-"+version;
+		checksum = "YWiaIxkq-N2yNdbGa_RF1S0UkQq6xsgoRT73WZP2DOmyH_CJ0TAkpQjId657MQmh";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+	];
+}
+
+package libfontenc {
+	description = "X font encoding library";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libfontenc";
+	anitya = 1613;
+
+	version* = "1.1.9";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libfontenc";
+		ref = "libfontenc-"+version;
+		checksum = "XqosXfbVwaoYzG9vVyRCl3eatwjASoJdLZsxQ37NN8S_jTyqNmbxpRSJGImJj7RS";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		font-util,
+		xorgproto,
+	];
+}
+
+package libxkbfile {
+	description = "XKB file handling routines";
+	website = "http://www.x.org/wiki/XKB";
+	anitya = 1781;
+
+	version* = "1.2.0";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxkbfile";
+		ref = "libxkbfile-"+version;
+		checksum = "WUtph1ab0AyATahlwljchBxZJcpjYrjyhCK9DW2VO0uXEXaN22GWmUaibcA83i_B";
+	};
+
+	exec = meson {};
+
+	inputs = [ libX11 ];
+	runtime = [ libX11 ];
+}
+
+package xkbcomp {
+	description = "XKB keyboard description compiler";
+	website = "http://www.x.org/wiki/XKB";
+	anitya = 15018;
+
+	version* = "1.5.0";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/app/xkbcomp";
+		ref = "xkbcomp-"+version;
+		checksum = "ttICW8ZPbljI-nw2kknvxFhwFoDK40iAMBeZDLAHYsHf3B6UPO_zc9TpzZYRRyZH";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+		bison,
+
+		util-macros,
+		libxkbfile,
+	];
+
+	runtime = [ libxkbfile ];
+}
+
+package libXfont2 {
+	description = "X font handling library for server & utilities";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxfont";
+	anitya = 17165;
+
+	version* = "2.0.7";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxfont";
+		ref = "libXfont2-"+version;
+		checksum = "jv9BZNA02493KB8j1lfAErF5SA3ZFcAhm3_UVJ--Bp1maz-vNprl_wXpkHApBi9M";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		freetype,
+		xorgproto,
+		libxtrans,
+		libfontenc,
+	];
+
+	runtime = [
+		freetype,
+		libfontenc,
+	];
+}
+
+package libxcvt {
+	description = "VESA CVT standard timing modeline generation library & utility";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxcvt";
+	anitya = 235147;
+
+	version* = "0.1.3";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxcvt";
+		ref = "libxcvt-"+version;
+		checksum = "IfIA7SxlHMWh681e1AgYmZcRAfkZd5LlzmqcMRifNY5nNVRrUx_wnoaidAv0Yu03";
+	};
+
+	exec = meson {};
+}
+
+package libXdmcp {
+	description = "X Display Manager Control Protocol library";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libxdmcp";
+	anitya = 1772;
+
+	version* = "1.1.5";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libxdmcp";
+		ref = "libXdmcp-"+version;
+		checksum = "N6AJSv9pmeBedFn8KuSIOUGvTken4rkypNWVE2KfPlliwkfIbhfXrt5YHZkBMUHp";
+	};
+
+	exec = make {
+		generate = "NOCONFIGURE=1 ./autogen.sh";
+	};
+
+	inputs = [
+		automake,
+		libtool,
+		pkg-config,
+
+		util-macros,
+		xorgproto,
+	];
+}
+
+package xkeyboard-config {
+	description = "the non-arch keyboard configuration database for X Window";
+	website = "https://www.freedesktop.org/wiki/Software/XKeyboardConfig";
+	anitya = 5191;
+
+	version* = "2.47";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xkeyboard-config/xkeyboard-config";
+		ref = "xkeyboard-config-"+version;
+		checksum = "E03PsPIaRrxPAuKgDGSQyPiJB49wXtyyvdV0lVx3_G-pelMMlaFLkoTDHTHG_qgA";
+	};
+
+	exec = meson {};
+
+	inputs = [ perl ];
+}
+
+package libpciaccess {
+	description = "generic PCI access library";
+	website = "https://gitlab.freedesktop.org/xorg/lib/libpciaccess";
+	anitya = 1703;
+
+	version* = "0.19";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/lib/libpciaccess";
+		ref = "libpciaccess-"+version;
+		checksum = "84H0c_U_7fMqo81bpuwyXGXtk4XvvFH_YK00UiOriv3YGsuAhmbo2IkFhmJnvu2x";
+	};
+
+	exec = meson {
+		setup = {
+			"Dzlib": "enabled";
+		};
+	};
+
+	inputs = [ zlib ];
+	runtime = [ zlib ];
+}
+
+package xserver {
+	description = "X server";
+	website = "https://gitlab.freedesktop.org/xorg/xserver";
+	anitya = 5250;
+
+	version* = "21.1.22";
+	source = remoteGitLab {
+		domain = "gitlab.freedesktop.org";
+		suffix = "xorg/xserver";
+		ref = "xorg-server-"+version;
+		checksum = "prLT2wKecBu5m9w1ThgIt0GvenNpjKXoOyvTiMA1oQTlP0QHh6QiWsdvH3OmUwNo";
+	};
+
+	exec = meson {
+		setup = {
+			"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";
+		};
+	};
+
+	inputs = [
+		gawk,
+
+		xorgproto,
+		libxtrans,
+		libxshmfence,
+		pixman,
+		libbsd,
+		xkbcomp,
+		xkeyboard-config,
+		libXfont2,
+		dbus,
+		font-util,
+		libxcvt,
+		libXext,
+		libmd,
+		libXdmcp,
+		libtirpc,
+		libepoxy,
+		libxcb-util,
+		libxcb-image,
+		libxcb-wm,
+		libxcb-keysyms,
+		libxcb-render-util,
+		libpciaccess,
+		kernel-headers,
+	];
+
+	runtime = [
+		xkbcomp,
+		xkeyboard-config,
+
+		xcb,
+		pixman,
+		libmd,
+		libbsd,
+		libtirpc,
+		libxcvt,
+		libXdmcp,
+		libXfont2,
+		libpciaccess,
+
+		// Xephyr
+		libxcb-image,
+		libxcb-wm,
+		libxcb-keysyms,
+		libxcb-render-util,
+	];
+}

internal/rosa/state_native.go

@@ -7,16 +7,11 @@ var (
 	KernelHeaders    = H("kernel-headers")
 	Firmware         = H("firmware")
 	ACL              = H("acl")
-	Automake          = H("automake")
 	Bash             = H("bash")
-	Bison             = H("bison")
 	Bzip2            = H("bzip2")
 	Coreutils        = H("coreutils")
-	DBus              = H("dbus")
 	Diffutils        = H("diffutils")
 	Findutils        = H("findutils")
-	FontUtil          = H("font-util")
-	Freetype          = H("freetype")
 	Fuse             = H("fuse")
 	GLib             = H("glib")
 	Gawk             = H("gawk")
@@ -26,37 +21,11 @@ var (
 	Hakurei          = H("hakurei")
 	HakureiDist      = H("hakurei-dist")
 	Kmod             = H("kmod")
-	LibX11            = H("libX11")
-	LibXau            = H("libXau")
-	LibXdmcp          = H("libXdmcp")
-	LibXext           = H("libXext")
-	LibXfont2         = H("libXfont2")
-	LibXrender        = H("libXrender")
-	Libbsd            = H("libbsd")
-	Libepoxy          = H("libepoxy")
-	Libexpat          = H("libexpat")
-	Libffi            = H("libffi")
-	Libfontenc        = H("libfontenc")
-	Libmd             = H("libmd")
-	Libpciaccess      = H("libpciaccess")
 	Libseccomp       = H("libseccomp")
-	Libtirpc          = H("libtirpc")
-	Libtool           = H("libtool")
-	LibxcbRenderUtil  = H("libxcb-render-util")
-	LibxcbUtil        = H("libxcb-util")
-	LibxcbUtilImage   = H("libxcb-util-image")
-	LibxcbUtilKeysyms = H("libxcb-util-keysyms")
-	LibxcbUtilWM      = H("libxcb-util-wm")
-	Libxcvt           = H("libxcvt")
-	Libxkbfile        = H("libxkbfile")
-	Libxml2           = H("libxml2")
-	Libxshmfence      = H("libxshmfence")
-	Libxtrans         = H("libxtrans")
 	M4               = H("m4")
 	NSS              = H("nss")
 	NSSCACert        = H("nss-cacert")
 	Patch            = H("patch")
-	Pixman            = H("pixman")
 	PkgConfig        = H("pkg-config")
 	PythonPyTest     = H("python-pytest")
 	QEMU             = H("qemu")
@@ -68,16 +37,11 @@ var (
 	Wayland          = H("wayland")
 	WaylandProtocols = H("wayland-protocols")
 	XCB              = H("xcb")
-	XCBProto          = H("xcb-proto")
-	Xkbcomp           = H("xkbcomp")
-	XkeyboardConfig   = H("xkeyboard-config")
-	XorgProto         = H("xorgproto")
 	Zlib             = H("zlib")
 	Zstd             = H("zstd")
 	llvmSource       = H("llvm-project")
 	earlyCompilerRT  = H("early-compiler-rt")
 	earlyRuntimes    = H("early-runtimes")
-	utilMacros        = H("util-macros")
 	Musl             = H("musl")
 	muslHeaders      = H("musl-headers")
 	gcc              = H("gcc")

internal/rosa/x.go

@@ -1,932 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newUtilMacros() (pkg.Artifact, string) {
-	const (
-		version  = "1.20.2"
-		checksum = "Ze8QH3Z3emC0pWFP-0nUYeMy7aBW3L_dxBBmVgcumIHNzEKc1iGTR-yUFR3JcM1G"
-	)
-	return t.NewPackage("util-macros", version, newTar(
-		"https://www.x.org/releases/individual/util/"+
-			"util-macros-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil)), version
-}
-func init() {
-	native.mustRegister(Toolchain.newUtilMacros, &Metadata{
-		Name:        "util-macros",
-		Description: "X.Org Autotools macros",
-		Website:     "https://xorg.freedesktop.org/",
-
-		ID: 5252,
-	})
-}
-
-func (t Toolchain) newLibxtrans() (pkg.Artifact, string) {
-	const (
-		version  = "1.6.0"
-		checksum = "1cxDCF59fLf1HyGDMcjR1L50ZbjD0RTTEDUpOJYcHXu6HUK_Ds0x-KREY7rLNxu9"
-	)
-	return t.NewPackage("libxtrans", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxtrans",
-		"xtrans-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxtrans, &Metadata{
-		Name:        "libxtrans",
-		Description: "X Window System Protocols Transport layer shared code",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxtrans",
-
-		ID: 13441,
-	})
-}
-
-func (t Toolchain) newXorgProto() (pkg.Artifact, string) {
-	const (
-		version  = "2025.1"
-		checksum = "pTwJiBJHKA6Rgm3cVDXy1lyvXNIUzTRaukvvYdk1xWoJ_1G-Dfjm9MyewuyIjoHz"
-	)
-	return t.NewPackage("xorgproto", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/proto/xorgproto",
-		"xorgproto-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		PkgConfig,
-
-		utilMacros,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newXorgProto, &Metadata{
-		Name:        "xorgproto",
-		Description: "X Window System unified protocol definitions",
-		Website:     "https://gitlab.freedesktop.org/xorg/proto/xorgproto",
-
-		ID: 17190,
-	})
-}
-
-func (t Toolchain) newLibXau() (pkg.Artifact, string) {
-	const (
-		version  = "1.0.12"
-		checksum = "G9AjnU_C160q814MCdjFOVt_mQz_pIt4wf4GNOQmGJS3UuuyMw53sfPvJ7WOqwXN"
-	)
-	return t.NewPackage("libXau", version, newTar(
-		"https://www.x.org/releases/individual/lib/"+
-			"libXau-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, &MakeHelper{
-		// ancient configure script
-		Generate: "autoreconf -if",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		XorgProto,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXau, &Metadata{
-		Name:        "libXau",
-		Description: "functions for handling Xauthority files and entries",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxau",
-
-		Dependencies: P{
-			XorgProto,
-		},
-
-		ID: 1765,
-	})
-}
-
-func (t Toolchain) newXCBProto() (pkg.Artifact, string) {
-	const (
-		version  = "1.17.0"
-		checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv"
-	)
-	return t.NewPackage("xcb-proto", version, newTar(
-		"https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		Python,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newXCBProto, &Metadata{
-		Name:        "xcb-proto",
-		Description: "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions",
-		Website:     "https://gitlab.freedesktop.org/xorg/proto/xcbproto",
-
-		ID: 13646,
-	})
-}
-
-func (t Toolchain) newXCB() (pkg.Artifact, string) {
-	const (
-		version  = "1.17.0"
-		checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd"
-	)
-	return t.NewPackage("xcb", version, newTar(
-		"https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		Python,
-		PkgConfig,
-
-		XCBProto,
-		LibXau,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newXCB, &Metadata{
-		Name:        "xcb",
-		Description: "The X protocol C-language Binding",
-		Website:     "https://xcb.freedesktop.org/",
-
-		Dependencies: P{
-			XCBProto,
-			LibXau,
-		},
-
-		ID: 1767,
-	})
-}
-
-func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) {
-	const (
-		version  = "0.4.1"
-		checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4"
-	)
-	return t.NewPackage("libxcb-util-keysyms", version, newTar(
-		"https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		PkgConfig,
-
-		XCB,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxcbUtilKeysyms, &Metadata{
-		Name:        "libxcb-util-keysyms",
-		Description: "standard X key constants and conversion to/from keycodes",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5168,
-	})
-}
-
-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,
-
-		LibxcbUtil,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxcbUtilImage, &Metadata{
-		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) newLibxcbUtilWM() (pkg.Artifact, string) {
-	const (
-		version  = "0.4.2"
-		checksum = "g0VZgMU9hcIgyXb3XxBR9xqsvUMBd9qt_Dbmwoj2h5y24pODr_S_D0DhRsuXUNjF"
-	)
-	return t.NewPackage("libxcb-util-wm", version, newTar(
-		"https://xcb.freedesktop.org/dist/xcb-util-wm-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		M4,
-		PkgConfig,
-
-		XCB,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxcbUtilWM, &Metadata{
-		Name:        "libxcb-util-wm",
-		Description: "XCB client and window-manager helpers for ICCCM & EWMH",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5170,
-	})
-}
-
-func (t Toolchain) newLibxcbUtil() (pkg.Artifact, string) {
-	const (
-		version  = "0.4.1"
-		checksum = "YMXGQUQbF6PoEAGflvYnJYsLWjti6sL_ifY47wIXTNGVM3tQ8u41nkBYN4K1D5CD"
-	)
-	return t.NewPackage("libxcb-util", version, newTar(
-		"https://www.x.org/releases/individual/xcb/"+
-			"xcb-util-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		PkgConfig,
-
-		utilMacros,
-		XCB,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxcbUtil, &Metadata{
-		Name:        "libxcb-util",
-		Description: "XCB utility libraries",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-util",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5165,
-	})
-}
-
-func (t Toolchain) newLibxcbRenderUtil() (pkg.Artifact, string) {
-	const (
-		version  = "0.3.10"
-		checksum = "n08L8PyCoOd7v2vb6fSVq5Pq6JtteXVh9K2wrQMTNwGMf_Fjpi6i3HWF-TMFSVTI"
-	)
-	return t.NewPackage("libxcb-render-util", version, newTar(
-		"https://www.x.org/releases/individual/xcb/"+
-			"xcb-util-renderutil-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		PkgConfig,
-
-		utilMacros,
-		XCB,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxcbRenderUtil, &Metadata{
-		Name:        "libxcb-render-util",
-		Description: "XCB convenience functions for the Render extension",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 5169,
-	})
-}
-
-func (t Toolchain) newLibX11() (pkg.Artifact, string) {
-	const (
-		version  = "1.8.13"
-		checksum = "ARh-cuZY_U2v3DbPS1byc7ybh9NInZc-yav7SJiusk_C7408s058qWV83ocMd2pT"
-	)
-	return t.NewPackage("libX11", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libx11",
-		"libX11-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-
-		Configure: []KV{
-			{"enable-static"},
-			{"without-xmlto"},
-		},
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		Libxtrans,
-		XorgProto,
-		XCB,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibX11, &Metadata{
-		Name:        "libX11",
-		Description: `Core X11 protocol client library (aka "Xlib")`,
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libx11",
-
-		Dependencies: P{
-			XCB,
-		},
-
-		ID: 1764,
-	})
-}
-
-func (t Toolchain) newLibXext() (pkg.Artifact, string) {
-	const (
-		version  = "1.3.7"
-		checksum = "-0wvUDaucLPLNOrK1pcKhHNoO-5nUqQyyw6JAbhx65gRjuMiNKKaF2_tcrbC_KNq"
-	)
-	return t.NewPackage("libXext", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxext",
-		"libXext-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		LibX11,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXext, &Metadata{
-		Name:        "libXext",
-		Description: "Xlib-based library for common extensions to the X11 protocol",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxext",
-
-		Dependencies: P{
-			LibX11,
-		},
-
-		ID: 1774,
-	})
-}
-
-func (t Toolchain) newLibXfixes() (pkg.Artifact, string) {
-	const (
-		version  = "6.0.2"
-		checksum = "_-kJfKZ7cE3NNeMr6NLSXCmsyP7MVEHVPLNfxatz2qBy3_fZJvPMQwZNOC9y6V5L"
-	)
-	return t.NewPackage("libXfixes", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxfixes",
-		"libXfixes-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		XorgProto,
-		LibX11,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXfixes, &Metadata{
-		Name:        "libXfixes",
-		Description: "Xlib-based library for the XFIXES Extension",
-		Website:     "https://www.freedesktop.org/wiki/Software/FixesExt/",
-
-		Dependencies: P{
-			LibX11,
-		},
-
-		ID: 1775,
-	})
-}
-
-func (t Toolchain) newLibXrender() (pkg.Artifact, string) {
-	const (
-		version  = "0.9.12"
-		checksum = "s6nWn-r17X_W-7anaS7wIcq5_Levf9zAigwJDD9Klp-cCJTVDhLo7GufuVOrxVP0"
-	)
-	return t.NewPackage("libXrender", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxrender",
-		"libXrender-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		LibX11,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXrender, &Metadata{
-		Name:        "libXrender",
-		Description: "Xlib library for the Render Extension to the X11 protocol",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxrender",
-
-		Dependencies: P{
-			LibX11,
-		},
-
-		ID: 1789,
-	})
-}
-
-func (t Toolchain) newLibxshmfence() (pkg.Artifact, string) {
-	const (
-		version  = "1.3.3"
-		checksum = "JamExTPg81By2fs3vWdeo_dzlpBQeAwXr2sDXeHJqm9XBoLW5pamiD6FgAWtAKyA"
-	)
-	return t.NewPackage("libxshmfence", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxshmfence",
-		"libxshmfence-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		XorgProto,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxshmfence, &Metadata{
-		Name:        "libxshmfence",
-		Description: "shared memory 'SyncFence' synchronization primitive",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxshmfence",
-
-		ID: 1792,
-	})
-}
-
-func (t Toolchain) newLibXxf86vm() (pkg.Artifact, string) {
-	const (
-		version  = "1.1.7"
-		checksum = "mS4cgKWrwz6M1Lb6Qu4ZVh8Xn2Ca_4HXPxr3LDad4iYY1LecZfeLUPW1hkp6amX_"
-	)
-	return t.NewPackage("libXxf86vm", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxxf86vm",
-		"libXxf86vm-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		LibXext,
-		XorgProto,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXxf86vm, &Metadata{
-		Name:        "libXxf86vm",
-		Description: "Xlib-based library for the XFree86-VidMode X extension",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm",
-
-		Dependencies: P{
-			LibXext,
-		},
-
-		ID: 1799,
-	})
-}
-
-func (t Toolchain) newLibXrandr() (pkg.Artifact, string) {
-	const (
-		version  = "1.5.5"
-		checksum = "OF7C7VC5MwnFue9UX5UnIkG1PIWvn9bBMq6d4mVyJJ_rcF0w4Kedn1lfxBsXEKAP"
-	)
-	return t.NewPackage("libXrandr", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxrandr",
-		"libXrandr-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		LibXext,
-		LibXrender,
-		XorgProto,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXrandr, &Metadata{
-		Name:        "libXrandr",
-		Description: "Xlib Resize, Rotate and Reflection (RandR) extension library",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxrandr",
-
-		Dependencies: P{
-			LibXext,
-			LibXrender,
-		},
-
-		ID: 1788,
-	})
-}
-
-func (t Toolchain) newFontUtil() (pkg.Artifact, string) {
-	const (
-		version  = "1.4.2"
-		checksum = "YWiaIxkq-N2yNdbGa_RF1S0UkQq6xsgoRT73WZP2DOmyH_CJ0TAkpQjId657MQmh"
-	)
-	return t.NewPackage("font-util", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/font/util",
-		"font-util-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newFontUtil, &Metadata{
-		Name:        "font-util",
-		Description: "X.Org font package creation/installation utilities",
-		Website:     "https://gitlab.freedesktop.org/xorg/font/util",
-
-		ID: 15055,
-	})
-}
-
-func (t Toolchain) newLibfontenc() (pkg.Artifact, string) {
-	const (
-		version  = "1.1.9"
-		checksum = "XqosXfbVwaoYzG9vVyRCl3eatwjASoJdLZsxQ37NN8S_jTyqNmbxpRSJGImJj7RS"
-	)
-	return t.NewPackage("libfontenc", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libfontenc",
-		"libfontenc-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		FontUtil,
-		XorgProto,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibfontenc, &Metadata{
-		Name:        "libfontenc",
-		Description: "X font encoding library",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libfontenc",
-
-		ID: 1613,
-	})
-}
-
-func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
-	const (
-		version  = "1.2.0"
-		checksum = "WUtph1ab0AyATahlwljchBxZJcpjYrjyhCK9DW2VO0uXEXaN22GWmUaibcA83i_B"
-	)
-	return t.NewPackage("libxkbfile", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxkbfile",
-		"libxkbfile-"+version,
-		checksum,
-	), nil, (*MesonHelper)(nil),
-		LibX11,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxkbfile, &Metadata{
-		Name:        "libxkbfile",
-		Description: "XKB file handling routines",
-		Website:     "http://www.x.org/wiki/XKB",
-
-		Dependencies: P{
-			LibX11,
-		},
-
-		ID: 1781,
-	})
-}
-
-func (t Toolchain) newXkbcomp() (pkg.Artifact, string) {
-	const (
-		version  = "1.5.0"
-		checksum = "ttICW8ZPbljI-nw2kknvxFhwFoDK40iAMBeZDLAHYsHf3B6UPO_zc9TpzZYRRyZH"
-	)
-	return t.NewPackage("xkbcomp", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/app/xkbcomp",
-		"xkbcomp-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-		Bison,
-
-		utilMacros,
-		Libxkbfile,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newXkbcomp, &Metadata{
-		Name:        "xkbcomp",
-		Description: "XKB keyboard description compiler",
-		Website:     "http://www.x.org/wiki/XKB",
-
-		Dependencies: P{
-			Libxkbfile,
-		},
-
-		ID: 15018,
-	})
-}
-
-func (t Toolchain) newLibXfont2() (pkg.Artifact, string) {
-	const (
-		version  = "2.0.7"
-		checksum = "jv9BZNA02493KB8j1lfAErF5SA3ZFcAhm3_UVJ--Bp1maz-vNprl_wXpkHApBi9M"
-	)
-	return t.NewPackage("libXfont2", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxfont",
-		"libXfont2-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		Freetype,
-		XorgProto,
-		Libxtrans,
-		Libfontenc,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXfont2, &Metadata{
-		Name:        "libXfont2",
-		Description: "X font handling library for server & utilities",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxfont",
-
-		Dependencies: P{
-			Freetype,
-			Libfontenc,
-		},
-
-		ID: 17165,
-	})
-}
-
-func (t Toolchain) newLibxcvt() (pkg.Artifact, string) {
-	const (
-		version  = "0.1.3"
-		checksum = "IfIA7SxlHMWh681e1AgYmZcRAfkZd5LlzmqcMRifNY5nNVRrUx_wnoaidAv0Yu03"
-	)
-	return t.NewPackage("libxcvt", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxcvt",
-		"libxcvt-"+version,
-		checksum,
-	), nil, (*MesonHelper)(nil)), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibxcvt, &Metadata{
-		Name:        "libxcvt",
-		Description: "VESA CVT standard timing modeline generation library & utility",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcvt",
-
-		ID: 235147,
-	})
-}
-
-func (t Toolchain) newLibXdmcp() (pkg.Artifact, string) {
-	const (
-		version  = "1.1.5"
-		checksum = "N6AJSv9pmeBedFn8KuSIOUGvTken4rkypNWVE2KfPlliwkfIbhfXrt5YHZkBMUHp"
-	)
-	return t.NewPackage("libXdmcp", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libxdmcp",
-		"libXdmcp-"+version,
-		checksum,
-	), nil, &MakeHelper{
-		Generate: "NOCONFIGURE=1 ./autogen.sh",
-	},
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
-		XorgProto,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibXdmcp, &Metadata{
-		Name:        "libXdmcp",
-		Description: "X Display Manager Control Protocol library",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxdmcp",
-
-		ID: 1772,
-	})
-}
-
-func (t Toolchain) newXkeyboardConfig() (pkg.Artifact, string) {
-	const (
-		version  = "2.47"
-		checksum = "E03PsPIaRrxPAuKgDGSQyPiJB49wXtyyvdV0lVx3_G-pelMMlaFLkoTDHTHG_qgA"
-	)
-	return t.NewPackage("xkeyboard-config", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xkeyboard-config/xkeyboard-config",
-		"xkeyboard-config-"+version,
-		checksum,
-	), nil, (*MesonHelper)(nil),
-		Perl,
-	), version
-}
-func init() {
-	native.mustRegister(Toolchain.newXkeyboardConfig, &Metadata{
-		Name:        "xkeyboard-config",
-		Description: "the non-arch keyboard configuration database for X Window",
-		Website:     "https://www.freedesktop.org/wiki/Software/XKeyboardConfig/",
-
-		ID: 5191,
-	})
-}
-
-func (t Toolchain) newLibpciaccess() (pkg.Artifact, string) {
-	const (
-		version  = "0.19"
-		checksum = "84H0c_U_7fMqo81bpuwyXGXtk4XvvFH_YK00UiOriv3YGsuAhmbo2IkFhmJnvu2x"
-	)
-	return t.NewPackage("libpciaccess", version, newFromGitLab(
-		"gitlab.freedesktop.org",
-		"xorg/lib/libpciaccess",
-		"libpciaccess-"+version,
-		checksum,
-	), nil, &MesonHelper{
-		Setup: []KV{
-			{"Dzlib", "enabled"},
-		},
-	}), version
-}
-func init() {
-	native.mustRegister(Toolchain.newLibpciaccess, &Metadata{
-		Name:        "libpciaccess",
-		Description: "generic PCI access library",
-		Website:     "https://gitlab.freedesktop.org/xorg/lib/libpciaccess",
-
-		Dependencies: P{
-			Zlib,
-		},
-
-		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() {
-	native.mustRegister(Toolchain.newXserver, &Metadata{
-		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,
-	})
-}