diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2022-01-29 18:54:54 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2022-01-30 08:11:00 +0100 |
| commit | 6589966b976764e2a197e2bf2b847592dc8715a7 (patch) | |
| tree | fd3c26ad1e3d308569cde5b0aee4a3c07b38e707 | |
| parent | 090e92581611bab97cfdc0b45cc224a3b3736beb (diff) | |
| download | guix-patches-base-for-series-11189.tar guix-patches-base-for-series-11189.tar.gz | |
gnu: audacity: Add fallback to locate ffmpeg via pkg-config.base-for-series-11189
* gnu/packages/patches/audacity-ffmpeg-fallback.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it here.
* gnu/packages/audio.scm (audacity)[patches]: Use it here.
[inputs]: Add back ffmpeg.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/audio.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/audacity-ffmpeg-fallback.patch | 66 |
3 files changed, 69 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 96e6cb08f4..898e8e92e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -859,6 +859,7 @@ dist_patch_DATA = \ %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ %D%/packages/patches/atlas-gfortran-compat.patch \ + %D%/packages/patches/audacity-ffmpeg-fallback.patch \ %D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \ %D%/packages/patches/audiofile-fix-sign-conversion.patch \ %D%/packages/patches/audiofile-CVE-2015-7747.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index feccf662b0..22dd88ef0c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -738,6 +738,7 @@ engineers, musicians, soundtrack editors and composers.") (sha256 (base32 "189agx11361k9j958s6q5bngnnfx0rwaf0dwbjxy6fwvsb1wv3px")) + (patches (search-patches "audacity-ffmpeg-fallback.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -768,6 +769,7 @@ engineers, musicians, soundtrack editors and composers.") lame linux-libre-headers flac + ffmpeg libid3tag libjpeg-turbo libmad diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch new file mode 100644 index 0000000000..d570d8f605 --- /dev/null +++ b/gnu/packages/patches/audacity-ffmpeg-fallback.patch @@ -0,0 +1,66 @@ +From 3c20057d0cbbbed453a692d4dd4589d865808024 Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler <liliana.prikler@gmail.com> +Date: Sat, 29 Jan 2022 10:44:44 +0100 +Subject: [PATCH] Add pkg-config fallback for locating ffmpeg. + +Audacity >=3.1.0 no longer links against ffmpeg, but instead dynamically loads +it. This dynamic loading mechanism fails to properly locate libraries outside +of LD_LIBRARY_PATH. + +See <https://issues.guix.gnu.org/53591>. +--- + libraries/lib-ffmpeg-support/CMakeLists.txt | 8 ++++++++ + libraries/lib-ffmpeg-support/FFmpegFunctions.cpp | 12 ++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt +index 8c5f06d7c..00810e4d0 100644 +--- a/libraries/lib-ffmpeg-support/CMakeLists.txt ++++ b/libraries/lib-ffmpeg-support/CMakeLists.txt +@@ -1,5 +1,7 @@ + + if (${_OPT}use_ffmpeg) ++ pkg_check_modules(FFMPEG libavcodec libavformat libavutil) ++ + set( SOURCES + FFmpegTypes.h + +@@ -100,6 +102,12 @@ if (${_OPT}use_ffmpeg) + list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE ) + endif() + ++ if (FFMPEG_FOUND) ++ pkg_get_variable(LIBAVCODEC_LIBDIR libavcodec libdir) ++ list(APPEND DEFINITIONS PRIVATE ++ "-DFFMPEG_PC_LIBDIR=L\"${LIBAVCODEC_LIBDIR}\"") ++ endif() ++ + audacity_library( lib-ffmpeg-support "${SOURCES}" "${LIBRARIES}" + "${DEFINITIONS}" "" + ) +diff --git a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp +index 66d085a0b..4eeb4aed3 100644 +--- a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp ++++ b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp +@@ -238,6 +238,18 @@ struct FFmpegFunctions::Private final + if (library->IsLoaded()) + return library; + ++#if defined(FFMPEG_PC_LIBDIR) ++ { ++ static const wxString libdir{FFMPEG_PC_LIBDIR}; ++ const wxString fullName = wxFileName(libdir, libraryName).GetFullPath(); ++ ++ auto library = std::make_shared<wxDynamicLibrary>(fullName); ++ ++ if (library->IsLoaded()) ++ return library; ++ } ++#endif ++ + // Loading has failed. + // wxLogSysError doesn't report errors correctly on *NIX + #if defined(_WIN32) +-- +2.34.0 + |