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/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
 
@@ -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/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
+++ b/libraries/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 {};
    }
 };
='/guix/log/configure.ac?id=a27e4eed2d045cfe42bea37f2f88ab026332b82d'>configure.ac</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/configure.ac?id=a27e4eed2d045cfe42bea37f2f88ab026332b82d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-10-22 20:35:15 -0400'>2023-10-22</span></td><td><a href='/guix/commit/configure.ac?id=4cf4dcb8b31274a8dfba6bae3a6826a1b521da3f'>teams: Adjust shebang to use 'guix repl'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This ensures the correct Guix dependencies are always available for the
script.

* etc/teams.scm.in: Rename to...
* etc/teams.scm: ... this.  Adjust shebang.
* .gitignore: No longer ignore it.
* configure.ac: Do not process it with AC_CONFIG_FILES.

Reported-by: Clément Lassieur &lt;clement@lassieur.org&gt;
Fixes: https://issues.guix.gnu.org/66605
Change-Id: I7a01750c6c5f0696b6c36b1e6caa9389d9e6822c
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-09-26 17:36:58 +0200'>2023-09-26</span></td><td><a href='/guix/commit/configure.ac?id=f651a359691cbe4750f1fe8d14dd964f7971f916'>build: Add dependency on Git.</a><span class='msg-avail'>...<span class='msg-tooltip'>* configure.ac: Check for ‘git’ and substitute ‘GIT’.
* guix/config.scm.in (%git): New variable.
* guix/self.scm (compiled-guix): Define ‘git’ and pass it to
‘make-config.scm’.
(make-config.scm): Add #:git; emit a ‘%git’ variable.
* doc/guix.texi (Requirements): Add it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-07-03 14:12:32 +0200'>2022-07-03</span></td><td><a href='/guix/commit/configure.ac?id=4eaf90470f466b3fdab87f6961cb18bb348d433f'>etc: Add teams.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/teams.scm.in: New file.
* configure.ac: Generate executable.
* .gitignore: Ignore generated file.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2022-01-25 23:54:44 +0100'>2022-01-25</span></td><td><a href='/guix/commit/configure.ac?id=d582b399781f6fd80c63d07746524196603972e4'>build: Require Guile &gt;= 3.0.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/53157&gt;.
Reported by Efraim Flashner &lt;efraim@flashner.co.il&gt;.

* configure.ac: Require Guile &gt;= 3.0.3.
* doc/guix.texi (Requirements): Update accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-11-23 10:24:25 +0100'>2021-11-23</span></td><td><a href='/guix/commit/configure.ac?id=bdf5c16ac052af2ca9d5c3acc4acbc08fd9fdbea'>maint: "make dist" builds tarballs in 'ustar' format.</a><span class='msg-avail'>...<span class='msg-tooltip'>This allows us to have file names longer than 99 characters.

* configure.ac: Pass 'tar-ustar' to 'AM_INIT_AUTOMAKE'.
</span></span></td><td>Ludovic Courtès</td></tr>