commit: 87b76a8c153f9bd218ed56a2453db99bbbd0a7e7
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 11:50:05 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 11:54:24 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=87b76a8c
dev-qt/qtwebengine: adjust 6.* Chromium versions/deps/USE
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 2 --
dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild | 10 +++++-----
dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild | 10 +++++-----
dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 12 ++++++------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 12 ++++++------
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 6912e8aa..415d7465 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -14,8 +14,6 @@
<flag name="designer">Install the QWebEngineView plugin used to
add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build
process.</flag>
- <flag name="pipewire">Enable PipeWire support for WebRTC.</flag>
- <flag name="screencast">Enable support for remote desktop and
screen cast using <pkg>media-video/pipewire</pkg></flag>
<flag name="system-ffmpeg">Use the system-wide
<pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
<flag name="system-icu">Use the system-wide
<pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
index 22780c57..2ce46d9a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="101.0.4951.64"
+CHROMIUM_PATCHES_VER="104.0.5112.81"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire
pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio
screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
index 22780c57..2ce46d9a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="101.0.4951.64"
+CHROMIUM_PATCHES_VER="104.0.5112.81"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire
pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio
screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
index 22780c57..8e78b6ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="101.0.4951.64"
+CHROMIUM_VER="102.0.5005.177"
+CHROMIUM_PATCHES_VER="104.0.5112.102"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire
pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio
screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index c508309f..8e78b6ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="99.0.4844.84"
+CHROMIUM_VER="102.0.5005.177"
+CHROMIUM_PATCHES_VER="104.0.5112.102"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire
pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio
screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
