20241122

build.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
 source envs.sh
 set -euo pipefail
+cp -a ./*  /var/tmp/catalyst/
 cd /var/tmp/catalyst/
-git init
-git remote add origin https://github.com/WhatAmISupposedToPutHere/fex-rootfs
-git fetch -a origin
-git checkout "${GIT_SHA}"
 mkdir -p builds/23.0-default
 if [[ "x${DOWNLOAD_SEED-}" != x ]]; then
     name="stage3-amd64-systemd-${TIMESTAMP_L}.tar.xz"

config/stages/package.accept_keywords/stage4f

@@ -0,0 +1 @@
+stage13

config/stages/package.accept_keywords/stage4l

@@ -0,0 +1 @@
+stage13

config/stages/package.mask/stage4f

@@ -0,0 +1 @@
+stage13

config/stages/package.mask/stage4l

@@ -0,0 +1 @@
+stage13

config/stages/package.use/stage4/fex-root → config/stages/package.use/stage4f/fex-root

@@ -1 +1 @@
-*/* pulseaudio wayland unwind gles2 vaapi vdpau llvm_targets_SPIRV
+*/* pulseaudio wayland unwind gles2 vaapi vdpau llvm_targets_SPIRV harfbuzz

config/stages/package.use/stage4l/circular

@@ -0,0 +1,6 @@
+# this makes only a difference for the "desktop" stages
+dev-db/sqlite -icu
+dev-lang/python -bluetooth
+
+# this is also needed for normal stage3
+net-misc/curl -http2 -http3 -quic -curl_quic_openssl

config/stages/package.use/stage4l/fex-root

@@ -0,0 +1 @@
+*/* pulseaudio wayland unwind gles2 vaapi vdpau llvm_targets_SPIRV -harfbuzz

config/stages/package.use/stage4l/gmp

@@ -0,0 +1,2 @@
+# testing this for bug 894134
+dev-libs/gmp asm cpudetection

config/stages/package.use/stage4l/libpcre

@@ -0,0 +1,5 @@
+# required by sys-libs/libselinux-2.7
+dev-libs/libpcre static-libs
+
+# required by dev-vcs/git
+dev-libs/libpcre2 jit

config/stages/package.use/stage4l/multilib

@@ -0,0 +1 @@
+*/* abi_x86_32 abi_x86_64

config/stages/package.use/stage4l/no-filecaps

@@ -0,0 +1,7 @@
+# For stage building, we cannot be sure the final unpack destination will have
+# xattr/fcaps support.  To be safe, we build stages without filecaps, but allow
+# filecaps to be turned back on @ next full world upgrade.  The ebuilds using
+# fcaps eclass will have more logic to safely fall back in case of missing
+# support.
+
+*/* -filecaps

config/stages/package.use/stage4l/openmp

@@ -0,0 +1,6 @@
+
+# compilers from stage1 do not have openmp capability, so turn this off
+# here to avoid failures in stage3
+app-crypt/libb2 -openmp
+app-portage/portage-utils -openmp
+sys-devel/gettext -openmp

config/stages/profile/package.use.force/stage4f

@@ -0,0 +1 @@
+stage13

config/stages/profile/package.use.force/stage4l

@@ -0,0 +1 @@
+stage13

envs.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-export TIMESTAMP_L=20241110T170333Z
-export TIMESTAMP_S=20241116
+export TIMESTAMP_L=20241117T163407Z
+export TIMESTAMP_S=20241122
 export RELEASE=${TIMESTAMP_S}

overlay/metadata/layout.conf

@@ -0,0 +1,4 @@
+masters = gentoo
+auto-sync = false
+thin-manifests = true
+sign-manifests = false

overlay/profiles/repo_name

@@ -0,0 +1 @@
+local

overlay/x11-libs/libxshmfence/Manifest

@@ -0,0 +1 @@
+DIST libxshmfence-1.3.2.tar.xz 259024 BLAKE2B 2f0ef0767fbb29349acf43b4cb4d7177956c06c389f0443db06e398c4e0f3b424432ce6fe8946d70fdd59b9446c53bf2f1ee126df4d41b3065f1e94438facecf SHA512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c

overlay/x11-libs/libxshmfence/files/libxshmfence-1.3.2-memfd-envvar.patch

@@ -0,0 +1,53 @@
+From 3aaf46a2742d1698f3a4399b2bb2f855c0b904fe Mon Sep 17 00:00:00 2001
+From: Asahi Lina <[email protected]>
+Date: Tue, 22 Oct 2024 22:28:19 +0900
+Subject: [PATCH] alloc: Allow disabling memfd usage at runtime with
+ XSHMFENCE_NO_MEMFD=1
+
+For thin VMs used for compatibility reasons, it is desirable to directly
+proxy the X11 protocol between an application running in a VM and an X
+server running on the host. We can proxy futex wakeups with some watcher
+code, but we need the futex memory itself to be shared. This works when
+/dev/shm is mounted with virtiofs with DAX, but cannot work for memfds.
+
+Add a XSHMFENCE_NO_MEMFD environment variable that, when set, disables
+the memfd codepath and falls back to /dev/shm.
+
+Signed-off-by: Asahi Lina <[email protected]>
+Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/merge_requests/9>
+---
+ src/xshmfence_alloc.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/xshmfence_alloc.c b/src/xshmfence_alloc.c
+index 932adb9..77f968c 100644
+--- a/src/xshmfence_alloc.c
++++ b/src/xshmfence_alloc.c
+@@ -69,13 +69,22 @@ int
+ xshmfence_alloc_shm(void)
+ {
+ 	char	template[] = SHMDIR "/shmfd-XXXXXX";
+-	int	fd;
++	int	fd = -1;
+ #ifndef HAVE_MKOSTEMP
+ 	int	flags;
+ #endif
+
+ #if HAVE_MEMFD_CREATE
+-	fd = memfd_create("xshmfence", MFD_CLOEXEC|MFD_ALLOW_SEALING);
++	static int disable_memfd = -1;
++
++	if (disable_memfd == -1) {
++		const char *val = getenv("XSHMFENCE_NO_MEMFD");
++		disable_memfd = val ? !!atoi(val) : 0;
++	}
++
++	if (disable_memfd <= 0)
++		fd = memfd_create("xshmfence", MFD_CLOEXEC|MFD_ALLOW_SEALING);
++
+ 	if (fd < 0)
+ #endif
+ #ifdef SHM_ANON
+-- 
+GitLab
+

overlay/x11-libs/libxshmfence/libxshmfence-1.3.2-r1.ebuild

@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Shared memory fences using futexes"
+
+KEYWORDS="amd64"
+
+DEPEND="x11-base/xorg-proto"
+
+PATCHES="
+	${FILESDIR}/${P}-memfd-envvar.patch
+"

overlay/x11-libs/libxshmfence/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/lib/libxshmfence</remote-id>
+  </upstream>
+</pkgmetadata>

stage1-systemd-23.spec

@@ -6,7 +6,7 @@ profile: default/linux/amd64/23.0/systemd
 snapshot_treeish: @[email protected]
 source_subpath: 23.0-default/stage3-amd64-systemd-@TIMESTAMP@
 compression_mode: tar
-update_seed: yes
+update_seed: no
 update_seed_command: --update --newuse -1 jinja2
 portage_confdir: /var/tmp/catalyst/config/stages
 portage_prefix: stage13

stage4-fex.spec

@@ -7,18 +7,18 @@ snapshot_treeish: @[email protected]
 source_subpath: 23.0-default/stage4-amd64-clang
 compression_mode: tar
 portage_confdir: /var/tmp/catalyst/config/stages
-portage_prefix: stage4
+repos: /var/tmp/catalyst/overlay
+portage_prefix: stage4f
 binrepo_path: amd64/binpackages/23.0/x86-64
 stage4/fsscript: fsscript.sh
 stage4/packages: --with-bdeps=y --deep sys-fs/fuse:0 sys-fs/fuse:3 x11-libs/gtk+:2 x11-libs/gtk+:3
 	app-emulation/wine-vanilla
 	dev-libs/nspr
 	dev-libs/nss
+	dev-libs/opencl-icd-loader
 	dev-libs/protobuf
 	dev-libs/protobuf-c
 	dev-python/pyyaml
-	dev-util/bindgen
-	dev-util/clinfo
 	dev-util/vulkan-tools
 	media-libs/glew
 	media-libs/glu
@@ -31,9 +31,9 @@ stage4/packages: --with-bdeps=y --deep sys-fs/fuse:0 sys-fs/fuse:3 x11-libs/gtk+
 	media-libs/sdl2-image
 	media-libs/sdl2-mixer
 	media-libs/sdl2-net
+	media-libs/sdl2-ttf
 	media-libs/speex
 	sys-apps/pciutils
-	sys-apps/usbutils
 	sys-auth/libnss-nis
 	x11-apps/mesa-progs
 	x11-libs/xcb-util-cursor

stage4-llvm.spec

@@ -7,6 +7,6 @@ snapshot_treeish: @[email protected]
 source_subpath: 23.0-default/stage3-amd64-systemd
 compression_mode: tar
 portage_confdir: /var/tmp/catalyst/config/stages
-portage_prefix: stage4
+portage_prefix: stage4l
 binrepo_path: amd64/binpackages/23.0/x86-64
-stage4/packages: --with-bdeps=y sys-devel/clang
+stage4/packages: --with-bdeps=y sys-devel/clang freetype harfbuzz