diff options
| author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/audacity-ffmpeg-fallback.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/audacity-ffmpeg-fallback.patch')
| -rw-r--r-- | gnu/packages/patches/audacity-ffmpeg-fallback.patch | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch index b78956070a..d18583c9bd 100644 --- a/gnu/packages/patches/audacity-ffmpeg-fallback.patch +++ b/gnu/packages/patches/audacity-ffmpeg-fallback.patch @@ -8,13 +8,11 @@ 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(+) + +Bugs-added-by: Marius Bakke <[email protected]> diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt -index 8c5f06d7c..00810e4d0 100644 +index b8803a1f5..f86559cca 100644 --- a/libraries/lib-ffmpeg-support/CMakeLists.txt +++ b/libraries/lib-ffmpeg-support/CMakeLists.txt @@ -1,5 +1,7 @@ @@ -25,7 +23,7 @@ index 8c5f06d7c..00810e4d0 100644 set( SOURCES FFmpegTypes.h -@@ -100,6 +102,12 @@ if (${_OPT}use_ffmpeg) +@@ -107,6 +109,12 @@ if (${_OPT}use_ffmpeg) list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE ) endif() @@ -39,10 +37,10 @@ index 8c5f06d7c..00810e4d0 100644 "${DEFINITIONS}" "" ) diff --git a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp -index 66d085a0b..4eeb4aed3 100644 +index 55d6f676b..46640ef83 100644 --- a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp +++ b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp -@@ -238,6 +238,18 @@ struct FFmpegFunctions::Private final +@@ -246,6 +246,18 @@ struct FFmpegFunctions::Private final if (library->IsLoaded()) return library; @@ -58,9 +56,6 @@ index 66d085a0b..4eeb4aed3 100644 + } +#endif + - // Loading has failed. - // wxLogSysError doesn't report errors correctly on *NIX - #if defined(_WIN32) --- -2.34.0 - + return {}; + } + }; |