From 5126a8b6795b4cc2e6827e495a21c2874e50bd52 Mon Sep 17 00:00:00 2001 From: sergio Date: Sat, 27 Jun 2026 00:33:22 -0400 Subject: [PATCH] =?UTF-8?q?Etapa=20G:=20devuelve=20el=20stack=20gr=C3=A1fi?= =?UTF-8?q?co=20Mesa=20a=20recipes/incoming/=20(es=20de=20otro=20agente,?= =?UTF-8?q?=20tawasuyu)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revierte el parqueo de 370e7b7: mesa/wayland/wayland-protocols/libdrm/seatd/samurai/meson + patches son trabajo en curso de otro agente para el escritorio tawasuyu (commit 00339b6), no cruft. samurai queda en su versión desarrollada (clon C de ninja, zig 0.13.0). syncthing sigue diferido (es de go-12, build especial). --- .../incoming}/23575.patch | 0 .../incoming}/armv7-exynos4.patch | 0 .../incoming}/fix-ninja-output-test.patch | 0 .../incoming}/libdrm.toml | 0 .../incoming}/llvm22-armhf.patch | 0 .../hold-nongo => recipes/incoming}/mesa.toml | 0 .../incoming}/meson.toml | 0 .../incoming}/riscv64-tls.patch | 0 recipes/{ => incoming}/samurai.toml | 0 .../incoming}/seatd.toml | 0 .../incoming}/skip-broken-tests.patch | 0 .../incoming}/wayland-protocols.toml | 0 .../incoming}/wayland.toml | 0 tandas/hold-nongo/samurai.toml | 34 ------------------- 14 files changed, 34 deletions(-) rename {tandas/hold-nongo => recipes/incoming}/23575.patch (100%) rename {tandas/hold-nongo => recipes/incoming}/armv7-exynos4.patch (100%) rename {tandas/hold-nongo => recipes/incoming}/fix-ninja-output-test.patch (100%) rename {tandas/hold-nongo => recipes/incoming}/libdrm.toml (100%) rename {tandas/hold-nongo => recipes/incoming}/llvm22-armhf.patch (100%) rename {tandas/hold-nongo => recipes/incoming}/mesa.toml (100%) rename {tandas/hold-nongo => recipes/incoming}/meson.toml (100%) rename {tandas/hold-nongo => recipes/incoming}/riscv64-tls.patch (100%) rename recipes/{ => incoming}/samurai.toml (100%) rename {tandas/hold-nongo => recipes/incoming}/seatd.toml (100%) rename {tandas/hold-nongo => recipes/incoming}/skip-broken-tests.patch (100%) rename {tandas/hold-nongo => recipes/incoming}/wayland-protocols.toml (100%) rename {tandas/hold-nongo => recipes/incoming}/wayland.toml (100%) delete mode 100644 tandas/hold-nongo/samurai.toml diff --git a/tandas/hold-nongo/23575.patch b/recipes/incoming/23575.patch similarity index 100% rename from tandas/hold-nongo/23575.patch rename to recipes/incoming/23575.patch diff --git a/tandas/hold-nongo/armv7-exynos4.patch b/recipes/incoming/armv7-exynos4.patch similarity index 100% rename from tandas/hold-nongo/armv7-exynos4.patch rename to recipes/incoming/armv7-exynos4.patch diff --git a/tandas/hold-nongo/fix-ninja-output-test.patch b/recipes/incoming/fix-ninja-output-test.patch similarity index 100% rename from tandas/hold-nongo/fix-ninja-output-test.patch rename to recipes/incoming/fix-ninja-output-test.patch diff --git a/tandas/hold-nongo/libdrm.toml b/recipes/incoming/libdrm.toml similarity index 100% rename from tandas/hold-nongo/libdrm.toml rename to recipes/incoming/libdrm.toml diff --git a/tandas/hold-nongo/llvm22-armhf.patch b/recipes/incoming/llvm22-armhf.patch similarity index 100% rename from tandas/hold-nongo/llvm22-armhf.patch rename to recipes/incoming/llvm22-armhf.patch diff --git a/tandas/hold-nongo/mesa.toml b/recipes/incoming/mesa.toml similarity index 100% rename from tandas/hold-nongo/mesa.toml rename to recipes/incoming/mesa.toml diff --git a/tandas/hold-nongo/meson.toml b/recipes/incoming/meson.toml similarity index 100% rename from tandas/hold-nongo/meson.toml rename to recipes/incoming/meson.toml diff --git a/tandas/hold-nongo/riscv64-tls.patch b/recipes/incoming/riscv64-tls.patch similarity index 100% rename from tandas/hold-nongo/riscv64-tls.patch rename to recipes/incoming/riscv64-tls.patch diff --git a/recipes/samurai.toml b/recipes/incoming/samurai.toml similarity index 100% rename from recipes/samurai.toml rename to recipes/incoming/samurai.toml diff --git a/tandas/hold-nongo/seatd.toml b/recipes/incoming/seatd.toml similarity index 100% rename from tandas/hold-nongo/seatd.toml rename to recipes/incoming/seatd.toml diff --git a/tandas/hold-nongo/skip-broken-tests.patch b/recipes/incoming/skip-broken-tests.patch similarity index 100% rename from tandas/hold-nongo/skip-broken-tests.patch rename to recipes/incoming/skip-broken-tests.patch diff --git a/tandas/hold-nongo/wayland-protocols.toml b/recipes/incoming/wayland-protocols.toml similarity index 100% rename from tandas/hold-nongo/wayland-protocols.toml rename to recipes/incoming/wayland-protocols.toml diff --git a/tandas/hold-nongo/wayland.toml b/recipes/incoming/wayland.toml similarity index 100% rename from tandas/hold-nongo/wayland.toml rename to recipes/incoming/wayland.toml diff --git a/tandas/hold-nongo/samurai.toml b/tandas/hold-nongo/samurai.toml deleted file mode 100644 index 59e05eb0..00000000 --- a/tandas/hold-nongo/samurai.toml +++ /dev/null @@ -1,34 +0,0 @@ -# Importada de Alpine aports por `hammer import-alpine` (Etapa G). PUNTO DE PARTIDA — pero -# YA trae los parches de musl de Alpine (lo que un import de nix pierde). Pendiente: el -# sha256 del tarball (el wrapper lo calcula), y adaptar build/install del shell de abuild. -name = "samurai" -version = "1.3" - -[source] -tarball = "https://github.com/michaelforney/samurai/releases/download/1.3/samurai-1.3.tar.gz" -# FIXME sha256: el wrapper lo calcula (Alpine publica sha512). sha512 de Alpine: -# sha512 = "f155745fdb90cca07d8e7178e60337173fee3a8f1dadc3773a80fe189f5864229afb409d946fb2a418820d7e6ef8332cd9e3e3627abd170146802277f30b4b4e" -sha256 = "1bc020a9e133432df51911ac71cc34322f828934d9a2282ba2916d88c15976af" - -[build] -compiler = "zig-cc" -target = "x86_64-linux-musl" -link = "static" -flags = [] - -[build.phases] -# de build() de Alpine (traducido; el lab provee $CBUILD/$CHOST — Etapa G Fase 3; revisá --shared para estático): -compile = ''' -_abuild_phase() { -make CFLAGS="${CFLAGS//-Os/-O2}" -} -_abuild_phase -''' -# de package() de Alpine (traducido $pkgdir→/out): -install = ''' -_abuild_phase() { -make install PREFIX="/usr" DESTDIR="/out" - ln -s samu "/out"/usr/bin/ninja -} -_abuild_phase -'''