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 0BAC7158015 for ; Sun, 17 Dec 2023 22:49:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4817A2BC024; Sun, 17 Dec 2023 22:49:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D7CF2BC024 for ; Sun, 17 Dec 2023 22:49:44 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A050335D75 for ; Sun, 17 Dec 2023 22:49:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 850739C4 for ; Sun, 17 Dec 2023 22:49:41 +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: <1702853350.022f039ca7dc7edf353ac32b8235c415b2fc187b.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.6.1-r1.ebuild dev-qt/qtmultimedia/qtmultimedia-6.6.1.ebuild dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 022f039ca7dc7edf353ac32b8235c415b2fc187b X-VCS-Branch: master Date: Sun, 17 Dec 2023 22:49:41 +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: ebeb7906-86c3-4ea1-9367-5f19b5ca5b5e X-Archives-Hash: 615c08b225f213bd4a83618551cf3d65 commit: 022f039ca7dc7edf353ac32b8235c415b2fc187b Author: Ionen Wolkens gentoo org> AuthorDate: Sun Dec 17 22:27:57 2023 +0000 Commit: Ionen Wolkens gentoo 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 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