forked from kiss-community/repo
firefox: ffmpeg 6.0 fix
This commit is contained in:
parent
60d61f5efd
commit
ecbe3f3573
@ -1,5 +1,37 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
mkdir -p dom/media/platforms/ffmpeg/ffmpeg60/include/libavcodec
|
||||||
|
mkdir -p dom/media/platforms/ffmpeg/ffmpeg60/include/libavutil
|
||||||
|
|
||||||
|
cp dom/media/platforms/ffmpeg/ffmpeg57/include/COPYING.LGPLv2.1 \
|
||||||
|
dom/media/platforms/ffmpeg/ffmpeg60/include/COPYING.LGPLv2.1
|
||||||
|
cp dom/media/platforms/ffmpeg/ffmpeg58/include/libavutil/avconfig.h \
|
||||||
|
dom/media/platforms/ffmpeg/ffmpeg60/include/libavutil/avconfig.h
|
||||||
|
|
||||||
|
for f in \
|
||||||
|
include/libavcodec/avfft.h \
|
||||||
|
include/libavcodec/codec_desc.h \
|
||||||
|
include/libavutil/buffer.h \
|
||||||
|
include/libavutil/error.h \
|
||||||
|
include/libavutil/hwcontext_vaapi.h \
|
||||||
|
include/libavutil/intfloat.h \
|
||||||
|
include/libavutil/macros.h \
|
||||||
|
moz.build
|
||||||
|
do
|
||||||
|
cp "dom/media/platforms/ffmpeg/ffmpeg59/$f" \
|
||||||
|
"dom/media/platforms/ffmpeg/ffmpeg60/$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in \
|
||||||
|
libavcodec/codec.h \
|
||||||
|
libavcodec/version.h \
|
||||||
|
libavcodec/version_major.h \
|
||||||
|
libavutil/mem.h \
|
||||||
|
libavutil/version.h
|
||||||
|
do
|
||||||
|
cp "media/ffvpx/$f" "dom/media/platforms/ffmpeg/ffmpeg60/include/$f"
|
||||||
|
done
|
||||||
|
|
||||||
for p in *.patch; do
|
for p in *.patch; do
|
||||||
patch -p1 < "$p"
|
patch -p1 < "$p"
|
||||||
done
|
done
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
6aab55cdd1b13a9346faaa5073a2a5664eb09f8d31a6faa9ef2e7488c79fc6de04
|
6aab55cdd1b13a9346faaa5073a2a5664eb09f8d31a6faa9ef2e7488c79fc6de04
|
||||||
|
7ec529317ef480cc07f99a93c05ea8ff48e232c3cf11ed17f7a85d823fa401a5d2
|
||||||
|
206b47222dc1bf293ae78bd51d851163145852a2f2c90779abe6411de5594c7656
|
||||||
be44c4a1e76704bd9e0fa713f00b88e9897150eda359c3bf58c30461d9cf56e3c8
|
be44c4a1e76704bd9e0fa713f00b88e9897150eda359c3bf58c30461d9cf56e3c8
|
||||||
ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc
|
ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc
|
||||||
8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8
|
8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8
|
||||||
|
18997
extra/firefox/patches/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
Normal file
18997
extra/firefox/patches/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,24 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: stransky <stransky@redhat.com>
|
||||||
|
Date: Thu, 9 Mar 2023 13:16:19 +0000
|
||||||
|
Subject: [PATCH] Bug 1820416 Use correct FFVPX headers from ffmpeg 6.0
|
||||||
|
r=padenot
|
||||||
|
|
||||||
|
Differential Revision: https://phabricator.services.mozilla.com/D172116
|
||||||
|
---
|
||||||
|
dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
|
||||||
|
index 188b866fc9de..cda0960787a5 100644
|
||||||
|
--- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
|
||||||
|
+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
|
||||||
|
@@ -20,7 +20,7 @@ SOURCES += [
|
||||||
|
]
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
"..",
|
||||||
|
- "../ffmpeg59/include",
|
||||||
|
+ "../ffmpeg60/include",
|
||||||
|
"/media/mozva",
|
||||||
|
]
|
||||||
|
|
@ -1,4 +1,6 @@
|
|||||||
https://ftp.mozilla.org/pub/firefox/releases/111.0/source/firefox-111.0.source.tar.xz
|
https://ftp.mozilla.org/pub/firefox/releases/111.0/source/firefox-111.0.source.tar.xz
|
||||||
|
patches/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
|
||||||
|
patches/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
|
||||||
patches/fix-linux-header.patch
|
patches/fix-linux-header.patch
|
||||||
patches/musl-sandbox.patch
|
patches/musl-sandbox.patch
|
||||||
patches/no-atk.patch
|
patches/no-atk.patch
|
||||||
|
@ -1 +1 @@
|
|||||||
111.0 1
|
111.0 2
|
||||||
|
Loading…
Reference in New Issue
Block a user