From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DC0EC15806E for ; Sun, 28 May 2023 13:11:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B2B0E07D3; Sun, 28 May 2023 13:11:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8203E07D3 for ; Sun, 28 May 2023 13:11:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A880C340F4F for ; Sun, 28 May 2023 13:11:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01559A67 for ; Sun, 28 May 2023 13:10:59 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1685279368.7ce7065c9400ed9ee9936ae8e925c9bfa9a93c44.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 7ce7065c9400ed9ee9936ae8e925c9bfa9a93c44 X-VCS-Branch: master Date: Sun, 28 May 2023 13:10:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6edd4ad0-da3b-4458-9074-da4ebe79521f X-Archives-Hash: 6b7a1b73bf890df57086d25e45e31346 commit: 7ce7065c9400ed9ee9936ae8e925c9bfa9a93c44 Author: Jimi Huotari gentoo org> AuthorDate: Sun May 28 13:07:39 2023 +0000 Commit: Jimi Huotari gentoo 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 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