这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(x11/audacity): force the use of audacity-ffmpeg at the exclusion of all other FFmpeg #27263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(x11/audacity): force the use of audacity-ffmpeg at the exclusion of all other FFmpeg #27263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x11-packages/audacity/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="An easy-to-use, multi-track audio editor and recorder"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.7.5"
TERMUX_PKG_REVISION=1
_FFMPEG_VERSION=7.1.1
TERMUX_PKG_SRCURL=(https://github.com/audacity/audacity/archive/Audacity-${TERMUX_PKG_VERSION}.tar.gz
https://www.ffmpeg.org/releases/ffmpeg-${_FFMPEG_VERSION}.tar.xz)
Expand Down
17 changes: 17 additions & 0 deletions x11-packages/audacity/force-ffmpeg-absolute-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
For some reason, the user-specified path of ffmpeg libraries is not being respected by
audacity anymore, and is not being prepended to the relative path from BuildAVFormatPaths(),
so audacity-ffmpeg cannot be automatically or manually selected anymore.
This forces audacity to use only audacity-ffmpeg and prevents it from attempting to
use any other ffmpeg.

--- a/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
+++ b/modules/import-export/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
@@ -134,7 +134,7 @@ std::vector<wxString> BuildAVFormatPaths(int version)
#elif defined(__OpenBSD__)
wxString::Format("libavformat.so"),
#else
- wxString::Format("libavformat.so.%d", version),
+ wxString::Format("@TERMUX_PREFIX@/opt/audacity/lib/libavformat.so.%d", version),
#endif
};
}