summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2024-09-02 12:46:29 -0400
committerIonen Wolkens <ionen@gentoo.org>2024-09-02 13:51:30 -0400
commit894fa2bb4a4bf85e044347434ffff673fbca440e (patch)
tree57e475d47e33921c35dcd51c55965ade5e92d7be /dev-qt
parentdev-qt/qtwebengine: update live (diff)
downloadgentoo-894fa2bb4a4bf85e044347434ffff673fbca440e.tar.gz
gentoo-894fa2bb4a4bf85e044347434ffff673fbca440e.tar.bz2
gentoo-894fa2bb4a4bf85e044347434ffff673fbca440e.zip
dev-qt/qtmultimedia: update live
Partially imported from 6.8.9999 due to same changes landing in 6.7. Not really tested yet. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild23
1 files changed, 19 insertions, 4 deletions
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index f92c651b8b19..4aefaf7a465a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -11,15 +11,20 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+IUSE="
+ +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
+ qml v4l vaapi vulkan wayland
+"
# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
REQUIRED_USE="
|| ( ffmpeg gstreamer )
eglfs? ( ffmpeg opengl qml )
- vaapi? ( ffmpeg opengl )
test? ( qml )
+ vaapi? ( ffmpeg opengl )
"
+# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
+# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
RDEPEND="
~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
alsa? (
@@ -37,8 +42,12 @@ RDEPEND="
gstreamer? (
dev-libs/glib:2
media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0[X=,opengl?]
+ media-libs/gst-plugins-base:1.0[X=]
media-libs/gstreamer:1.0
+ opengl? (
+ ~dev-qt/qtbase-${PV}:6[X?,wayland?]
+ media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
+ )
)
opengl? ( media-libs/libglvnd )
pulseaudio? ( media-libs/libpulse )
@@ -81,7 +90,13 @@ src_configure() {
$(cmake_use_find_package qml Qt6Qml)
$(qt_feature ffmpeg)
$(qt_feature gstreamer)
- $(usev gstreamer $(qt_feature opengl gstreamer_gl))
+ $(usev gstreamer "
+ $(qt_feature opengl gstreamer_gl)
+ $(usev opengl "
+ $(qt_feature X gstreamer_gl_x11)
+ $(qt_feature wayland gstreamer_gl_wayland)
+ ")
+ ")
$(qt_feature pulseaudio)
$(qt_feature v4l linux_v4l)
$(qt_feature vaapi)