1
0

Accepting request 889851 from mozilla:Factory

- add compatibility for libavcodec58_134

OBS-URL: https://build.opensuse.org/request/show/889851
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=334
This commit is contained in:
Dominique Leuenberger 2021-05-05 18:39:06 +00:00 committed by Git OBS Bridge
commit 29f5ec3123
2 changed files with 25 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 2 12:03:26 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
- add compatibility for libavcodec58_134
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 18 09:01:32 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org> Sun Apr 18 09:01:32 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>

View File

@ -1,20 +1,34 @@
Index: firefox-78.0.2/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp # HG changeset patch
=================================================================== # Parent e4abeadbbb7a0c63c17177f1d14ea04c77c6128e
--- firefox-78.0.2.orig/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+++ firefox-78.0.2/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -30,6 +30,7 @@ static FFmpegLibWrapper sLibAV; --- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -22,23 +22,27 @@ class FFmpegDecoderModule {
static already_AddRefed<PlatformDecoderModule> Create(FFmpegLibWrapper*);
};
static FFmpegLibWrapper sLibAV;
static const char* sLibs[] = { static const char* sLibs[] = {
// clang-format off // clang-format off
#if defined(XP_DARWIN) #if defined(XP_DARWIN)
+ "libavcodec.58.134.dylib",
+ "libavcodec.58.91.dylib", + "libavcodec.58.91.dylib",
"libavcodec.58.dylib", "libavcodec.58.dylib",
"libavcodec.57.dylib", "libavcodec.57.dylib",
"libavcodec.56.dylib", "libavcodec.56.dylib",
@@ -37,6 +38,7 @@ static const char* sLibs[] = { "libavcodec.55.dylib",
"libavcodec.54.dylib", "libavcodec.54.dylib",
"libavcodec.53.dylib", "libavcodec.53.dylib",
#else #else
+ "libavcodec.so.58.134",
+ "libavcodec.so.58.91", + "libavcodec.so.58.91",
"libavcodec.so.58", "libavcodec.so.58",
"libavcodec-ffmpeg.so.58", "libavcodec-ffmpeg.so.58",
"libavcodec-ffmpeg.so.57", "libavcodec-ffmpeg.so.57",
"libavcodec-ffmpeg.so.56",
"libavcodec.so.57",
"libavcodec.so.56",
"libavcodec.so.55",
"libavcodec.so.54",