commit:     12566530e51223f01472b89ab6fdbd898d93111f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 07:40:03 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 15:05:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12566530

dev-qt/qtwebengine: always depend on mesa+libdrm in 6.7+

Missed that this is now always used in 6.7, *could* be skipped
by enabling minigbm but that is a intel-only alternative.

Not worth a revbump+rebuild given qtbase[gui] pulls libdrm either
way and unlikely for mesa to be missing.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild    | 10 +++-------
 dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 10 +++-------
 dev-qt/qtwebengine/qtwebengine-6.9999.ebuild   | 10 +++-------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 8f64365294d5..ce4b07c90f2c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
        media-libs/libjpeg-turbo:=
        media-libs/libpng:=
        media-libs/libwebp:=
+       media-libs/mesa[gbm(+)]
        media-libs/openjpeg:2=
        media-libs/opus
        media-libs/tiff:=
@@ -61,6 +62,7 @@ RDEPEND="
        x11-libs/libXfixes
        x11-libs/libXrandr
        x11-libs/libXtst
+       x11-libs/libdrm
        x11-libs/libxcb:=
        x11-libs/libxkbcommon
        x11-libs/libxkbfile
@@ -71,16 +73,10 @@ RDEPEND="
        pulseaudio? ( media-libs/libpulse[glib] )
        screencast? (
                dev-libs/glib:2
-               media-libs/mesa[gbm(+)]
                media-video/pipewire:=
-               x11-libs/libdrm
        )
        system-icu? ( dev-libs/icu:= )
-       vaapi? (
-               media-libs/libva:=[X]
-               media-libs/mesa[gbm(+)]
-               x11-libs/libdrm
-       )
+       vaapi? ( media-libs/libva:=[X] )
        !vaapi? ( media-libs/libvpx:= )
 "
 DEPEND="

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 69e355090337..bab0b63fc807 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
        media-libs/libjpeg-turbo:=
        media-libs/libpng:=
        media-libs/libwebp:=
+       media-libs/mesa[gbm(+)]
        media-libs/openjpeg:2=
        media-libs/opus
        media-libs/tiff:=
@@ -61,6 +62,7 @@ RDEPEND="
        x11-libs/libXfixes
        x11-libs/libXrandr
        x11-libs/libXtst
+       x11-libs/libdrm
        x11-libs/libxcb:=
        x11-libs/libxkbcommon
        x11-libs/libxkbfile
@@ -71,16 +73,10 @@ RDEPEND="
        pulseaudio? ( media-libs/libpulse[glib] )
        screencast? (
                dev-libs/glib:2
-               media-libs/mesa[gbm(+)]
                media-video/pipewire:=
-               x11-libs/libdrm
        )
        system-icu? ( dev-libs/icu:= )
-       vaapi? (
-               media-libs/libva:=[X]
-               media-libs/mesa[gbm(+)]
-               x11-libs/libdrm
-       )
+       vaapi? ( media-libs/libva:=[X] )
        !vaapi? ( media-libs/libvpx:= )
 "
 DEPEND="

diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 311a9544dc48..501485c774f4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
        media-libs/libjpeg-turbo:=
        media-libs/libpng:=
        media-libs/libwebp:=
+       media-libs/mesa[gbm(+)]
        media-libs/openjpeg:2=
        media-libs/opus
        media-libs/tiff:=
@@ -61,6 +62,7 @@ RDEPEND="
        x11-libs/libXfixes
        x11-libs/libXrandr
        x11-libs/libXtst
+       x11-libs/libdrm
        x11-libs/libxcb:=
        x11-libs/libxkbcommon
        x11-libs/libxkbfile
@@ -71,16 +73,10 @@ RDEPEND="
        pulseaudio? ( media-libs/libpulse[glib] )
        screencast? (
                dev-libs/glib:2
-               media-libs/mesa[gbm(+)]
                media-video/pipewire:=
-               x11-libs/libdrm
        )
        system-icu? ( dev-libs/icu:= )
-       vaapi? (
-               media-libs/libva:=[X]
-               media-libs/mesa[gbm(+)]
-               x11-libs/libdrm
-       )
+       vaapi? ( media-libs/libva:=[X] )
        !vaapi? ( media-libs/libvpx:= )
 "
 DEPEND="

Reply via email to