[neon/snap-packaging/elisa-snap] /: Revert "Move asound.conf back to the snap."

Scarlett Moore null at kde.org
Wed Jun 26 14:57:10 BST 2024


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

Revert "Move asound.conf back to the snap."

This reverts commit ce8dff5a35d5a701414a33d07e781a92475935f9.

M  +1    -19   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/elisa-snap/-/commit/681985c164288fd345474512fe260fb9e3e5bfb1

diff --git a/snapcraft.yaml b/snapcraft.yaml
index fa8b682..59b4bcc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -39,6 +39,7 @@ environment:
   GST_PLUGIN_PATH: "$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
   GST_PLUGIN_SYSTEM_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"
+  ALSA_CONFIG_PATH: "$SNAP/kf6/etc/asound.conf"
   QT_MEDIA_BACKEND: "ffmpeg"
   QT_PLUGIN_PATH: /snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
 layout:
@@ -151,25 +152,6 @@ parts:
         - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libspeex*
         - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvorbis*
         - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
-    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
     cleanup:
         after:
         - elisa



More information about the Neon-commits mailing list