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 150E6158089 for ; Sun, 8 Oct 2023 14:47:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51AB12BC016; Sun, 8 Oct 2023 14:47:47 +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 344842BC016 for ; Sun, 8 Oct 2023 14:47:47 +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 2097E335CAF for ; Sun, 8 Oct 2023 14:47:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EC7B99A for ; Sun, 8 Oct 2023 14:47:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1696766610.caf38f786ea54fa29dcfdb216576657b028fe8da.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwayland/metadata.xml dev-qt/qtwayland/qtwayland-5.15.11.9999.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: caf38f786ea54fa29dcfdb216576657b028fe8da X-VCS-Branch: master Date: Sun, 8 Oct 2023 14:47:44 +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: d10ed037-5087-4545-bf9e-152b60be46ff X-Archives-Hash: 001a28367bb03b8e05454ffcdbc96ee1 commit: caf38f786ea54fa29dcfdb216576657b028fe8da Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 7 19:27:26 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 8 12:03:30 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=caf38f78 dev-qt/qtwayland: make compositor APIs off-by-default optional Would have preferred a clean split but wayland-server depends on wayland-client in the buildsys. - Drop IUSE vulkan: Merge with 'compositor' instead. This absolves us from having to make a default conflicting REQUIRED_USE with compositor. - Drop IUSE X: Unused, broken upstream since 2021 and removed in Qt6. Quoting upstream from commit d4a7faff: "These plugins were created to allow testing/debugging of QtWayland- based compositors on desktops that did not support Wayland natively." Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwayland/metadata.xml | 2 +- dev-qt/qtwayland/qtwayland-5.15.11.9999.ebuild | 29 ++++++++++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index a8ce9005..9f58d4b4 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -6,7 +6,7 @@ Gentoo Qt Project - Enable support for Vulkan-based server buffer integration + Enable support for the wayland compositor / server APIs https://bugreports.qt.io/ diff --git a/dev-qt/qtwayland/qtwayland-5.15.11.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.15.11.9999.ebuild index 46f3a900..d9d8d573 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.11.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.11.9999.ebuild @@ -13,30 +13,33 @@ inherit qt5-build DESCRIPTION="Wayland platform plugin for Qt" SLOT=5/${QT5_PV} # bug 815646 -IUSE="vulkan X" +IUSE="compositor" -DEPEND=" +RDEPEND=" dev-libs/wayland =dev-qt/qtcore-${QT5_PV}*:5= - =dev-qt/qtdeclarative-${QT5_PV}*:5= - =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?] + =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput] media-libs/libglvnd - vulkan? ( dev-util/vulkan-headers ) - X? ( - =dev-qt/qtgui-${QT5_PV}*[-gles2-only] - x11-libs/libX11 - x11-libs/libXcomposite + compositor? ( + =dev-qt/qtdeclarative-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[vulkan] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + compositor? ( dev-util/vulkan-headers ) +" BDEPEND="dev-util/wayland-scanner" src_configure() { local myqmakeargs=( -- - $(qt_use vulkan feature-wayland-vulkan-server-buffer) - $(qt_use X feature-xcomposite-egl) - $(qt_use X feature-xcomposite-glx) + -no-feature-xcomposite-egl + -no-feature-xcomposite-glx + $(qt_use compositor feature-wayland-server) + $(qt_use compositor feature-wayland-dmabuf-server-buffer) + $(qt_use compositor feature-wayland-drm-egl-server-buffer) + $(qt_use compositor feature-wayland-shm-emulation-server-buffer) + $(qt_use compositor feature-wayland-vulkan-server-buffer) ) qt5-build_src_configure }