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 5000D158089 for ; Tue, 5 Sep 2023 13:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AF7D2BC06C; Tue, 5 Sep 2023 13:05:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 25A4E2BC06B for ; Tue, 5 Sep 2023 13:05:53 +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 571E7335CF4 for ; Tue, 5 Sep 2023 13:05:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BB0B1149 for ; Tue, 5 Sep 2023 13:05:49 +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: <1693918875.71d61b2cdabc58b37d66438d3d03caf9e2552bb3.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtquick3d/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild dev-qt/qtquick3d/qtquick3d-6.9999.ebuild X-VCS-Directories: dev-qt/qtquick3d/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 71d61b2cdabc58b37d66438d3d03caf9e2552bb3 X-VCS-Branch: master Date: Tue, 5 Sep 2023 13:05:49 +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: 8620e441-eba6-4030-a103-2d159e92e882 X-Archives-Hash: 45eaa0b20dcb1f2ebf9558a8b24c78bd commit: 71d61b2cdabc58b37d66438d3d03caf9e2552bb3 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 4 19:29:22 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Sep 5 13:01:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d61b2c dev-qt/qtquick3d: depend on qtbase[opengl=,vulkan=] Littered in QT_CONFIG(opengl/vulkan) and needed to avoid ABI issues. Hopefully the last of these as it is annoying for users not handling opengl/vulkan with global flags (and portage tend to give the wrong suggestion here). Non-issue on desktop profiles by default. [gles2-only=] is also a thing, but less of an issue given nothing normally depends on that and simply left unset. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild | 4 +++- dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild | 4 +++- dev-qt/qtquick3d/qtquick3d-6.9999.ebuild | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild index ff34668a8fd2..91662e367108 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild @@ -13,8 +13,10 @@ elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi +IUSE="opengl vulkan" + RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,network,widgets] + ~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquicktimeline-${PV}:6 ~dev-qt/qtshadertools-${PV}:6 diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild index ff34668a8fd2..91662e367108 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild @@ -13,8 +13,10 @@ elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi +IUSE="opengl vulkan" + RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,network,widgets] + ~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquicktimeline-${PV}:6 ~dev-qt/qtshadertools-${PV}:6 diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild index ff34668a8fd2..91662e367108 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -13,8 +13,10 @@ elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() # skip qtquick3d-assimp fi +IUSE="opengl vulkan" + RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,network,widgets] + ~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquicktimeline-${PV}:6 ~dev-qt/qtshadertools-${PV}:6