#139 fix wlroots crash in pixman mode, add selkies desktop init mode

Author: thelamer

Dockerfile

@@ -69,6 +69,57 @@ RUN \
     build/wtype \
     /usr/bin/wtype
 
+FROM ghcr.io/linuxserver/baseimage-debian:trixie AS wlroots
+
+RUN \
+  echo "**** wlroots build deps ****" && \
+  apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    dpkg-dev \
+    devscripts \
+    quilt && \
+  apt-get build-dep -y \
+    libwlroots-0.18
+
+COPY /pixman-patch/pass.c /pass.c
+
+RUN \
+  echo "**** ingest current source and build deb ****" && \
+  mkdir /debout && \
+  cd /tmp && \
+  apt-get source libwlroots-0.18 && \
+  cd wlroots-0.18* && \
+  cp \
+    /pass.c \
+    render/pixman/pass.c && \
+  DEB_BUILD_OPTIONS='nocheck' dpkg-buildpackage -d -us -uc -b && \
+  cp \
+    ../libwlroots-0.18_*.deb \
+    /debout/wl.deb
+
+FROM ghcr.io/linuxserver/baseimage-debian:trixie AS selkies-desktop
+
+RUN \
+  echo "**** selkies-desktop build deps ****" && \
+  apt-get update && \
+  apt-get install -y \
+    build-essential \
+    git \
+    libcairo2-dev \
+    libwayland-dev \
+    wayland-protocols 
+
+RUN \
+  echo "**** build selkies-desktop ****" && \
+  cd /tmp && \
+  git clone \
+    https://github.com/selkies-project/selkies-desktop.git && \
+  cd selkies-desktop && \
+  make && \
+  mv \
+    selkies-desktop \
+    /usr/bin/selkies-desktop
+
 # Runtime stage
 FROM ghcr.io/linuxserver/baseimage-debian:trixie
 
@@ -90,6 +141,8 @@ ENV DISPLAY=:1 \
     DISABLE_DRI3=false \
     TITLE=Selkies
 
+COPY --from=wlroots /debout/wl.deb /tmp/wl.deb
+
 RUN \
   echo "**** dev deps ****" && \
   apt-get update && \
@@ -139,6 +192,7 @@ RUN \
     libgcrypt20 \
     libgirepository-1.0-1 \
     libgl1-mesa-dri \
+    libglib2.0-bin \
     libglu1-mesa \
     libgnutls30 \
     libgtk-3.0 \
@@ -222,6 +276,9 @@ RUN \
     xutils \
     xvfb \
     zlib1g && \
+  echo "**** patched wlroots ****" && \
+  apt-get --reinstall install --no-install-recommends --allow-downgrades -y \
+    /tmp/wl.deb && \
   echo "**** install selkies ****" && \
   SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
@@ -321,6 +378,7 @@ COPY /root /
 COPY --from=frontend /buildout /usr/share/selkies
 COPY --from=xvfb / /
 COPY --from=wtype /usr/bin/wtype /usr/bin/wtype
+COPY --from=selkies-desktop /usr/bin/selkies-desktop /usr/bin/selkies-desktop
 
 # ports and volumes
 EXPOSE 3000 3001

Dockerfile.aarch64

@@ -69,6 +69,57 @@ RUN \
     build/wtype \
     /usr/bin/wtype
 
+FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-trixie AS wlroots
+
+RUN \
+  echo "**** wlroots build deps ****" && \
+  apt-get update && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    dpkg-dev \
+    devscripts \
+    quilt && \
+  apt-get build-dep -y \
+    libwlroots-0.18
+
+COPY /pixman-patch/pass.c /pass.c
+
+RUN \
+  echo "**** ingest current source and build deb ****" && \
+  mkdir /debout && \
+  cd /tmp && \
+  apt-get source libwlroots-0.18 && \
+  cd wlroots-0.18* && \
+  cp \
+    /pass.c \
+    render/pixman/pass.c && \
+  DEB_BUILD_OPTIONS='nocheck' dpkg-buildpackage -d -us -uc -b && \
+  cp \
+    ../libwlroots-0.18_*.deb \
+    /debout/wl.deb
+
+FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-trixie AS selkies-desktop
+
+RUN \
+  echo "**** selkies-desktop build deps ****" && \
+  apt-get update && \
+  apt-get install -y \
+    build-essential \
+    git \
+    libcairo2-dev \
+    libwayland-dev \
+    wayland-protocols
+
+RUN \
+  echo "**** build selkies-desktop ****" && \
+  cd /tmp && \
+  git clone \
+    https://github.com/selkies-project/selkies-desktop.git && \
+  cd selkies-desktop && \
+  make && \
+  mv \
+    selkies-desktop \
+    /usr/bin/selkies-desktop
+
 # Runtime stage
 FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-trixie
 
@@ -90,6 +141,8 @@ ENV DISPLAY=:1 \
     DISABLE_DRI3=false \
     TITLE=Selkies
 
+COPY --from=wlroots /debout/wl.deb /tmp/wl.deb
+
 RUN \
   echo "**** dev deps ****" && \
   apt-get update && \
@@ -138,6 +191,7 @@ RUN \
     libgcrypt20 \
     libgirepository-1.0-1 \
     libgl1-mesa-dri \
+    libglib2.0-bin \
     libglu1-mesa \
     libgnutls30 \
     libgtk-3.0 \
@@ -220,6 +274,9 @@ RUN \
     xutils \
     xvfb \
     zlib1g && \
+  echo "**** patched wlroots ****" && \
+  apt-get --reinstall install --no-install-recommends --allow-downgrades -y \
+    /tmp/wl.deb && \
   echo "**** install selkies ****" && \
   SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]') && \
@@ -319,6 +376,7 @@ COPY /root /
 COPY --from=frontend /buildout /usr/share/selkies
 COPY --from=xvfb / /
 COPY --from=wtype /usr/bin/wtype /usr/bin/wtype
+COPY --from=selkies-desktop /usr/bin/selkies-desktop /usr/bin/selkies-desktop
 
 # ports and volumes
 EXPOSE 3000 3001

README.md

@@ -29,6 +29,7 @@ All application settings are passed via environment variables:
 | Variable | Description |
 | :----: | --- |
 | PIXELFLUX_WAYLAND | **Experimental** If set to true the container will initialize in Wayland mode running [Smithay](https://github.com/Smithay/smithay) and Labwc while enabling zero copy encoding with a GPU |
+| SELKIES_DESKTOP | If set to true and in Wayland mode, a simple panel will be initialized with labwc |
 | CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default 3000 |
 | CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default 3001 |
 | CUSTOM_WS_PORT | Internal port the container listens on for websockets if it needs to be swapped from the default 8082 |