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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 156B8138350 for ; Wed, 18 Mar 2020 21:51:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52C0CE09E6; Wed, 18 Mar 2020 21:51:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 301E7E09E6 for ; Wed, 18 Mar 2020 21:51:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02DAC34F2C1 for ; Wed, 18 Mar 2020 21:51:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BAB818D for ; Wed, 18 Mar 2020 21:51:02 +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: <1584567396.ecfd89006795c61ad4d7b97a3b9ba93e01a8238b.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwayland/qtwayland-5.14.9999.ebuild dev-qt/qtwayland/qtwayland-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ecfd89006795c61ad4d7b97a3b9ba93e01a8238b X-VCS-Branch: master Date: Wed, 18 Mar 2020 21:51:02 +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: 4446abed-5205-444e-a19c-e92216ac9da4 X-Archives-Hash: cc25f12fd7d2dfd049dc33c01680594b commit: ecfd89006795c61ad4d7b97a3b9ba93e01a8238b Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 18 21:34:47 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 18 21:36:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecfd8900 dev-qt/qtwayland: Use config switch for USE vulkan Thanks-to: Jimi Huotari gentoo.org> Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwayland/qtwayland-5.14.9999.ebuild | 5 +---- dev-qt/qtwayland/qtwayland-5.15.9999.ebuild | 9 +-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild index c190d0e5..391ab67a 100644 --- a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild @@ -28,10 +28,6 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - qt_use_disable_config vulkan wayland-vulkan-server-buffer \ - src/plugins/hardwareintegration/client/client.pro \ - src/plugins/hardwareintegration/compositor/compositor.pro - use X || rm -r config.tests/xcomposite || die qt5-build_src_prepare @@ -40,6 +36,7 @@ src_prepare() { src_configure() { local myqmakeargs=( -- + $(qt_use vulkan feature-wayland-vulkan-server-buffer) $(qt_use X feature-xcomposite-egl) $(qt_use X feature-xcomposite-glx) ) diff --git a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild index 67e16940..36cfd4d6 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild @@ -27,17 +27,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - qt_use_disable_config vulkan wayland-vulkan-server-buffer \ - src/plugins/hardwareintegration/client/client.pro \ - src/plugins/hardwareintegration/compositor/compositor.pro - - qt5-build_src_prepare -} - src_configure() { local myqmakeargs=( -- + $(qt_use vulkan feature-wayland-vulkan-server-buffer) $(qt_use X feature-xcomposite-egl) $(qt_use X feature-xcomposite-glx) )