[neon/snap-packaging/kf6-core/work.core24] /: Add gpu-core24 cleanup. Formatting, bump version.

[Scarlett Moore]

Git commit 19259745f9cde43e694e7f7312c7b5212f6df5c3 by Scarlett Moore.
Committed on 19/11/2024 at 13:27.
Pushed by scarlettmoore into branch 'work.core24'.

Add gpu-core24 cleanup. Formatting, bump version.

M  +75   -94   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core/-/commit/19259745f9cde43e694e7f7312c7b5212f6df5c3

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6c574d1..73eae3e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,6 +1,6 @@
 ---
 name: kf6-core24
-version: 6.6.0
+version: 6.8.0
 summary: KDE Frameworks 6
 description: KDE Frameworks are addons and useful extensions to Qt
 confinement: strict
@@ -39,97 +39,78 @@ package-repositories:
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
-    mesa:
-        after: []
-        plugin: nil
-        build-attributes:
-        - no-patchelf
-        build-packages: []
-        stage-packages:
-        - libgl1-mesa-dri
-        - libglx-mesa0
-        prime:
-        - "-lib/udev"
-        - "-usr/doc"
-        - "-usr/doc-base"
-        - "-usr/share/applications"
-        - "-usr/share/apport"
-        - "-usr/share/bug"
-        - "-usr/share/doc"
-        - "-usr/share/doc-base"
-        - "-usr/share/icons"
-        - "-usr/share/libdrm"
-        - "-usr/share/libwacom"
-        - "-usr/share/lintian"
-        - "-usr/share/man"
-        - "-usr/share/pkgconfig"
-    kf6:
-        stage-packages:
-        - mesa-utils-extra
-        - freeglut3-dev
-        - libglib2.0-0
-        - gstreamer1.0-x
-        - gstreamer1.0-plugins-base
-        - gstreamer1.0-pulseaudio
-        - gstreamer1.0-plugins-good
-        - gstreamer1.0-alsa
-        - gstreamer1.0-libav
-        - gstreamer1.0-tools
-        - libgstreamer1.0-0
-        - gstreamer1.0-plugins-bad
-        - gstreamer1.0-plugins-ugly
-        - libpulse0
-        - locales
-        - libc-bin
-        - gettext
-        - libdrm-dev
-        - mesa-va-drivers
-        -   on amd64:
-            - i965-va-driver
-            - intel-media-va-driver
-        stage-snaps:
-        - kf6-core24-sdk/latest/stable
-        - kde-qt6-core24-sdk/latest/stable
-        stage:
-        - -usr/lib/*/libdrm*
-        - -usr/share/doc/libdrm*
-        - -usr/lib/*/cmake
-        - -usr/lib/*/qt6/mkspecs
-        - -usr/share/qt6/doc
-        - -usr/share/man
-        - -usr/share/doc
-        - -usr/share/ECM
-        plugin: nil
-        override-prime: |
-            set -eux
-            craftctl default
-            cd $CRAFT_PRIME
-            find . -type f,l -name "*.h" -exec bash -c "rm -f {}*" \;
-    alsa-pulseaudio:
-        plugin: dump
-        source: .
-        override-pull: |
-            mkdir etc -p
-            cat > etc/asound.conf <<EOF
-            pcm.!default {
-                type pulse
-                fallback "sysdefault"
-                hint {
-                    show on
-                    description "Default ALSA Output (currently PulseAudio Sound Server)"
-                }
+  kf6:
+    stage-packages:
+      - freeglut3-dev
+      - libglib2.0-0
+      - gstreamer1.0-x
+      - gstreamer1.0-plugins-base
+      - gstreamer1.0-pulseaudio
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-alsa
+      - gstreamer1.0-libav
+      - gstreamer1.0-tools
+      - libgstreamer1.0-0
+      - gstreamer1.0-plugins-bad
+      - gstreamer1.0-plugins-ugly
+      - libpulse0
+      - locales
+      - libc-bin
+      - gettext
+    stage-snaps:
+      - kf6-core24-sdk/latest/stable
+      - kde-qt6-core24-sdk/latest/stable
+    stage:
+      - -usr/lib/*/libdrm*
+      - -usr/share/doc/libdrm*
+      - -usr/lib/*/cmake
+      - -usr/lib/*/qt6/mkspecs
+      - -usr/share/qt6/doc
+      - -usr/share/man
+      - -usr/share/doc
+      - -usr/share/ECM
+    plugin: nil
+    override-prime: |
+      set -eux
+      craftctl default
+      cd $CRAFT_PRIME
+      find . -type f,l -name "*.h" -exec bash -c "rm -f {}*" \;
+  alsa-pulseaudio:
+    plugin: dump
+    source: .
+    override-pull: |
+        mkdir etc -p
+        cat > etc/asound.conf <<EOF
+          pcm.!default {
+            type pulse
+            fallback "sysdefault"
+            hint {
+                show on
+                description "Default ALSA Output (currently PulseAudio Sound Server)"
             }
-            ctl.!default {
-                type pulse
-                fallback "sysdefault"
-            }
-            EOF
-    command-chain:
-        source: https://invent.kde.org/neon/snap-packaging/snapcraft-desktop-integration.git
-        source-type: git
-        source-subdir: kde-neon-6
-        plugin: make
-        make-parameters:
-        - PLATFORM_PLUG="GPU_WRAPPER=gpu-2404-wrapper"
-        stage-packages:
-        - tox
+          }
+          ctl.!default {
+            type pulse
+            fallback "sysdefault"
+          }
+        EOF
+
+  gpu-2404:
+    after: [kf6]
+    source: https://github.com/canonical/gpu-snap.git
+    plugin: dump
+    override-prime: |
+      craftctl default
+      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
+    prime:
+    - bin/gpu-2404-wrapper
+
+  command-chain:
+    source: https://invent.kde.org/neon/snap-packaging/snapcraft-desktop-integration.git
+    source-type: git
+    source-subdir: kde-neon-6
+    plugin: make
+    make-parameters:
+      - PLATFORM_PLUG="GPU_WRAPPER=gpu-2404-wrapper"
+    stage-packages:
+      - tox