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 E1936158083 for ; Mon, 2 Sep 2024 17:52:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE640E2A49; Mon, 2 Sep 2024 17:52:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9DE0E2A49 for ; Mon, 2 Sep 2024 17:52:06 +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 205BC343151 for ; Mon, 2 Sep 2024 17:52:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 131CC1F36 for ; Mon, 2 Sep 2024 17:52:04 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1725299490.894fa2bb4a4bf85e044347434ffff673fbca440e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 894fa2bb4a4bf85e044347434ffff673fbca440e X-VCS-Branch: master Date: Mon, 2 Sep 2024 17:52:04 +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: c3ce1c61-fa23-47e8-a540-9f4c664b570c X-Archives-Hash: 5bd57d8223a6f8746b868e2e55571769 commit: 894fa2bb4a4bf85e044347434ffff673fbca440e Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 2 16:46:29 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Sep 2 17:51:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894fa2bb 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 gentoo.org> dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild | 23 +++++++++++++++++++---- 1 file 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)