[neon/snap-packaging/elisa-snap] /: Revert "Use alsa-mixin helper and force pulseaudio."

[Scarlett Moore]

Git commit 1a50a5780e71907ebcadb340cc9790253d4a4416 by Scarlett Moore.
Committed on 26/06/2024 at 13:56.
Pushed by scarlettmoore into branch 'master'.

Revert "Use alsa-mixin helper and force pulseaudio."

This reverts commit 8bf153b1c38ecb36f863f945bba81cd793921e5f.

M  +4    -38   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/elisa-snap/-/commit/1a50a5780e71907ebcadb340cc9790253d4a4416

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 59b4bcc..bb6288d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -24,7 +24,6 @@ apps:
         - screen-inhibit-control
         command-chain:
         - snap/command-chain/desktop-launch6
-        - snap/command-chain/alsa-launch
 plugs:
     gtk-gtk3-themes:
         interface: "content"
@@ -32,7 +31,6 @@ plugs:
         default-provider: "gtk-common-themes"
 environment:
   LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/ffmpeg-2204/current/usr/lib:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/elisa:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:/usr/lib:/lib"
-  ALWAYS_USE_PULSEAUDIO: '1'
   PATH: /snap/ffmpeg-2204/current/usr/bin:/snap/kf6-core22/current/usr/bin:$SNAP/usr/bin:/usr/bin:/bin
   XDG_DATA_DIRS: $SNAP/usr/share:/snap/kf6-core22/current/usr/share:$SNAP/.local/usr/share:$SNAP/usr/share:$SNAP/data-dir
   XDG_CONFIG_HOME: $SNAP/etc/xdg:/snap/kf6-core22/current/etc/xdg:/etc/xdg
@@ -45,8 +43,6 @@ environment:
 layout:
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib
-  /usr/share/alsa:
-    bind: $SNAP/usr/share/alsa
 slots:
     session-dbus-interface:
         interface: dbus
@@ -67,7 +63,6 @@ package-repositories:
     key-server: keyserver.ubuntu.com
 parts:
     elisa:
-        after: [alsa-mixin]
         parse-info:
         - usr/share/metainfo/org.kde.elisa.appdata.xml
         plugin: cmake
@@ -77,6 +72,9 @@ parts:
         build-snaps:
         - ffmpeg-2204-sdk
         stage-packages:
+        - libasound2
+        - libasound2-plugins
+        - libasound2-data
         - libpulse0
         stage-snaps:
         - ffmpeg-2204
@@ -121,37 +119,6 @@ parts:
             craftctl default
 
             sed -i "${CRAFT_PART_INSTALL}/usr/share/applications/org.kde.elisa.desktop" -e 's|Icon=elisa$|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/elisa.svg|'
-    alsa-mixin:
-        plugin: dump
-        source: https://github.com/diddlesnaps/snapcraft-alsa.git
-        source-subdir: snapcraft-assets
-        build-packages:
-        - libasound2-dev
-        stage-packages:
-        - libasound2
-        - libasound2-plugins
-        - yad
-        stage:
-        # restrict to only audio-related files - you need to ensure
-        # that gtk3 is staged for yad to work correctly, to prompt
-        # users to connect the alsa plug or proceed with pulseaudio.
-        #
-        # This helps prevent symbol conflicts in situations where
-        # you're using a non-default library, such as those that the
-        # gnome-3-34 extension for core18 provides.
-        - etc/asound.conf
-        - snap/command-chain/alsa-launch
-        - usr/bin/yad*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libasound*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libdnsfile*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libFLAC*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjack*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libpulse*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libsamplerate*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libspeex*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvorbis*
-        - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
     cleanup:
         after:
         - elisa
@@ -159,10 +126,9 @@ parts:
         build-snaps:
         - core22
         - kf6-core22
-        - ffmpeg-2204
         override-prime: |
             set -eux
-            for snap in "core22" "kf6-core22" "ffmpeg-2204"; do
+            for snap in "core22" "kf6-core22"; do
                 cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "${CRAFT_PRIME}/{}" \;
             done