deps/sommelier: Disable MIT-SHM extension for X11

This commit is contained in:
Peter Cai 2023-06-05 21:02:49 -04:00
parent cddf07bf4d
commit 6ff457da3e
2 changed files with 4 additions and 1 deletions

View file

@ -14,6 +14,7 @@ RUN mkdir /build && cd /build \
RUN cd /build/platform2/vm_tools/sommelier \
&& sed -i 's/#define XDG_SHELL_VERSION 3u/#define XDG_SHELL_VERSION 2u/' sommelier.h \
&& sed -i 's/args\[i++\] = "-rootless";/args[i++] = "-rootless"; args[i++] = "-extension"; args[i++] = "MIT-SHM";/' sommelier.cc \
&& meson build -Dwith_tests=false && ninja -C build
# Build from ../base-archlinux

View file

@ -2,7 +2,9 @@
# X Sommelier (will listen on :1)
echo "Starting X11 Sommelier"
sommelier --display=wayland-0 --xwayland-path=/usr/bin/Xwayland -X --glamor --x-display=1 --xwayland-gl-driver-path=/usr/lib/dri --force-drm-device=$WM_RENDER_NODE --direct-scale --noop-driver sleep infinity &
sommelier --display=wayland-0 --xwayland-path=/usr/bin/Xwayland \
-X --glamor --x-display=1 --xwayland-gl-driver-path=/usr/lib/dri \
--force-drm-device=$WM_RENDER_NODE --direct-scale --noop-driver sleep infinity &
SOMMELIER_X=$!
for i in $(seq 1 5); do