diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2020-11-30 00:56:50 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2020-11-30 00:56:50 +0300 |
| commit | 0de101f10b9a74164454ac34df0e25a704b00c8d (patch) | |
| tree | 8f99a03b02a42edcabc1d78cdb8db4c1b4d49b1b /snap | |
| parent | 16b99f00de5fdee77ed2b7f7acd91d1d4ed630a4 (diff) | |
Fixing pulseaudio LD_LIBRARY_PATH and staging PA libraries
Diffstat (limited to 'snap')
| -rw-r--r-- | snap/snapcraft.yaml | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 5c763b3f1..dc6d24ddf 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,6 +5,10 @@ grade: stable confinement: strict base: core18 +environment: + DISABLE_WAYLAND: "1" + LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio + layout: /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0: bind: $SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0 @@ -19,9 +23,6 @@ apps: remmina: # desktop-launch (used under the covers in gnome-3-28 extension) seems to # be broken when setting up wayland env so we disable it - environment: - DISABLE_WAYLAND: "1" - LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio command: bin/pawrap $SNAP/usr/bin/remmina extensions: [gnome-3-28] common-id: org.remmina.Remmina.desktop @@ -43,7 +44,6 @@ apps: - opengl - optical-drive - password-manager-service - - pulseaudio - raw-usb - removable-media - screen-inhibit-control @@ -63,7 +63,36 @@ parts: pawrap: plugin: dump source: snap/local/files/ + pulse-utils: + plugin: nil + stage-packages: + - pulseaudio + - pulseaudio-utils + - libsndfile1 + - libxcb1 + - libasyncns0 + - libflac8 + - libvorbisenc2 + - libxau6 + - libxdmcp6 + - libogg0 + - libvorbis0a + prime: + - usr/lib/*/pulseaudio/libpulsecommon-8.0.so* + - usr/lib/*/libpulse.so* + - usr/lib/*/libpulse-simple.so* + - usr/lib/*/libsndfile.so* + - usr/lib/*/libxcb.so* + - usr/lib/*/libasyncns.so* + - usr/lib/*/libFLAC.so* + - usr/lib/*/libvorbisenc.so* + - usr/lib/*/libXau.so* + - usr/lib/*/libXdmcp.so* + - usr/lib/*/libogg.so* + - usr/lib/*/libvorbis.so.* freerdp: + after: + - pulse-utils plugin: cmake source: https://github.com/FreeRDP/FreeRDP.git source-tag: 2.2.0 @@ -289,8 +318,6 @@ parts: - gstreamer1.0-libav - dbus-x11 - xdg-user-dirs - # Needed for the example .wav files for testing purposes - - alsa-utils override-build: | set -ex |