commit: 022f039ca7dc7edf353ac32b8235c415b2fc187b Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Dec 17 22:27:57 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Dec 17 22:49:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022f039c
dev-qt/qtmultimedia: require USE=opengl with vaapi Already depended on libglvnd for it but seems it needs support in QT as well (does not check/use QtOpenGL but qopenglfunctions.h is emptied by a #ifndef when disabled, resulting in messy errors rather than a missing header). Due to the required uses, can unify the libglvnd dep now. Closes: https://bugs.gentoo.org/920232 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../{qtmultimedia-6.6.1.ebuild => qtmultimedia-6.6.1-r1.ebuild} | 5 ++--- dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild | 5 ++--- dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild | 5 ++--- dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild similarity index 95% rename from dev-qt/qtmultimedia/qtmultimedia-6.6.1.ebuild rename to dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild index e01f6c8afb32..288061707bdb 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild @@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) - vaapi? ( ffmpeg ) + vaapi? ( ffmpeg opengl ) test? ( qml ) " @@ -30,15 +30,14 @@ RDEPEND=" x11-libs/libXext x11-libs/libXrandr ) - vaapi? ( media-libs/libglvnd ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 - opengl? ( media-libs/libglvnd ) ) + opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild index c3fee31965cc..3c69475face8 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild @@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) - vaapi? ( ffmpeg ) + vaapi? ( ffmpeg opengl ) test? ( qml ) " @@ -30,15 +30,14 @@ RDEPEND=" x11-libs/libXext x11-libs/libXrandr ) - vaapi? ( media-libs/libglvnd ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 - opengl? ( media-libs/libglvnd ) ) + opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild index c3fee31965cc..3c69475face8 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) - vaapi? ( ffmpeg ) + vaapi? ( ffmpeg opengl ) test? ( qml ) " @@ -30,15 +30,14 @@ RDEPEND=" x11-libs/libXext x11-libs/libXrandr ) - vaapi? ( media-libs/libglvnd ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 - opengl? ( media-libs/libglvnd ) ) + opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index c3fee31965cc..3c69475face8 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) - vaapi? ( ffmpeg ) + vaapi? ( ffmpeg opengl ) test? ( qml ) " @@ -30,15 +30,14 @@ RDEPEND=" x11-libs/libXext x11-libs/libXrandr ) - vaapi? ( media-libs/libglvnd ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 - opengl? ( media-libs/libglvnd ) ) + opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6
