3 files changed, 3 insertions(+), 65 deletions(-)

M gnu/local.mk
M gnu/packages/audio.scm
D gnu/packages/patches/audacity-ffmpeg-fallback.patch

@@ 998,7 998,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
   %D%/packages/patches/ath9k-htc-firmware-gcc-compat.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		\

@@ 50,6 50,7 @@
 ;;; Copyright © 2024 mio <stigma@disroot.org>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
 ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 925,7 926,7 @@ engineers, musicians, soundtrack editors and composers.")
 (define-public audacity
   (package
     (name "audacity")
-    (version "3.5.1")            ;for ffmpeg 6 support
+    (version "3.6.0")            ;for ffmpeg 6 support
     (source
      (origin
        (method git-fetch)


@@ 934,8 935,7 @@ engineers, musicians, soundtrack editors and composers.")
              (commit (string-append "Audacity-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1"))
-       (patches (search-patches "audacity-ffmpeg-fallback.patch"))
+        (base32 "1mdszrdv54737krsdbip84qc0anz83nsbz1hcnymwa09rrcrrlv4"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove bundled libraries.

@@ 1,61 0,0 @@
-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 {};
-    }
- };