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 878051396D0 for ; Sun, 3 Sep 2017 19:40:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE732E0EB4; Sun, 3 Sep 2017 19:40:01 +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 80065E0EB4 for ; Sun, 3 Sep 2017 19:40:01 +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 296453402FE for ; Sun, 3 Sep 2017 19:40:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B077F8CD6 for ; Sun, 3 Sep 2017 19:39:58 +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: <1504467032.eadebaeb8cb8b181c96add76b74bc84a83e7543b.asturm@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-5.6.2.ebuild dev-qt/qtwayland/qtwayland-5.7.1.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: eadebaeb8cb8b181c96add76b74bc84a83e7543b X-VCS-Branch: master Date: Sun, 3 Sep 2017 19:39:58 +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-Archives-Salt: 2cc27a78-2764-4eba-8830-9c559c101d8b X-Archives-Hash: 3ece65479b4f34dac051d068c1c9057b commit: eadebaeb8cb8b181c96add76b74bc84a83e7543b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 2 21:05:00 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 3 19:30:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadebaeb dev-qt/qtwayland: Drop USE=egl In this case, USE=egl was not enabling additional support but enabled- instead-of GLX. Rather than complicating things with REQUIRED_USE, build with EGL unconditionally as the use of GLX in context of Wayland is questionable. Gentoo-bug: 627758 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-qt/qtwayland/metadata.xml | 1 - dev-qt/qtwayland/qtwayland-5.6.2.ebuild | 6 +++--- dev-qt/qtwayland/qtwayland-5.7.1.ebuild | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index 6ad9fdf0584..5aa0b525d00 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -6,7 +6,6 @@ Gentoo Qt Project - Use EGL instead of GLX to manage OpenGL contexts Build QML/QtQuick bindings Build Qt compositor for wayland diff --git a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild b/dev-qt/qtwayland/qtwayland-5.6.2.ebuild index a268ee01062..d427008009c 100644 --- a/dev-qt/qtwayland/qtwayland-5.6.2.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.6.2.ebuild @@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm hppa ~ppc ppc64 x86" fi -IUSE="egl qml wayland-compositor xcomposite" +IUSE="qml wayland-compositor xcomposite" DEPEND=" >=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[egl=] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( ~dev-qt/qtdeclarative-${PV} ) diff --git a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild index 7adc8405b7e..b90f33e3e8e 100644 --- a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild @@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" fi -IUSE="egl xcomposite" +IUSE="xcomposite" DEPEND=" >=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl=] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11