From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BB549138BED for ; Thu, 15 Oct 2015 10:00:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A3E7E080E; Thu, 15 Oct 2015 10:00:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B753E080E for ; Thu, 15 Oct 2015 10:00:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 689EF340A66 for ; Thu, 15 Oct 2015 10:00:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 731B1B81 for ; Thu, 15 Oct 2015 10:00:19 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1444903211.15c417c8f8765fd1802f425d07253e597132e9b1.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/plasma/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/plasma/metadata.xml kde-frameworks/plasma/plasma-9999.ebuild X-VCS-Directories: kde-frameworks/plasma/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 15c417c8f8765fd1802f425d07253e597132e9b1 X-VCS-Branch: master Date: Thu, 15 Oct 2015 10:00:19 +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: aa412a1f-3d26-48fb-a1d2-69b31e1eadf5 X-Archives-Hash: af25a20252d92ddcaa276a887eae824c commit: 15c417c8f8765fd1802f425d07253e597132e9b1 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 15 09:59:47 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 15 10:00:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=15c417c8 kde-frameworks/plasma: replace opengl USE flag with gles2 This mirrors how Qt packages handled, reducing conflicts when switching on/off. Package-Manager: portage-2.2.20.1 kde-frameworks/plasma/metadata.xml | 1 + kde-frameworks/plasma/plasma-9999.ebuild | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/plasma/metadata.xml index 0515e23..4c736d5 100644 --- a/kde-frameworks/plasma/metadata.xml +++ b/kde-frameworks/plasma/metadata.xml @@ -4,5 +4,6 @@ kde Enable EGL support + Use GLES 2.0 or later instead of full OpenGL diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild index b59950a..0718f6b 100644 --- a/kde-frameworks/plasma/plasma-9999.ebuild +++ b/kde-frameworks/plasma/plasma-9999.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Plasma framework" LICENSE="LGPL-2+" KEYWORDS="" -IUSE="egl opengl X" +IUSE="egl gles2 X" RDEPEND=" $(add_frameworks_dep kactivities) @@ -33,7 +33,7 @@ RDEPEND=" $(add_frameworks_dep kxmlgui) dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5[gles2=] dev-qt/qtquickcontrols:5 dev-qt/qtscript:5 dev-qt/qtsql:5 @@ -41,10 +41,7 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 egl? ( media-libs/mesa[egl] ) - opengl? ( - dev-qt/qtgui:5[opengl(+),-gles2] - virtual/opengl - ) + !gles2? ( virtual/opengl ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 @@ -62,7 +59,7 @@ RESTRICT="test" src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package opengl OpenGL) + $(cmake-utils_use_find_package !gles2 OpenGL) $(cmake-utils_use_find_package X X11) $(cmake-utils_use_find_package X XCB) )