mirror of
https://github.com/nestriness/nestri.git
synced 2026-09-27 04:52:25 +03:00
feat: media bitrate control, HDR (#346)
Fixes: #335 Still a work-in-progress. --------- Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Wanjohi <elviswanjohi47@gmail.com>
This commit is contained in:
Kristian Ollikainen
co-authored by
DatCaptainHorse
Claude Opus 5
Wanjohi
DatCaptainHorse
Claude Opus 5
Wanjohi
parent
1c721962f4
commit
0811f57f1a
+38
-28
@@ -13,9 +13,9 @@
|
||||
# this image is plain Arch rather than a distribution chosen for its init.
|
||||
# ref(d-0064)
|
||||
#
|
||||
# Proton is here, and it is not a closed component: it is proton-cachyos built
|
||||
# from source with --enable-wow64, which is what removes the need for a whole
|
||||
# 32-bit host stack. Valve's steamclient.so is a different thing and is NOT
|
||||
# Proton is here, and it is not a closed component: it is proton-ge built
|
||||
# from source wow64-only, which is what removes the need for a whole 32-bit
|
||||
# host stack. Valve's steamclient.so is a different thing and is NOT
|
||||
# here — that one is closed, and nestri/CLAUDE.md is explicit that nothing
|
||||
# closed enters this repo. Whatever layers it on top of runtime_prod is a
|
||||
# closed build outside this repo — see build/README.md.
|
||||
@@ -31,8 +31,7 @@
|
||||
# scoped to one stage instead, `FROM ${PROTON_IMAGE}` expands to nothing, and
|
||||
# the build fails with "no FROM statement found" — which says nothing about
|
||||
# the actual mistake. See the Proton stage below for what this is.
|
||||
ARG PROTON_IMAGE=ghcr.io/nestrilabs/proton-cachyos-native-wow64:11.0-20260703
|
||||
|
||||
ARG PROTON_IMAGE=ghcr.io/nestrilabs/proton-ge:11-7
|
||||
|
||||
# ───────────────────────────────────────────────────────────
|
||||
# initial / builder
|
||||
@@ -72,18 +71,14 @@ ENV ARTIFACTS=/artifacts
|
||||
# ───────────────────────────────────────────────────────────
|
||||
FROM builder AS mesa-build
|
||||
|
||||
ARG MESA_GIT=https://gitlab.freedesktop.org/mesa/mesa.git
|
||||
ARG MESA_COMMIT=8ace865d958b0f17254afc427db21b0ad1747b4b
|
||||
ARG MESA_GIT=https://gitlab.freedesktop.org/nowrep/mesa.git
|
||||
ARG MESA_COMMIT=1af89bea491deabc4741700f8df4d41edfd22f7a
|
||||
ARG JOBS=
|
||||
|
||||
# Our patches to the amdgpu native-context path, applied on top of the pinned
|
||||
# commit. They are not cosmetic: upstream's winsys re-queries device-static
|
||||
# facts on a path that costs a synchronous round trip to the host under
|
||||
# virtio, and it was most of a frame's time. See each patch's own message.
|
||||
#
|
||||
# `git apply` and not `git am`: no committer identity is needed, and a patch
|
||||
# that no longer applies stops the build here rather than producing an image
|
||||
# that is quietly unpatched and slow.
|
||||
COPY build/patches/mesa /build/patches/mesa
|
||||
|
||||
RUN test -n "$JOBS" || JOBS=$(nproc) && \
|
||||
@@ -173,14 +168,13 @@ RUN --mount=type=cache,target=/root/.cargo/registry \
|
||||
# `FROM scratch` over the tree, so its root *is* the tree and there is nothing
|
||||
# in it to run — only something to copy from.
|
||||
#
|
||||
# Built with `--enable-wow64`, which is the whole reason it is a build of ours
|
||||
# rather than the distribution's package. wow64 runs 32-bit Windows code
|
||||
# inside a 64-bit unix process, so a box needs no lib32 anything: no 32-bit
|
||||
# glibc, no second Mesa for i686, and — the one that matters most here — no
|
||||
# Built wow64-only, which is the whole reason it is a build of ours rather
|
||||
# than a released one. wow64 runs 32-bit Windows code inside a 64-bit unix
|
||||
# process, so a box needs no lib32 anything: no 32-bit glibc, no second Mesa
|
||||
# for i686, and — the one that matters most here — no
|
||||
# second capture layer, because the game is a 64-bit process and loads the
|
||||
# 64-bit Vulkan loader the existing layer already sits in. The distribution's
|
||||
# package is built without the flag, which is exactly why it depends on
|
||||
# lib32-*.
|
||||
# 64-bit Vulkan loader the existing layer already sits in. The released builds
|
||||
# carry a 32-bit unix side, which is exactly why they need lib32-*.
|
||||
#
|
||||
# Override to build it yourself; the tag is a version and moves deliberately.
|
||||
# ───────────────────────────────────────────────────────────
|
||||
@@ -269,7 +263,7 @@ RUN pacman -Syu --noconfirm --needed \
|
||||
libglvnd libdrm libepoxy libxxf86vm libinput wayland \
|
||||
expat zlib llvm-libs lm_sensors elfutils libva shaderc vulkan-icd-loader \
|
||||
pixman libxkbcommon xcb-util-keysyms xorg-xwayland \
|
||||
pipewire pipewire-audio wireplumber opus \
|
||||
pipewire pipewire-audio pipewire-pulse libpulse wireplumber opus \
|
||||
python libunwind \
|
||||
&& rm -f /usr/share/libalpm/hooks/dbus-reload.hook \
|
||||
&& pacman -Rdd --noconfirm systemd systemd-sysvcompat \
|
||||
@@ -281,6 +275,15 @@ RUN pacman -Syu --noconfirm --needed \
|
||||
# after the prefix had already been created -- so the session got past every
|
||||
# check that Proton was present and usable.
|
||||
#
|
||||
# `pipewire-pulse` and `libpulse` are Wine's audio. Its driver speaks only the
|
||||
# PulseAudio protocol, so without the translation layer a game starts, renders
|
||||
# and plays silently, with nothing failing to say why. `libpulse` is what that
|
||||
# driver, `winepulse.so`, links, and it would arrive as a dependency of
|
||||
# pipewire-pulse anyway. It is named because the dependency is Wine's and not
|
||||
# pipewire-pulse's, and a library that only arrives as somebody else's
|
||||
# dependency goes away when they do. The check below covers `winepulse.so`, so a
|
||||
# missing library fails the build rather than the session.
|
||||
|
||||
# `python` is not a build dependency here -- the builder stage has its own for
|
||||
# Mesa -- it is a *runtime* one. The compatibility tool's entry point is a
|
||||
# Python script, so a box without an interpreter starts a game and the launch
|
||||
@@ -368,7 +371,7 @@ COPY --from=mesa-build /artifacts/mesa /
|
||||
COPY --from=nestri-build /artifacts/nestri /
|
||||
|
||||
# The Proton tree, whose image root is the tree, so this lands it at
|
||||
# /usr/share/steam/compatibilitytools.d/proton-cachyos.
|
||||
# /usr/share/steam/compatibilitytools.d/proton-ge.
|
||||
#
|
||||
# Deliberately not in the strip manifest above: that list is our own build
|
||||
# output, and the two stripping decisions are not the same one. Proton ships
|
||||
@@ -470,11 +473,17 @@ RUN for intruder in /usr/lib/systemd/systemd /sbin/openrc-init /usr/bin/openrc-i
|
||||
# directory. Forty files, every one a false positive, hiding the one real
|
||||
# entry.
|
||||
#
|
||||
# So: the programs in `bin/`, which are ordinary ELF and resolve normally, and
|
||||
# So: the programs in `bin/`, which are ordinary ELF and resolve normally,
|
||||
# `ntdll.so`, which is the first thing Wine loads and the one that linked the
|
||||
# missing library. That is exactly the failure that got through, with none of
|
||||
# the noise. The Windows-side DLLs beside them are not ELF and `ldd` skips them
|
||||
# anyway.
|
||||
# missing library, and `winepulse.so`, which is audio. That is exactly the
|
||||
# failure that got through, with none of the noise. The Windows-side DLLs beside
|
||||
# them are not ELF and `ldd` skips them anyway.
|
||||
#
|
||||
# Each file is resolved with its own directory on the library path. That is
|
||||
# where Wine's loader finds the siblings a unix object links by soname, so
|
||||
# `winepulse.so` naming `ntdll.so` resolves the way it does at run time, and
|
||||
# what is left is a library the image really lacks. For every other file in
|
||||
# the list it changes nothing.
|
||||
# The output is one file per line with its own missing libraries under it, and
|
||||
# then every missing library once at the end. That last list is what somebody
|
||||
# acts on -- it is the set of packages to add -- and forty files each naming the
|
||||
@@ -486,13 +495,14 @@ RUN failed=0; \
|
||||
: > /tmp/missing-libs; \
|
||||
for f in /usr/bin/nesinit /usr/bin/nescope /usr/bin/neshub /usr/bin/neswire \
|
||||
/usr/lib/libnescapture_layer.so \
|
||||
/usr/bin/dbus-daemon /usr/bin/pipewire /usr/bin/wireplumber /usr/bin/ip \
|
||||
/usr/bin/dbus-daemon /usr/bin/pipewire /usr/bin/pipewire-pulse \
|
||||
/usr/bin/wireplumber /usr/bin/ip \
|
||||
/usr/lib/libgallium-*.so /usr/lib/libEGL_mesa.so.0 \
|
||||
/usr/lib/libvulkan_*.so /usr/lib/dri/*.so /usr/lib/gbm/*.so \
|
||||
/usr/share/steam/compatibilitytools.d/proton-cachyos/files/bin/* \
|
||||
/usr/share/steam/compatibilitytools.d/proton-cachyos/files/lib*/wine/*-unix/ntdll.so; do \
|
||||
[ -e "$f" ] || continue; \
|
||||
libs="$(ldd "$f" 2>/dev/null | awk '/not found/ { print $1 }')"; \
|
||||
libs="$(LD_LIBRARY_PATH="${f%/*}" ldd "$f" 2>/dev/null | awk '/not found/ { print $1 }')"; \
|
||||
[ -n "$libs" ] || continue; \
|
||||
failed=1; \
|
||||
printf ' %s\n' "$f" >&2; \
|
||||
@@ -507,8 +517,8 @@ RUN failed=0; \
|
||||
fi
|
||||
|
||||
RUN for required in /usr/bin/nesinit /usr/bin/nescope /usr/bin/neshub /usr/bin/neswire \
|
||||
/usr/bin/dbus-daemon /usr/bin/pipewire /usr/bin/wireplumber /usr/bin/ip \
|
||||
/usr/bin/python3 \
|
||||
/usr/bin/dbus-daemon /usr/bin/pipewire /usr/bin/pipewire-pulse \
|
||||
/usr/bin/wireplumber /usr/bin/ip /usr/bin/python3 \
|
||||
/usr/share/steam/compatibilitytools.d/proton-cachyos/proton; do \
|
||||
test -x "$required" || { echo "the image is missing $required" >&2; exit 1; }; \
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user