commit: 304b8a6226b03e31d374495ae159a5d71d0bc733
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 14:00:27 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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
