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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB32E158083 for ; Wed, 25 Sep 2024 02:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F12522BC013; Wed, 25 Sep 2024 02:20:53 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3EF32BC013 for ; Wed, 25 Sep 2024 02:20:53 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB5A134316A for ; Wed, 25 Sep 2024 02:20:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 725401F2E for ; Wed, 25 Sep 2024 02:20:50 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1727228990.bbe03f19766167b539b90af2034340e61ed90e81.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: bbe03f19766167b539b90af2034340e61ed90e81 X-VCS-Branch: master Date: Wed, 25 Sep 2024 02:20:50 +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: 55d311cc-e2c7-43c0-9c8a-e2e2c920f98f X-Archives-Hash: 82e356a06c78a5c9b0470e8806e5fae4 commit: bbe03f19766167b539b90af2034340e61ed90e81 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 25 01:28:23 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 25 01:49:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe03f19 dev-qt/qtwebengine: fix build with USE=-vaapi in 6.8+ Per the comment, already couldn't use system's libvpv when USE=vaapi is enabled (this is intentionally enforced by the build system rather than "broken"), and now USE=-vaapi fails to build in 6.8 with system's. Seems like an easy fix but (even if fixed) feel it would be simpler keep the same setup regardless of USE=vaapi until vaapi allows using system's. I hardly test USE=-vaapi and missed that it broke, and I assume this holds for upstream too. qtwebengine does keep bundled libvpx either up to date or backports security fixes, albeit bumps are less frequent and fixes could lag a bit (not that we had a choice with USE=vaapi either way, unless drop vaapi support). As a small perk, it'll spare users from rebuilding qtwebengine on libvpx subslot bumps which happen now and then. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild | 7 ++++--- dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 7 ++++--- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild index 040cde6137b6..6b40caa515b0 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild @@ -77,7 +77,6 @@ RDEPEND=" ) system-icu? ( dev-libs/icu:= ) vaapi? ( media-libs/libva:=[X] ) - !vaapi? ( media-libs/libvpx:= ) " DEPEND=" ${RDEPEND} @@ -207,8 +206,10 @@ src_configure() { # this by default in 6.7.3+ (bug #913923) -DQT_FEATURE_webengine_system_re2=OFF - # bundled is currently required when using vaapi (forced regardless) - $(qt_feature !vaapi webengine_system_libvpx) + # system_libvpx=ON is intentionally ignored with USE=vaapi which leads + # to using system's being less tested, prefer disabling for now until + # vaapi can use it as well + -DQT_FEATURE_webengine_system_libvpx=OFF # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 040cde6137b6..6b40caa515b0 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -77,7 +77,6 @@ RDEPEND=" ) system-icu? ( dev-libs/icu:= ) vaapi? ( media-libs/libva:=[X] ) - !vaapi? ( media-libs/libvpx:= ) " DEPEND=" ${RDEPEND} @@ -207,8 +206,10 @@ src_configure() { # this by default in 6.7.3+ (bug #913923) -DQT_FEATURE_webengine_system_re2=OFF - # bundled is currently required when using vaapi (forced regardless) - $(qt_feature !vaapi webengine_system_libvpx) + # system_libvpx=ON is intentionally ignored with USE=vaapi which leads + # to using system's being less tested, prefer disabling for now until + # vaapi can use it as well + -DQT_FEATURE_webengine_system_libvpx=OFF # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 040cde6137b6..6b40caa515b0 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -77,7 +77,6 @@ RDEPEND=" ) system-icu? ( dev-libs/icu:= ) vaapi? ( media-libs/libva:=[X] ) - !vaapi? ( media-libs/libvpx:= ) " DEPEND=" ${RDEPEND} @@ -207,8 +206,10 @@ src_configure() { # this by default in 6.7.3+ (bug #913923) -DQT_FEATURE_webengine_system_re2=OFF - # bundled is currently required when using vaapi (forced regardless) - $(qt_feature !vaapi webengine_system_libvpx) + # system_libvpx=ON is intentionally ignored with USE=vaapi which leads + # to using system's being less tested, prefer disabling for now until + # vaapi can use it as well + -DQT_FEATURE_webengine_system_libvpx=OFF # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \