commit: e1f72e004038ee9f0a33abb895611b5eb09d5663 Author: Niccolò Belli <niccolo.belli <AT> linuxsystems <DOT> it> AuthorDate: Tue Sep 19 09:32:09 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 8 19:46:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1f72e00
dev-qt/qtwebengine: fix ppc64 bundled ffmpeg for 5.15 Closes: https://bugs.gentoo.org/904372 Signed-off-by: Niccolò Belli <niccolo.belli <AT> linuxsystems.it> Closes: https://github.com/gentoo/gentoo/pull/32922 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 1 + dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index bb6934e2cf44..4ca85b8bbb71 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,3 +1,4 @@ +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.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb 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_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild index df9d095c85b5..3d0bb168f1bc 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.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
