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 F1172158089 for ; Wed, 13 Sep 2023 16:42:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E28B02BC02F; Wed, 13 Sep 2023 16:42:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 C00842BC02F for ; Wed, 13 Sep 2023 16:42:07 +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 CB039335CEA for ; Wed, 13 Sep 2023 16:42:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39CCE11AD for ; Wed, 13 Sep 2023 16:42:04 +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: <1694623220.304b8a6226b03e31d374495ae159a5d71d0bc733.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.6.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: 304b8a6226b03e31d374495ae159a5d71d0bc733 X-VCS-Branch: master Date: Wed, 13 Sep 2023 16:42:04 +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: 2324b1c0-29d6-484a-935b-c0c7d6bc235f X-Archives-Hash: 6aa73020fd134abbe0de367e48f6fc1a commit: 304b8a6226b03e31d374495ae159a5d71d0bc733 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 13 14:00:27 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 13 16:40:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304b8a62 dev-qt/qtwebengine: add IUSE=vaapi in 6.6+ wrt [X], it currently auto-uses va_x11.h if ozone x11 is enabled, it *could* be optional (use_vaapi_x11) but it probably makes little sense to introduce IUSE=X unless we can make ozone_x11 optional too. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 18 ++++++++++++++---- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index dbb97f456745..603fe3d64dec 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -20,8 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos - opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets + +alsa bindist custom-cflags designer geolocation +jumbo-build + kerberos opengl pdfium pulseaudio qml screencast +system-icu + vaapi vulkan +widgets " REQUIRED_USE=" designer? ( qml widgets ) @@ -44,7 +45,6 @@ RDEPEND=" media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= - media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus @@ -76,6 +76,12 @@ RDEPEND=" x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) + vaapi? ( + media-libs/libva:=[X] + media-libs/mesa[gbm(+)] + x11-libs/libdrm + ) + !vaapi? ( media-libs/libvpx:= ) widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " DEPEND=" @@ -177,6 +183,7 @@ src_configure() { $(qt_feature pulseaudio webengine_system_pulseaudio) $(qt_feature screencast webengine_webrtc_pipewire) $(qt_feature system-icu webengine_system_icu) + $(qt_feature vaapi webengine_vaapi) $(qt_feature vulkan webengine_vulkan) -DQT_FEATURE_webengine_embedded_build=OFF -DQT_FEATURE_webengine_extensions=ON @@ -195,10 +202,13 @@ src_configure() { # (see discussions in https://github.com/gentoo/gentoo/pull/32281) -DQT_FEATURE_webengine_system_re2=OFF + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ freetype glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libvpx libwebp \ + libopenjpeg2 libpci libpng libtiff libwebp \ libxml minizip opus poppler snappy zlib) # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index dbb97f456745..603fe3d64dec 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -20,8 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos - opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets + +alsa bindist custom-cflags designer geolocation +jumbo-build + kerberos opengl pdfium pulseaudio qml screencast +system-icu + vaapi vulkan +widgets " REQUIRED_USE=" designer? ( qml widgets ) @@ -44,7 +45,6 @@ RDEPEND=" media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= - media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus @@ -76,6 +76,12 @@ RDEPEND=" x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) + vaapi? ( + media-libs/libva:=[X] + media-libs/mesa[gbm(+)] + x11-libs/libdrm + ) + !vaapi? ( media-libs/libvpx:= ) widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " DEPEND=" @@ -177,6 +183,7 @@ src_configure() { $(qt_feature pulseaudio webengine_system_pulseaudio) $(qt_feature screencast webengine_webrtc_pipewire) $(qt_feature system-icu webengine_system_icu) + $(qt_feature vaapi webengine_vaapi) $(qt_feature vulkan webengine_vulkan) -DQT_FEATURE_webengine_embedded_build=OFF -DQT_FEATURE_webengine_extensions=ON @@ -195,10 +202,13 @@ src_configure() { # (see discussions in https://github.com/gentoo/gentoo/pull/32281) -DQT_FEATURE_webengine_system_re2=OFF + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ freetype glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libvpx libwebp \ + libopenjpeg2 libpci libpng libtiff libwebp \ libxml minizip opus poppler snappy zlib) # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON