snap: Support wayland without X11

Thanks-to: https://github.com/MirServer/mir-kiosk-neverputt/ Relate-to: #21 Signed-off-by: Philippe Coval <[email protected]> Change-Id: Icd6c76474da18ebd4d0d8724a6b75d07a7f48f3d
adoptware · Mar 16, 2021 · d844620 · d844620
1 parent 2e1134d
commit d844620
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -21,22 +21,24 @@ plugs:
   x11:
 
 environment:
+  __EGL_VENDOR_LIBRARY_DIRS: "$SNAP/etc/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d"
   LD_LIBRARY_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio"
   LIBGL_DRIVERS_PATH: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/dri"
   XWAYLAND_FULLSCREEN_WINDOW_HINT: title="Emilia Pinball"
 
 apps:
   daemon:
     command-chain:
-      - usr/local/bin/xwayland-kiosk-launch
+      - bin/run-daemon
+      - bin/wayland-launch
     command: usr/local/bin/pinball
     daemon: simple
     restart-condition: always
   pinball:
     command: usr/local/bin/pinball
-  xwayland-kiosk-pinball:
+  mir-kiosk-pinball:
     command-chain:
-      - usr/local/bin/xwayland-kiosk-launch
+      - bin/wayland-launch
     command: usr/local/bin/pinball
 
 layout:
@@ -112,16 +114,14 @@ parts:
       - libxss1
       - libxxf86vm1
 
-  xwayland-kiosk-helper:
-    plugin: cmake
-    source: https://github.com/MirServer/xwayland-kiosk-helper.git
-    override-stage: |
-      snapcraftctl stage
-      sed -e 's|/lib/libxwayland-preload.so|/usr/local/lib/libxwayland-preload.so|g' -i usr/local/bin/xwayland-kiosk-launch
-    build-packages:
-      - build-essential
+  mir-kiosk-snap-launch:
+    plugin: dump
+    source: https://github.com/MirServer/mir-kiosk-snap-launch.git
+    override-build: $SNAPCRAFT_PART_BUILD/build-with-plugs.sh opengl audio-playback alsa wayland hardware-observe
+    stage-packages:
+     - inotify-tools
+
+  mesa:
+    plugin: nil
     stage-packages:
-      - i3
-      - libegl1-mesa
-      - libgl1-mesa-glx
-      - xwayland
+      - libwayland-egl1-mesa