From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2F8C15808B for ; Sat, 9 Apr 2022 15:05:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01181E0903; Sat, 9 Apr 2022 15:05:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BDC1E0903 for ; Sat, 9 Apr 2022 15:05:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0AEB34109F for ; Sat, 9 Apr 2022 15:05:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 436F834F for ; Sat, 9 Apr 2022 15:05:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1649511651.b70d10d2259fa7c4a100ebb90f47719c40eb2cb8.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/Manifest dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch dev-qt/qtwebengine/metadata.xml dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b70d10d2259fa7c4a100ebb90f47719c40eb2cb8 X-VCS-Branch: master Date: Sat, 9 Apr 2022 15:05:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1006c642-2c64-491a-adfa-32207d773023 X-Archives-Hash: 7f154e63eba8825a2f046a43f9cbdce8 commit: b70d10d2259fa7c4a100ebb90f47719c40eb2cb8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 9 13:40:33 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 9 13:40:51 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b70d10d2 dev-qt/qtwebengine: Support build w/ py3, IUSE=screencast, fix ffmpeg5 ${PN}-5.15.3_p20220406-patchset contains patches to drop catapult as well. Bug: https://bugs.gentoo.org/698988 Thanks-to: Jimi Huotari gentoo.org> Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/Manifest | 1 + ... => qtwebengine-5.15.3_p20220406-ffmpeg5.patch} | 32 +++++++++++----------- dev-qt/qtwebengine/metadata.xml | 1 + dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 12 +++++--- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 3d567b3b..1673d115 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,4 +1,5 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89 +DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840 DIST qtwebengine-everywhere-src-6.2.3.tar.xz 369703936 BLAKE2B 2418cc900b8fde42bb5753fef554525bfd3cc4bbe5a2f07a1daae626309c6d29da0eb2a173612924a27b4c85d3bdf1e0d3f57ffd6a4703a6a66fb36e235f3cd1 SHA512 8b2c8decbff025d756c1c083ff6c734b3edfb50613d8bdf9c272468c41c8ba89d22164ca440073fb706b735668bb8b0d30a166305a140f61a3acb3b46def4e01 DIST qtwebengine-everywhere-src-6.2.4.tar.xz 369689936 BLAKE2B ab38c0af341393c95188ccbe498953e8b47c78a75f0aa3695defbb80981ec77702ff8a42c78fcf9c90ad21a8f4b3147b9d199e6b7fea49af5d1b0b1af821fbe1 SHA512 b76aa6f0b5aa33a178bcf6ebd0256776f5aa20eb763599b0ccd2b6fc544bf8a189a12fbf8f0e0d7414c99e6975b20d9127f6a53bc6126904d487efb6d472008f 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 d85c1985..15c19266 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 #include @@ -28,8 +28,8 @@ index 2734a485cbd..70b1877a43c 100644 #include 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/metadata.xml b/dev-qt/qtwebengine/metadata.xml index 0bc98db9..6912e8aa 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -15,6 +15,7 @@ Enable physical position determination via dev-qt/qtpositioning Combine source files to speed up build process. Enable PipeWire support for WebRTC. + Enable support for remote desktop and screen cast using media-video/pipewire Use the system-wide media-video/ffmpeg instead of bundled. Use the system-wide dev-libs/icu instead of bundled. Enable QtWidgets support diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild index b755d163..8d3e80b6 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{9,10} ) PYTHON_REQ_USE="xml(+)" inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs @@ -28,9 +28,10 @@ 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 +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -80,6 +81,7 @@ RDEPEND=" geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) + screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( @@ -106,8 +108,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746 - "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # fixes build with clang 14 + "${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() { @@ -200,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 @@ -243,6 +246,7 @@ 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) )