audacity: don't pass incorrect versioned library names to dlopen() for ffmpeg

from Caspar Schutijser
This commit is contained in:
sthen 2022-02-26 18:38:56 +00:00
parent f6fca54cac
commit 1642417068
2 changed files with 24 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.80 2021/10/23 20:40:24 sthen Exp $
# $OpenBSD: Makefile,v 1.81 2022/02/26 18:38:56 sthen Exp $
COMMENT= free audio editor
@ -8,7 +8,7 @@ GH_ACCOUNT= audacity
GH_PROJECT= audacity
GH_TAGNAME= Audacity-2.4.2
DISTNAME= ${GH_TAGNAME:L}
REVISION= 0
REVISION= 1
CATEGORIES= audio

View File

@ -1,8 +1,29 @@
$OpenBSD: patch-src_FFmpeg_h,v 1.4 2021/02/14 08:36:20 ajacoutot Exp $
$OpenBSD: patch-src_FFmpeg_h,v 1.5 2022/02/26 18:38:56 sthen Exp $
Index: src/FFmpeg.h
--- src/FFmpeg.h.orig
+++ src/FFmpeg.h
@@ -333,17 +333,17 @@ class FFmpegLibs (public)
wxString GetLibAVFormatName()
{
- return (wxT("libavformat.so.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)));
+ return (wxT("libavformat.so"));
}
wxString GetLibAVCodecName()
{
- return (wxT("libavcodec.so.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)));
+ return (wxT("libavcodec.so"));
}
wxString GetLibAVUtilName()
{
- return (wxT("libavutil.so.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)));
+ return (wxT("libavutil.so"));
}
#endif // (__WXMAC__) || (__WXMSW__)
@@ -685,7 +685,7 @@ extern "C" {
FFMPEG_FUNCTION_WITH_RETURN(
AVOutputFormat*,