diff options
author | Andy Tai <atai@atai.org> | 2024-05-01 02:16:30 -0700 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-05-09 06:47:09 +0200 |
commit | cf5f7a8bf9ca2288700fcf351bbca0fc341ec969 (patch) | |
tree | fcd2cc8e70e596e81b565b7da86d13011b4a0568 /gnu | |
parent | 73818c254b8a833dc474105b9c3fb66b86227fc4 (diff) |
gnu: audacity: update to 3.5.1.
* gnu/packages/audio.scm (audacity): Update to 3.5.1.
[inputs]: Add opusfile and rapidjson.
* gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/audio.scm | 7 | ||||
-rw-r--r-- | gnu/packages/patches/audacity-ffmpeg-fallback.patch | 61 |
3 files changed, 4 insertions, 65 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index edd546f81d..439fe587b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -955,7 +955,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 \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 93ea4dca4e..ee411d54d6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -924,7 +924,7 @@ engineers, musicians, soundtrack editors and composers.") (define-public audacity (package (name "audacity") - (version "3.3.3") ;for ffmpeg 6 support + (version "3.5.1") ;for ffmpeg 6 support (source (origin (method git-fetch) @@ -933,8 +933,7 @@ engineers, musicians, soundtrack editors and composers.") (commit (string-append "Audacity-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv")) - (patches (search-patches "audacity-ffmpeg-fallback.patch")) + (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -969,6 +968,8 @@ engineers, musicians, soundtrack editors and composers.") ;;("libsbsms" ,libsbsms) ;bundled version is modified libsndfile mpg123 + opusfile + rapidjson soundtouch soxr ;replaces libsamplerate sqlite diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch deleted file mode 100644 index d18583c9bd..0000000000 --- a/gnu/packages/patches/audacity-ffmpeg-fallback.patch +++ /dev/null @@ -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/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 {}; - } - }; |