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 26E53138351 for ; Wed, 18 Mar 2020 21:51:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2E1DE0A7D; Wed, 18 Mar 2020 21:51:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AFBF5E0A7D for ; Wed, 18 Mar 2020 21:51:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4CF9B34F2CD 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 3969918B 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: <1584567300.1482fbb5e09dab1f4a38d5c611fd658d4151ec3c.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: 1482fbb5e09dab1f4a38d5c611fd658d4151ec3c 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: 7092bf75-6860-475d-9ed1-2fff49d2a3ad X-Archives-Hash: 8c33f5096202bd8c8633b70629e33c38 commit: 1482fbb5e09dab1f4a38d5c611fd658d4151ec3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 17 22:51:43 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 18 21:35:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1482fbb5 dev-qt/qtwayland: Fix and rename USE xcomposite to X Add missing config switches. 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 | 15 ++++++++++++--- dev-qt/qtwayland/qtwayland-5.15.9999.ebuild | 13 +++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild index 474000fb..c190d0e5 100644 --- a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild @@ -10,7 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="vulkan xcomposite" +IUSE="vulkan X" DEPEND=" >=dev-libs/wayland-1.6.0 @@ -20,7 +20,7 @@ DEPEND=" media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) - xcomposite? ( + X? ( x11-libs/libX11 x11-libs/libXcomposite ) @@ -32,7 +32,16 @@ src_prepare() { src/plugins/hardwareintegration/client/client.pro \ src/plugins/hardwareintegration/compositor/compositor.pro - use xcomposite || rm -r config.tests/xcomposite || die + use X || rm -r config.tests/xcomposite || die qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + $(qt_use X feature-xcomposite-egl) + $(qt_use X feature-xcomposite-glx) + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild index 52fb0bcb..67e16940 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild @@ -10,7 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="vulkan xcomposite" +IUSE="vulkan X" DEPEND=" >=dev-libs/wayland-1.6.0 @@ -20,7 +20,7 @@ DEPEND=" media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) - xcomposite? ( + X? ( x11-libs/libX11 x11-libs/libXcomposite ) @@ -34,3 +34,12 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + -- + $(qt_use X feature-xcomposite-egl) + $(qt_use X feature-xcomposite-glx) + ) + qt5-build_src_configure +}