commit: 7ce7065c9400ed9ee9936ae8e925c9bfa9a93c44
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 13:07:39 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun May 28 13:09:28 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7ce7065c
dev-qt/qtmultimedia: update DESCRIPTION and DEPENDENCIES
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild | 38 +++++++++++++++---------
dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 38 +++++++++++++++---------
2 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
index 508673ac..ab321e9e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
@@ -1,41 +1,51 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit qt6-build
-DESCRIPTION="Qt Multimedia"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6
framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
-IUSE="gstreamer"
+IUSE="alsa ffmpeg pulseaudio v4l"
RDEPEND="
=dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
+ =dev-qt/qtquick3d-${PV}*
=dev-qt/qtshadertools-${PV}*
=dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libglvnd
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? (
+ media-libs/libva:=
+ media-video/ffmpeg:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
)
+ pulseaudio? ( media-libs/libpulse[glib] )
+ v4l? ( sys-kernel/linux-headers )
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
+ x11-base/xorg-proto
"
src_configure() {
- # TODO: linux_v4l automagic
local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
+ -DQT_FEATURE_gstreamer=on
+ $(qt_feature alsa)
+ $(qt_feature ffmpeg)
+ $(qt_feature v4l linux_v4l)
+ $(qt_feature pulseaudio)
)
qt6-build_src_configure
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 508673ac..ab321e9e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -1,41 +1,51 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit qt6-build
-DESCRIPTION="Qt Multimedia"
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6
framework"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
-IUSE="gstreamer"
+IUSE="alsa ffmpeg pulseaudio v4l"
RDEPEND="
=dev-qt/qtbase-${PV}*[gui,network,widgets]
=dev-qt/qtdeclarative-${PV}*
+ =dev-qt/qtquick3d-${PV}*
=dev-qt/qtshadertools-${PV}*
=dev-qt/qtsvg-${PV}*
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libglvnd
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libglvnd
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? (
+ media-libs/libva:=
+ media-video/ffmpeg:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
)
+ pulseaudio? ( media-libs/libpulse[glib] )
+ v4l? ( sys-kernel/linux-headers )
"
DEPEND="${RDEPEND}
- gstreamer? ( x11-base/xorg-proto )
+ x11-base/xorg-proto
"
src_configure() {
- # TODO: linux_v4l automagic
local mycmakeargs=(
- -DQT_FEATURE_alsa=off
- -DQT_FEATURE_pulseaudio=off
- $(qt_feature gstreamer)
+ -DQT_FEATURE_gstreamer=on
+ $(qt_feature alsa)
+ $(qt_feature ffmpeg)
+ $(qt_feature v4l linux_v4l)
+ $(qt_feature pulseaudio)
)
qt6-build_src_configure
