[neon/snap-packaging/gwenview-snap/Neon/release-24.12] /: Fix ffmpeg.

Carlos De Maine null at kde.org
Mon Nov 11 11:27:57 GMT 2024


Git commit df997f08e2219b999bf774f5c3d6c65a987c1a1b by Carlos De Maine, on behalf of Scarlett Moore.
Committed on 11/11/2024 at 11:27.
Pushed by carlosdem into branch 'Neon/release-24.12'.

Fix ffmpeg.

(cherry picked from commit 383fa41632be6c68b9e76b58a2190a4462412d17)

M  +7    -1    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/gwenview-snap/-/commit/df997f08e2219b999bf774f5c3d6c65a987c1a1b

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 28131eb..02fc343 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -24,7 +24,7 @@ apps:
         command-chain:
         - snap/command-chain/desktop-launch6
 environment:
-  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core22-sdk/current/usr/lib:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/vlc:/usr/lib:/lib"
+  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/ffmpeg-platform/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:$SNAP/kf6/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/vlc:/usr/lib:/lib"
   GST_PLUGIN_PATH: "$SNAP/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"
@@ -32,6 +32,7 @@ environment:
   QT_PLUGIN_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins"
   VLC_PLUGIN_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/vlc/plugins"
   LIBVA_DRIVERS_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/dri"
+  PATH: $SNAP/ffmpeg-platform/usr/bin:${PATH}
 layout:
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/alsa-lib
@@ -46,6 +47,10 @@ plugs:
     content: foo
     default-provider: cups
     target: $SNAP_DATA/foo
+  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:
@@ -213,6 +218,7 @@ parts:
         build-snaps:
         - core22
         - kf6-core22
+        - ffmpeg-2204
         override-prime: |
             set -eux
             for snap in "core22" "kf6-core22"; do



More information about the Neon-commits mailing list