From 47a7a10c4f8802978d231d0954bad375b792f9d73c2e28f51fc64ee249cb582c Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 17 Jul 2020 15:04:42 +0000 Subject: [PATCH] Accepting request 821486 from home:badshah400:branches:mozilla:Factory - Add mozilla-libavcodec58_91.patch to link against updated soversion of libavcodec (58.91) with ffmpeg >= 4.3. OBS-URL: https://build.opensuse.org/request/show/821486 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=842 --- MozillaFirefox.changes | 6 ++++++ MozillaFirefox.spec | 2 ++ mozilla-libavcodec58_91.patch | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 mozilla-libavcodec58_91.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 5fab1d0..bec9787 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 17 01:28:49 UTC 2020 - Atri Bhattacharya + +- Add mozilla-libavcodec58_91.patch to link against updated + soversion of libavcodec (58.91) with ffmpeg >= 4.3. + ------------------------------------------------------------------- Sat Jul 11 11:08:06 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 89b3699..95bb5fa 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -208,6 +208,7 @@ Patch24: mozilla-bmo1602730.patch Patch25: mozilla-bmo998749.patch Patch26: mozilla-bmo1626236.patch Patch27: mozilla-s390x-skia-gradient.patch +Patch28: mozilla-libavcodec58_91.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -349,6 +350,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch28 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/mozilla-libavcodec58_91.patch b/mozilla-libavcodec58_91.patch new file mode 100644 index 0000000..7f58c5d --- /dev/null +++ b/mozilla-libavcodec58_91.patch @@ -0,0 +1,20 @@ +Index: firefox-78.0.2/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp +=================================================================== +--- firefox-78.0.2.orig/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp ++++ firefox-78.0.2/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp +@@ -30,6 +30,7 @@ static FFmpegLibWrapper sLibAV; + static const char* sLibs[] = { + // clang-format off + #if defined(XP_DARWIN) ++ "libavcodec.58.91.dylib", + "libavcodec.58.dylib", + "libavcodec.57.dylib", + "libavcodec.56.dylib", +@@ -37,6 +38,7 @@ static const char* sLibs[] = { + "libavcodec.54.dylib", + "libavcodec.53.dylib", + #else ++ "libavcodec.so.58.91", + "libavcodec.so.58", + "libavcodec-ffmpeg.so.58", + "libavcodec-ffmpeg.so.57",