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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0096B158089 for ; Wed, 6 Sep 2023 10:33:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D39E2BC016; Wed, 6 Sep 2023 10:33:37 +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 2E8632BC016 for ; Wed, 6 Sep 2023 10:33:37 +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 0F58D335C67 for ; Wed, 6 Sep 2023 10:33:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43C9410F2 for ; Wed, 6 Sep 2023 10:33:34 +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: <1693996358.f2c0be9302270ad97d4b9a434adea3402fd6282b.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwayland/metadata.xml dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild dev-qt/qtwayland/qtwayland-6.5.9999.ebuild dev-qt/qtwayland/qtwayland-6.9999.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: f2c0be9302270ad97d4b9a434adea3402fd6282b X-VCS-Branch: master Date: Wed, 6 Sep 2023 10:33:34 +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: 0f282085-bb27-43a5-b3d6-d60866a46d4e X-Archives-Hash: c029b84b74ebabed77509ff1e7a85494 commit: f2c0be9302270ad97d4b9a434adea3402fd6282b Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 6 10:12:29 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 6 10:32:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c0be93 dev-qt/qtwayland: make compositor APIs off-by-default optional (qt6) asturm pointed out that almost nobody should need this, and I can only agree, it's also the biggest part of the sources and is kind of wasteful. Revbump for correctness, albeit not super useful here. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtwayland/metadata.xml | 1 + .../{qtwayland-6.5.2-r2.ebuild => qtwayland-6.5.2-r3.ebuild} | 7 +++++-- dev-qt/qtwayland/qtwayland-6.5.9999.ebuild | 7 +++++-- dev-qt/qtwayland/qtwayland-6.9999.ebuild | 7 +++++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index fe0b049a950d..1509a2e738a9 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -6,6 +6,7 @@ Gentoo Qt Project + Enable support for the wayland compositor / server APIs Build QML/QtQuick bindings and imports Enable support for Vulkan-based server buffer integration diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild similarity index 87% rename from dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild rename to dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild index accf21a914e6..9cd6abd6eecf 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild @@ -11,14 +11,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="qml vulkan" +IUSE="compositor qml vulkan" RDEPEND=" dev-libs/wayland ~dev-qt/qtbase-${PV}:6[egl(+),gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) " DEPEND=" ${RDEPEND} @@ -42,6 +44,7 @@ PATCHES=( src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) ) qt6-build_src_configure diff --git a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild index 7319f5b43fd6..517bfcaf25e0 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild @@ -11,14 +11,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="qml vulkan" +IUSE="compositor qml vulkan" RDEPEND=" dev-libs/wayland ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) " DEPEND=" ${RDEPEND} @@ -38,6 +40,7 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) ) qt6-build_src_configure diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild index 7319f5b43fd6..517bfcaf25e0 100644 --- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -11,14 +11,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="qml vulkan" +IUSE="compositor qml vulkan" RDEPEND=" dev-libs/wayland ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) " DEPEND=" ${RDEPEND} @@ -38,6 +40,7 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) ) qt6-build_src_configure