From 130da208aab7fa29c74e0b5ec675cbcee69e89db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A6=B8=E0=A7=8C=E0=A6=AE=E0=A7=8D=E0=A6=AF=E0=A6=A6?= =?UTF-8?q?=E0=A7=80=E0=A6=AA=20=E0=A6=98=E0=A7=8B=E0=A6=B7?= <72045785+soumyaDghosh@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:55:21 +0530 Subject: [PATCH] build: use ffmpeg content snap (#319) --- snap/snapcraft.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7c3cd2f..256aab9 100755 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -26,6 +26,12 @@ layout: /usr/share/locale: bind: $SNAP/usr/share/locale +plugs: + ffmpeg-2404: + interface: content + target: ffmpeg-platform + default-provider: ffmpeg-2404 + slots: dbus-gimp: interface: dbus @@ -46,6 +52,8 @@ apps: common-id: org.gimp.GIMP environment: HOME: $SNAP_REAL_HOME + LD_LIBRARY_PATH: $SNAP/ffmpeg-platform/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$LD_LIBRARY_PATH + PATH: $SNAP/ffmpeg-platform/usr/bin:$PATH slots: - dbus-gimp plugs: @@ -81,8 +89,10 @@ parts: - -Dworkshop=true build-environment: - C_INCLUDE_PATH: /snap/gnome-46-2404-sdk/current/usr/include/librsvg-2.0:${C_INCLUDE_PATH:+:$C_INCLUDE_PATH} + - PKG_CONFIG_PATH: /snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} + - LD_LIBRARY_PATH: /snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + - PATH: /snap/ffmpeg-2404-sdk/current/usr/bin${PATH:+:$PATH} build-packages: - - ffmpeg - libexiv2-dev - libfftw3-dev - libgexiv2-2 @@ -99,7 +109,6 @@ parts: - libv4l-dev - libwebp-dev stage-packages: - - ffmpeg - libamd3 - libbtf2 - libcamd3 @@ -124,6 +133,8 @@ parts: - libspqr4 - libumfpack6 - libv4l-0 + build-snaps: + - ffmpeg-2404 gimp: after: @@ -284,3 +295,6 @@ parts: override-prime: | craftctl default ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404 + for snap in "core24" "gnome-46-2404" "ffmpeg-2404"; do + cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "$CRAFT_PRIME/{}" \; + done