Port QtWebEngine to use system ffmpeg 7

[Xi Ruoyao]

Arch uses this patch: ​https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/blob/main/qtwebengine-ffmpeg-7.patch

[Bruce Dubbs]

I'm not sure how it applies.

$ grep +++ ../qtwebengine-ffmpeg-7.patch
 .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++---------
 media/ffmpeg/ffmpeg_common.cc                 | 11 +++----
 media/filters/audio_file_reader.cc            |  9 +++---
 .../filters/audio_video_metadata_extractor.cc | 11 +++++--
 .../filters/ffmpeg_aac_bitstream_converter.cc |  7 +++--
 media/filters/ffmpeg_audio_decoder.cc         | 13 +++++----
+++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
+++ b/media/filters/audio_file_reader.cc
+++ b/media/filters/ffmpeg_aac_bitstream_converter.cc
+++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.h
+++ b/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_regression_tests.cc
+++ b/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_file_reader_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/audio_file_reader.cc

I guess after extracting qtwebengine it needs:

pushd src/3rdparty/chromium/
patch -Np1 -i ../../../../qtwebengine-ffmpeg-7.patch
popd

At least that applied with some offsets and fuzz.

I have not tried building.

[Xi Ruoyao]

patch -Np1 -d src/3rdparty/chromium < ../qtwebengine-ffmpeg-7.patch

should be easier. Note that using -i instead of < won't work.

[Bruce Dubbs]

Replying to Xi Ruoyao:

patch -Np1 -d src/3rdparty/chromium < ../qtwebengine-ffmpeg-7.patch

should be easier. Note that using -i instead of < won't work.

Wouldn't the output then be to stdout?

[Xi Ruoyao]

Replying to Bruce Dubbs:

Replying to Xi Ruoyao:

patch -Np1 -d src/3rdparty/chromium < ../qtwebengine-ffmpeg-7.patch

should be easier. Note that using -i instead of < won't work.

Wouldn't the output then be to stdout?

No, patch is not sed :).

[Douglas R. Reno]

Fixed at a7787e33ac19f43ac374e8e6ca193803b7247d52