[neon/snap-packaging/elisa-snap] /: move to core24

[Scarlett Moore]

Git commit 9ac0c72ada989fc61dbcd3f02541ba4e69d928d5 by Scarlett Moore.
Committed on 11/02/2025 at 12:59.
Pushed by scarlettmoore into branch 'master'.

move to core24

M  +39   -9    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/elisa-snap/-/commit/9ac0c72ada989fc61dbcd3f02541ba4e69d928d5

diff --git a/snapcraft.yaml b/snapcraft.yaml
index b0a89b0..09dc5d5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -5,7 +5,7 @@
 name: elisa
 confinement: strict
 grade: stable
-base: core22
+base: core24
 adopt-info: elisa
 icon: $CRAFT_PROJECT_DIR/logo.png
 apps:
@@ -24,12 +24,28 @@ apps:
         - pulseaudio
         - audio-record
 environment:
-  LD_LIBRARY_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib:$SNAP/lib:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/elisa:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio${LD_LIBRARY_PATH}"
-  ALSA_CONFIG_PATH: "/snap/kf6-core22/current/etc/asound.conf"
+  LD_LIBRARY_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib:$SNAP/lib:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/elisa:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio${LD_LIBRARY_PATH}:$SNAP/ffmpeg-platform/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
+  PATH: $SNAP/ffmpeg-platform/usr/bin:${PATH}
+  ALSA_CONFIG_PATH: "$SNAP/kf6/etc/asound.conf"
   QT_MEDIA_BACKEND: "ffmpeg"
+  GST_PLUGIN_SYSTEM_PATH: $SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/
+  GST_PLUGIN_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
+  GST_PLUGIN_SCANNER: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
+
+plugs:
+  ffmpeg-2404:
+    interface: content
+    target: ffmpeg-platform # the folder where this content snap will be mounted
+    default-provider: ffmpeg-2404
+
 layout:
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib
+  /usr/share/alsa:
+    symlink: $SNAP/usr/share/alsa
+  "/etc/alsa/conf.d":
+    bind: "$SNAP/etc/alsa/conf.d"
+
 slots:
     session-dbus-interface:
         interface: dbus
@@ -44,7 +60,7 @@ package-repositories:
     components:
     - main
     suites:
-    - jammy
+    - noble
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
@@ -62,7 +78,7 @@ parts:
         - libasound2-data
         - libpulse0
         source: https://invent.kde.org/multimedia/elisa.git
-        source-branch: release/24.08
+        source-branch: release/24.12
         cmake-parameters:
         - -DCMAKE_INSTALL_PREFIX=/usr
         - -DCMAKE_BUILD_TYPE=Release
@@ -80,6 +96,12 @@ parts:
         - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         - --log-level=STATUS
         - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+        build-environment:
+            - PATH: /snap/kde-qt6-core24-sdk/current/usr/bin${PATH:+:$PATH}
+            - PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+            - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+            - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+            - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core24-sdk/current/usr/lib:/snap/kf6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kf6-core24-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/lib/:$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
         prime:
         - -usr/lib/*/cmake/*
         - -usr/include/*
@@ -89,17 +111,25 @@ parts:
         - -usr/lib/gcc/$CRAFT_ARCH_TRIPLET_BUILD_FOR/6.0.0
         - -usr/lib/aspell/*
         - -usr/share/lintian
+    gpu-2404:
+        after: [elisa]
+        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
     cleanup:
         after:
         - elisa
         plugin: nil
         build-snaps:
-        - core22
-        - kf6-core22
-        - qt-common-themes
+        - core24
+        - kf6-core24
         override-prime: |
             set -eux
-            for snap in "core22" "kf6-core22" "qt-common-themes"; do
+            for snap in "core24" "kf6-core24"; do
                 cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "${CRAFT_PRIME}/{}" \;
             done