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=\"${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

 class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/builders.scm?id=d504f6b2c57441f181292b43a2f506510fce80ce&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-10-22 01:46:55 +0200'>2022-10-22</span></td><td><a href='/guix/commit/tests/builders.scm?id=a3619079f95213c4f983e69210ed12b38fd31022'>Remove now unnecessary uses of (guix grafts).</a><span class='msg-avail'>...<span class='msg-tooltip'>These modules would use (guix grafts) just to access '%graft?' and
related bindings, which are now in (guix store).

* gnu/ci.scm,
guix/gexp.scm,
guix/lint.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/deploy.scm,
guix/scripts/environment.scm,
guix/scripts/home.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/pull.scm,
guix/scripts/size.scm,
guix/scripts/system.scm,
guix/scripts/weather.scm,
tests/builders.scm,
tests/channels.scm,
tests/cpan.scm,
tests/derivations.scm,
tests/gexp.scm,
tests/graph.scm,
tests/guix-daemon.sh,
tests/monads.scm,
tests/pack.scm,
tests/packages.scm,
tests/profiles.scm,
tests/system.scm: Remove #:use-module (guix grafts).
</span></span></td><td>Ludovic Courtès</td></tr>