[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

[Andreas Sturmlechner]

commit:     2d116d254a1306d4ead0244525846b3eb11f52f9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 12:49:26 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 16:03:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d116d25

dev-qt/qtwebengine: 5.15.3_p20220406 version bump

Fix 5.15.3 version downsedding after 5.15.10 bump
No additional security fixes in webengine-chromium over p20220330.
${P}-patchset contains patches to drop catapult as well.

Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtwebengine/Manifest                        |  3 +-
 ... => qtwebengine-5.15.3_p20220406-ffmpeg5.patch} | 32 +++++++++++-----------
 ....ebuild => qtwebengine-5.15.3_p20220406.ebuild} | 10 ++++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8dfa38137abb..df0bef8de677 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,4 +2,5 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
 DIST qtwebengine-5.15.3_p20220329.tar.xz 318910384 BLAKE2B df4e88628eed5fa2304eec986dd397cd5f51e42f9fdf2dca1bc6d84ad40be406d112701124c745d003b4c22a33d5a69b39b66747e7b9a970a7c91b46ef3943f7 SHA512 650d9056477479fc4630102d7270185c99cdf1ec855f3f407725dd74a737756b7180565a924594c1b75dcbb061d3642af2447610bf22acd9c4cb2c90c7cf842b
-DIST qtwebengine-5.15.3_p20220330.tar.xz 401852524 BLAKE2B 7ac18135a9c0f99085db332c1b324308cc5c5a350b978bb6944e93a203174390f31ce6addcc9b89ba40a305b6af68cc9b0516fd6d90f8ee12d0d24e60b11d0d1 SHA512 53e95548c1fb2fe37f2e63dff56306e6e34f2f1a5e8d811145600111d586528060d26c6ae9833f0a7ad4fee029d44a8275f8c5ac5d511b72fbd24fb0812f592b
+DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
+DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
similarity index 87%
rename from dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
index d85c1985883c..15c192667f22 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
@@ -16,8 +16,8 @@ Subject: [PATCH] Fix build with ffmpeg 5
 
 diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
 index 2734a485cbd..70b1877a43c 100644
---- a/chromium/media/ffmpeg/ffmpeg_common.h
-+++ b/chromium/media/ffmpeg/ffmpeg_common.h
+--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
++++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
 @@ -29,6 +29,7 @@ extern "C" {
  #include <libavformat/avformat.h>
  #include <libavformat/avio.h>
@@ -28,8 +28,8 @@ index 2734a485cbd..70b1877a43c 100644
  #include <libavutil/mastering_display_metadata.h>
 diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc
 index cb81d920def..bd73908d0ca 100644
---- a/chromium/media/filters/audio_file_reader.cc
-+++ b/chromium/media/filters/audio_file_reader.cc
+--- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
++++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
 @@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
  }
  
@@ -41,8 +41,8 @@ index cb81d920def..bd73908d0ca 100644
      if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
 diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc
 index 0d825ed791b..72fac6167ef 100644
---- a/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ b/chromium/media/filters/ffmpeg_audio_decoder.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
 @@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
      }
    }
@@ -54,8 +54,8 @@ index 0d825ed791b..72fac6167ef 100644
      DLOG(ERROR) << "Could not initialize audio decoder: "
 diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc
 index d34db63f3ef..427565b00c1 100644
---- a/chromium/media/filters/ffmpeg_demuxer.cc
-+++ b/chromium/media/filters/ffmpeg_demuxer.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
 @@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
  
    // Next try to use the first DTS value, for codecs where we know PTS == DTS
@@ -105,8 +105,8 @@ index d34db63f3ef..427565b00c1 100644
              packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
 diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc
 index 0ef3521473d..8483ecc348f 100644
---- a/chromium/media/filters/ffmpeg_glue.cc
-+++ b/chromium/media/filters/ffmpeg_glue.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
 @@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
  }
  
@@ -127,8 +127,8 @@ index 0ef3521473d..8483ecc348f 100644
    format_context_->error_recognition |= AV_EF_EXPLODE;
 diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc
 index ef12477ee89..7996606f5f9 100644
---- a/chromium/media/filters/ffmpeg_video_decoder.cc
-+++ b/chromium/media/filters/ffmpeg_video_decoder.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
 @@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
    if (decode_nalus_)
      codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
@@ -140,8 +140,8 @@ index ef12477ee89..7996606f5f9 100644
      return false;
 diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
 index 59c2a2fc618..1a9872c7acb 100644
---- a/chromium/media/filters/media_file_checker.cc
-+++ b/chromium/media/filters/media_file_checker.cc
+--- a/src/3rdparty/chromium/media/filters/media_file_checker.cc
++++ b/src/3rdparty/chromium/media/filters/media_file_checker.cc
 @@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
        auto context = AVStreamToAVCodecContext(format_context->streams[i]);
        if (!context)
@@ -153,8 +153,8 @@ index 59c2a2fc618..1a9872c7acb 100644
          stream_contexts[i] = {std::move(context), std::move(loop)};
 diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
 index 9002b874611..d12fade8b63 100644
---- a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-+++ b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
 @@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
    // a pointer |this|.
    av_context_->opaque = this;

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220330.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
similarity index 95%
rename from dev-qt/qtwebengine/qtwebengine-5.15.3_p20220330.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index cf465387eacb..2cc0403ea2bd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220330.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -28,6 +28,7 @@ fi
 
 # ppc64 patchset based on https://github.com/chromium-ppc64le releases
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+	https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
 	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
 
 IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
@@ -109,6 +110,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
 	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
 	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
 )
 
 qtwebengine_check-reqs() {
@@ -167,10 +169,10 @@ src_prepare() {
 		# This is made from git, and for some reason will fail w/o .git directories.
 		mkdir -p .git src/3rdparty/chromium/.git || die
 	fi
-	# We need to make sure this integrates well into Qt 5.15.2 installation.
+	# We need to make sure this integrates well into Qt 5.15.3 installation.
 	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
 	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
-	sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
+	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
 
 	# QTBUG-88657 - jumbo-build could still make trouble
 	if ! use jumbo-build; then
@@ -201,7 +203,7 @@ src_prepare() {
 	fi
 
 	if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
-		eapply "${FILESDIR}/${PN}-5.15.3_p20220330-ffmpeg5.patch" # by Archlinux, bug 831437
+		eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
 	fi
 
 	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
@@ -244,9 +246,9 @@ src_configure() {
 		$(qt_use geolocation webengine-geolocation)
 		$(qt_use kerberos webengine-kerberos)
 		$(qt_use pulseaudio)
+		$(usex screencast -webengine-webrtc-pipewire '')
 		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
 		$(qt_use system-icu webengine-icu)
-		$(usex screencast -webengine-webrtc-pipewire '')
 	)
 	qt5-build_src_configure
 }