[neon/snap-packaging/kde-qt6-core-sdk/work.core24] /: Point cmake to ffmpeg and add to cleanup.

Scarlett Moore null at kde.org
Wed Dec 18 14:18:29 GMT 2024


Git commit a70b2db72f6c6df71bb143b3a28d1042fbf09db0 by Scarlett Moore.
Committed on 18/12/2024 at 14:17.
Pushed by scarlettmoore into branch 'work.core24'.

Point cmake to ffmpeg and add to cleanup.

M  +8    -1    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/a70b2db72f6c6df71bb143b3a28d1042fbf09db0

diff --git a/snapcraft.yaml b/snapcraft.yaml
index d1310f8..4eb6bbd 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -149,6 +149,7 @@ parts:
       - libglx-dev
       - libgstreamer1.0-dev
       - libgstreamer-plugins-base1.0-dev
+      - libgstreamer-plugins-good1.0-dev
       - libgtk-3-dev
       - libharfbuzz-dev
       - libhunspell-dev
@@ -235,6 +236,11 @@ parts:
       - zlib1g-dev
     stage-packages:
       - libpulse0
+    build-environment:
+      - PKG_CONFIG_PATH: /snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - CMAKE_PREFIX_PATH: /snap/ffmpeg-2404-sdk/current/usr${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
+      - CMAKE_FIND_ROOT_PATH: /snap/ffmpeg-2404-sdk/current/usr
+
     prime:
       - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libcurl*
       - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libvulkan*
@@ -290,6 +296,7 @@ parts:
       - libglx-dev
       - libgstreamer1.0-dev
       - libgstreamer-plugins-base1.0-dev
+      - libgstreamer-plugins-good1.0-dev
       - libgtk-3-dev
       - libharfbuzz-dev
       - libhunspell-dev
@@ -403,6 +410,6 @@ parts:
     after: [debs]
     override-stage: |
       set -eux
-      for snap in "core24"; do
+      for snap in "core24" "ffmpeg-2404-sdk"; do
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done


More information about the Neon-commits mailing list