GNU bug report logs -
#70692
[PATCH] gnu: audacity: update to 3.5.1.
Previous Next
Reported by: Andy Tai <atai <at> atai.org>
Date: Wed, 1 May 2024 07:40:01 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To reply to this bug, email your comments to 70692 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#70692
; Package
guix-patches
.
(Wed, 01 May 2024 07:40:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Andy Tai <atai <at> atai.org>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Wed, 01 May 2024 07:40:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/audio.scm (audacity): Update to 3.5.1.
[inputs]: Add opusfile and rapidjson.
Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
---
gnu/packages/audio.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1a88698165..003670d7d7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -924,7 +924,7 @@ (define-public ardour
(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,8 @@ (define-public audacity
(commit (string-append "Audacity-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv"))
- (patches (search-patches "audacity-ffmpeg-fallback.patch"))
+ (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1"))
+ ;(patches (search-patches "audacity-ffmpeg-fallback.patch"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.
@@ -969,6 +969,8 @@ (define-public audacity
;;("libsbsms" ,libsbsms) ;bundled version is modified
libsndfile
mpg123
+ opusfile
+ rapidjson
soundtouch
soxr ;replaces libsamplerate
sqlite
base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd
--
2.34.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#70692
; Package
guix-patches
.
(Wed, 01 May 2024 09:12:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 70692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/audio.scm (audacity): Update to 3.5.1.
[inputs]: Add opusfile and rapidjson.
* gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete
Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
---
gnu/packages/audio.scm | 8 ++-
.../patches/audacity-ffmpeg-fallback.patch | 61 -------------------
2 files changed, 5 insertions(+), 64 deletions(-)
delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1a88698165..003670d7d7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -924,7 +924,7 @@ (define-public ardour
(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,8 @@ (define-public audacity
(commit (string-append "Audacity-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv"))
- (patches (search-patches "audacity-ffmpeg-fallback.patch"))
+ (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1"))
+ ;(patches (search-patches "audacity-ffmpeg-fallback.patch"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.
@@ -969,6 +969,8 @@ (define-public audacity
;;("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 <at> 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 <at> 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 {};
- }
- };
base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd
--
2.34.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#70692
; Package
guix-patches
.
(Wed, 01 May 2024 09:18:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 70692 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/audio.scm (audacity): Update to 3.5.1.
[inputs]: Add opusfile and rapidjson.
* gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete.
Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
---
gnu/packages/audio.scm | 7 ++-
.../patches/audacity-ffmpeg-fallback.patch | 61 -------------------
2 files changed, 4 insertions(+), 64 deletions(-)
delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1a88698165..7d4c7e269b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -924,7 +924,7 @@ (define-public ardour
(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 @@ (define-public audacity
(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 @@ (define-public audacity
;;("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 <at> 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 <at> 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 {};
- }
- };
base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd
--
2.34.1
Reply sent
to
Liliana Marie Prikler <liliana.prikler <at> gmail.com>
:
You have taken responsibility.
(Thu, 09 May 2024 11:40:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Andy Tai <atai <at> atai.org>
:
bug acknowledged by developer.
(Thu, 09 May 2024 11:40:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 70692-done <at> debbugs.gnu.org (full text, mbox):
Am Mittwoch, dem 01.05.2024 um 00:38 -0700 schrieb Andy Tai:
> * gnu/packages/audio.scm (audacity): Update to 3.5.1.
> [inputs]: Add opusfile and rapidjson.
>
> Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
> ---
Fixed and pushed.
Cheers!
Information forwarded
to
guix-patches <at> gnu.org
:
bug#70692
; Package
guix-patches
.
(Thu, 09 May 2024 18:01:01 GMT)
Full text and
rfc822 format available.
Message #19 received at 70692-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Thank you!
On Thu, May 9, 2024 at 4:38 AM Liliana Marie Prikler <
liliana.prikler <at> gmail.com> wrote:
> Am Mittwoch, dem 01.05.2024 um 00:38 -0700 schrieb Andy Tai:
> > * gnu/packages/audio.scm (audacity): Update to 3.5.1.
> > [inputs]: Add opusfile and rapidjson.
> >
> > Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
> > ---
> Fixed and pushed.
>
> Cheers!
>
--
Andy Tai, atai <at> atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2023 民國112年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能
[Message part 2 (text/html, inline)]
This bug report was last modified 8 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.