diff options
| author | Kaelyn Takata <kaelyn.alexi@protonmail.com> | 2024-05-28 17:33:44 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-05-31 13:55:42 +0200 |
| commit | 0e5e032d1288923c67406036df975674d8487e9e (patch) | |
| tree | d70b62c7f6c6e1f3333791c1eeecfd7535135d6b /gnu/packages | |
| parent | 422ffb690ee0169b83ad3564d628f8cc054b5ff1 (diff) | |
| download | guix-0e5e032d1288923c67406036df975674d8487e9e.tar guix-0e5e032d1288923c67406036df975674d8487e9e.tar.gz | |
gnu: audacity: Re-add fallback to locate ffmpeg via pkg-config.
This reintroduces the patch that was deleted by
cf5f7a8bf9ca2288700fcf351bbca0fc341ec969, adjusting file names.
* 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.
Change-Id: I848df8a9762216eb2b02afc3843e0e9806db14be
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/audio.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/audacity-ffmpeg-fallback.patch | 61 |
2 files changed, 62 insertions, 0 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d30d561d2f..f5c8dbd151 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -934,6 +934,7 @@ engineers, musicians, soundtrack editors and composers.") (file-name (git-file-name name version)) (sha256 (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1")) + (patches (search-patches "audacity-ffmpeg-fallback.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch new file mode 100644 index 0000000000..c845e10277 --- /dev/null +++ b/gnu/packages/patches/audacity-ffmpeg-fallback.patch @@ -0,0 +1,61 @@ +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>. + +Bugs-added-by: Marius Bakke <marius@gnu.org> + +diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt +index b8803a1f5..f86559cca 100644 +--- a/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt ++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt +@@ -1,5 +1,7 @@ + + if (${_OPT}use_ffmpeg) ++ pkg_check_modules(FFMPEG libavcodec libavformat libavutil) ++ + set( SOURCES + FFmpegTypes.h + +@@ -107,6 +109,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=\"${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 55d6f676b..46640ef83 100644 +--- a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp ++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp +@@ -246,6 +246,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 ++ + return {}; + } + }; |