From a5d96979982de601194e9fdd00a33f0dc1decd8b Mon Sep 17 00:00:00 2001
From: past-due <30942300+past-due@users.noreply.github.com>
Date: Sat, 18 Nov 2023 09:44:40 -0500
Subject: [PATCH] Revert "[Snap] Switch to graphics-core22 plug"

This reverts commit 275a83da4c011a97f7e89f8ebb6eccde8e292872.
---
 .snapcraft.yaml | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/.snapcraft.yaml b/.snapcraft.yaml
index 89208d53a2c..5b802706af9 100644
--- a/.snapcraft.yaml
+++ b/.snapcraft.yaml
@@ -16,14 +16,18 @@ architectures:
   - build-on: armhf
 
 layout:
-  /usr/share/libdrm:
-    bind: $SNAP/graphics/libdrm
-  /usr/share/drirc.d:
-    symlink: $SNAP/graphics/drirc.d
-  /usr/share/X11/XErrorDB:
-    symlink: $SNAP/graphics/X11/XErrorDB
-  /usr/share/X11/locale:
-    symlink: $SNAP/graphics/X11/locale
+  /usr/share/vulkan:
+    symlink: $SNAP/usr/share/vulkan
+  /usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_intel.so:
+    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_intel.so
+  /usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_radeon.so:
+    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_radeon.so
+  /usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_broadcom.so:
+    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_broadcom.so
+  /usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_freedreno.so:
+    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_freedreno.so
+  /usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_lvp.so:
+    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libvulkan_lvp.so
 
 plugs:
   wz2100-sequences:
@@ -31,16 +35,10 @@ plugs:
     content: wz2100-sequences
     target: $SNAP/usr/share/warzone2100/sequences
     default-provider: warzone2100-videos
-  graphics-core22:
-      interface: content
-      target: $SNAP/graphics
-      default-provider: mesa-core22
 
 apps:
   warzone2100:
     extensions: [gnome]
-    command-chain:
-      - bin/graphics-core22-wrapper
     command: usr/bin/warzone2100-launcher.sh warzone2100
     common-id: net.wz2100.warzone2100 # should match the appdata/metainfo file's <id> field
     desktop: usr/share/applications/net.wz2100.warzone2100.desktop
@@ -220,20 +218,10 @@ parts:
       - libsodium23
       - libsqlite3-0
       - libglu1-mesa
-      # - mesa-vulkan-drivers # provided by graphics-core22 / mesa-core22
+      - mesa-vulkan-drivers
       - unzip
       - zip
 
-  graphics-core22:
-    after: [warzone2100]
-    source: https://github.com/MirServer/graphics-core22.git
-    plugin: dump
-    override-prime: |
-      craftctl default
-      ${CRAFT_PART_SRC}/bin/graphics-core22-cleanup mesa-core22 nvidia-core22
-    prime:
-    - bin/graphics-core22-wrapper
-
   # This part removes all the files in this snap which already exist in
   # connected content and base snaps. Since these files will be available
   # at runtime from the content and base snaps, they do not need to be
@@ -245,7 +233,6 @@ parts:
     after:  # Make this part run last; list all your other parts here
       - sdl
       - warzone2100
-      - graphics-core22
     plugin: nil
     build-snaps:  # List all content-snaps and base snaps you're using here
       - core22