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 2A5AA158089 for ; Sat, 11 Nov 2023 20:24:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72EE52BC06E; Sat, 11 Nov 2023 20:24:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 56E132BC06D for ; Sat, 11 Nov 2023 20:24:19 +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 A0A81335D97 for ; Sat, 11 Nov 2023 20:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BE46D5E for ; Sat, 11 Nov 2023 20:24:17 +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: <1699733894.d0803c33668dcaa9265b18f62dfc82df86b403e1.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/Manifest dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d0803c33668dcaa9265b18f62dfc82df86b403e1 X-VCS-Branch: master Date: Sat, 11 Nov 2023 20:24:17 +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: 2a7faf46-992a-44c7-aafe-72ff2c8b51c9 X-Archives-Hash: 6d741a6869181402729ed002e292717c commit: d0803c33668dcaa9265b18f62dfc82df86b403e1 Author: Niccolò Belli linuxsystems it> AuthorDate: Tue Sep 19 09:32:09 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 11 20:18:14 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d0803c33 dev-qt/qtwebengine: fix ppc64 bundled ffmpeg for 5.15 Closes: https://bugs.gentoo.org/904372 Signed-off-by: Niccolò Belli linuxsystems.it> Closes: https://github.com/gentoo/gentoo/pull/32922 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/Manifest | 1 + dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 37419731..88b8c511 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,2 +1,3 @@ +DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585eda0539f8adf988413aa52503caca3a347a62f75584efb42bcfa4832aadfc51fb98073f4ed3ddfc9701caf570e7186e0e1357af9569f SHA512 e0275ac4eb8d113581fc4fdf42be831903496b6ed95dca5b3d88113107e5453ee8c40df0e2956dd4e343b08e09c57607b1b82a78bf77a780225ff0030a249cef DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild index 01bed9ae..8adabbf0 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild @@ -28,8 +28,12 @@ else fi # ppc64 patchset based on https://github.com/chromium-ppc64le releases +# ppc64 ffmpeg patchset backported from chromium 98 on https://ppa.quickbuild.io/raptor-engineering-public/chromium/ubuntu/pool/main/c/chromium/ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz - ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )" + ppc64? ( + https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15-ffmpeg-ppc64le.tar.xz + )" IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets" REQUIRED_USE="designer? ( widgets )" @@ -212,6 +216,7 @@ src_prepare() { eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" pushd src/3rdparty/chromium > /dev/null || die eapply -p0 "${WORKDIR}/${PN}-ppc64le" + eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le" popd > /dev/null || die pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die mkdir -vp source/config/linux/ppc64 || die