On Sat, Feb 26, 2022 at 05:01:49PM +0000, Stuart Henderson wrote:
> Try removing the version, check for e.g. libavformat.so
>
> If it just passes them to dlopen then that should be good enough, if
> it does something else (like check for existence rather than just trying
> to open it directly) then it may need more work
Thanks for the suggestion, that works! Learned something new today.
I think the patch is obvious enough so I didn't add a comment. If
desired I can still add one, of course.
Caspar
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile 23 Oct 2021 20:40:24 -0000 1.80
+++ Makefile 26 Feb 2022 18:01:19 -0000
@@ -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
Index: patches/patch-src_FFmpeg_h
===================================================================
RCS file: /cvs/ports/audio/audacity/patches/patch-src_FFmpeg_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_FFmpeg_h
--- patches/patch-src_FFmpeg_h 14 Feb 2021 08:36:20 -0000 1.4
+++ patches/patch-src_FFmpeg_h 26 Feb 2022 18:01:19 -0000
@@ -3,6 +3,27 @@ $OpenBSD: patch-src_FFmpeg_h,v 1.4 2021/
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*,
