Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e71e05f341 | ||
|
|
e6f9e5b7a0 | ||
|
|
5f598b22af | ||
|
|
7faf4d9bff | ||
|
|
74af43e4f8 | ||
|
|
eceed38bd6 | ||
|
|
d31b44b2a5 |
@@ -5,13 +5,26 @@ FROM $BASE_BUILDER
|
|||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
git \
|
git \
|
||||||
|
libwayland-dev \
|
||||||
|
libxkbcommon-dev \
|
||||||
lsb-release \
|
lsb-release \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
|
wayland-protocols \
|
||||||
|
weston \
|
||||||
xvfb
|
xvfb
|
||||||
|
|
||||||
ENV PATH="/root/.local/bin:${PATH}"
|
ENV PATH="/root/.local/bin:${PATH}"
|
||||||
|
|
||||||
|
# Headless Wayland test setup: a pre-created, correctly-permissioned XDG_RUNTIME_DIR (required
|
||||||
|
# by Wayland clients/compositors) plus a weston-run wrapper mirroring xvfb-run's ergonomics -
|
||||||
|
# starts Weston's headless backend, runs the given command against it, then tears it down.
|
||||||
|
RUN mkdir -p -m 700 /tmp/xdg-runtime
|
||||||
|
ENV XDG_RUNTIME_DIR=/tmp/xdg-runtime
|
||||||
|
|
||||||
|
COPY weston-run /usr/local/bin/weston-run
|
||||||
|
RUN chmod +x /usr/local/bin/weston-run
|
||||||
|
|
||||||
# Install LLVM 22 and symlink tools
|
# Install LLVM 22 and symlink tools
|
||||||
RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
|
RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
|
||||||
&& chmod +x /tmp/llvm.sh \
|
&& chmod +x /tmp/llvm.sh \
|
||||||
@@ -31,14 +44,14 @@ RUN VERSION=1.3.0; \
|
|||||||
RUN pipx install conan \
|
RUN pipx install conan \
|
||||||
&& pipx install gcovr
|
&& pipx install gcovr
|
||||||
|
|
||||||
# Install Vulkan SDK 1.4.341.0
|
# Install Vulkan SDK 1.4.350.0
|
||||||
RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.341.0/linux/vulkansdk-linux-x86_64-1.4.341.0.tar.xz \
|
RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.350.0/linux/vulkansdk-linux-x86_64-1.4.350.0.tar.xz \
|
||||||
-O /tmp/vulkansdk.tar.xz \
|
-O /tmp/vulkansdk.tar.xz \
|
||||||
&& mkdir -p /opt/vulkan \
|
&& mkdir -p /opt/vulkan \
|
||||||
&& tar -xf /tmp/vulkansdk.tar.xz -C /opt/vulkan \
|
&& tar -xf /tmp/vulkansdk.tar.xz -C /opt/vulkan \
|
||||||
&& rm /tmp/vulkansdk.tar.xz
|
&& rm /tmp/vulkansdk.tar.xz
|
||||||
|
|
||||||
ENV VULKAN_SDK=/opt/vulkan/1.4.341.0/x86_64
|
ENV VULKAN_SDK=/opt/vulkan/1.4.350.0/x86_64
|
||||||
ENV PATH="${VULKAN_SDK}/bin:${PATH}"
|
ENV PATH="${VULKAN_SDK}/bin:${PATH}"
|
||||||
ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib:${LD_LIBRARY_PATH}"
|
ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib:${LD_LIBRARY_PATH}"
|
||||||
ENV VK_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"
|
ENV VK_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Runs the given command against a headless Weston compositor, mirroring xvfb-run's ergonomics
|
||||||
|
# for Wayland. Usage: weston-run <command> [args...]
|
||||||
|
weston --backend=headless-backend.so --shell=kiosk-shell.so --socket=wayland-headless &
|
||||||
|
WESTON_PID=$!
|
||||||
|
sleep 1
|
||||||
|
WAYLAND_DISPLAY=wayland-headless "$@"
|
||||||
|
STATUS=$?
|
||||||
|
kill "$WESTON_PID" 2>/dev/null
|
||||||
|
wait "$WESTON_PID" 2>/dev/null
|
||||||
|
exit "$STATUS"
|
||||||
Reference in New Issue
Block a user