[neon/snap-packaging/elisa-snap] /: Remove ffmpeg!

Scarlett Moore null at kde.org
Tue Jul 23 16:19:15 BST 2024


Git commit da225a18aec837f58e7423484f348508e62be8e3 by Scarlett Moore.
Committed on 23/07/2024 at 15:18.
Pushed by scarlettmoore into branch 'master'.

Remove ffmpeg!

M  +2    -11   snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index eb244fe..3043944 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -24,8 +24,8 @@ apps:
         - pulseaudio
         - audio-record
 environment:
-  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$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:$SNAP/ffmpeg-platform/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH}"
-  PATH: /snap/kf6-core22/current/usr/bin:$SNAP/usr/bin:$SNAP/ffmpeg-platform/usr/bin:${PATH}
+  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$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${LD_LIBRARY_PATH}"
+  PATH: /snap/kf6-core22/current/usr/bin:$SNAP/usr/bin${PATH}
   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
   GST_PLUGIN_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0"
@@ -46,11 +46,6 @@ slots:
         interface: dbus
         name: org.mpris.MediaPlayer2.elisa
         bus: session
-plugs:
-    ffmpeg-2204:
-        interface: content
-        target: ffmpeg-platform # the folder where this content snap will be mounted
-        default-provider: ffmpeg-2204
 package-repositories:
 -   type: apt
     components:
@@ -68,10 +63,6 @@ parts:
         build-packages:
         - libvlc-dev
         - libpulse0
-        build-snaps:
-        - ffmpeg-2204-sdk
-        stage-snaps:
-        - ffmpeg-2204
         stage-packages:
         - libasound2
         - libasound2-plugins


More information about the Neon-commits mailing list