Merge pull request #103 from linuxserver/trixie-amd-intel-fixes

Trixie amd intel fixes

Author: thelamer

Dockerfile

@@ -58,6 +58,7 @@ ENV DISPLAY=:1 \
     SELKIES_INTERPOSER=/usr/lib/selkies_joystick_interposer.so \
     NVIDIA_DRIVER_CAPABILITIES=all \
     DISABLE_ZINK=false \
+    DISABLE_DRI3=false \
     TITLE=Selkies
 
 RUN \

Dockerfile.aarch64

@@ -58,6 +58,7 @@ ENV DISPLAY=:1 \
     SELKIES_INTERPOSER=/usr/lib/selkies_joystick_interposer.so \
     NVIDIA_DRIVER_CAPABILITIES=all \
     DISABLE_ZINK=false \
+    DISABLE_DRI3=false \
     TITLE=Selkies
 
 RUN \

root/etc/s6-overlay/s6-rc.d/svc-selkies/run

@@ -56,7 +56,6 @@ if [ ! -z ${DEV_MODE+x} ]; then
       --mode="websockets"
 fi
 
-
 # Start Selkies
 exec s6-setuidgid abc \
   selkies \

root/etc/s6-overlay/s6-rc.d/svc-xorg/run

@@ -8,6 +8,9 @@ fi
 if [ ! -z ${DRINODE+x} ]; then
   VFBCOMMAND="-vfbdevice ${DRINODE}"
 fi
+if [ "${DISABLE_DRI3}" != "false" ]; then
+  VFBCOMMAND=""
+fi
 DEFAULT_RES="15360x8640"
 if [ ! -z ${MAX_RES+x} ]; then
   DEFAULT_RES="${MAX_RES}"