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 3AFB013877A for ; Tue, 24 Jun 2014 14:45:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DD5AE0896; Tue, 24 Jun 2014 14:44:55 +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 D87F0E0866 for ; Tue, 24 Jun 2014 14:44:54 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A440533F8D5 for ; Tue, 24 Jun 2014 14:44:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 66FEF18F67 for ; Tue, 24 Jun 2014 14:44:52 +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: <1403621059.2dcb5507d39146f50c76aee7d9a2e39f1811985c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kwin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kwin/kwin-4.97.0.ebuild kde-base/kwin/kwin-9999.ebuild kde-base/kwin/metadata.xml X-VCS-Directories: kde-base/kwin/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 2dcb5507d39146f50c76aee7d9a2e39f1811985c X-VCS-Branch: master Date: Tue, 24 Jun 2014 14:44:52 +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: 5378ce97-3423-4a02-80f7-b09238cae4d2 X-Archives-Hash: 129000d8960074b5c375707dc1fc258f commit: 2dcb5507d39146f50c76aee7d9a2e39f1811985c Author: Michael Palimaka gentoo org> AuthorDate: Tue Jun 24 14:44:19 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Jun 24 14:44:19 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2dcb5507 [kde-base/kwin] Remove opengl USE flag. kwin requires Qt5Gui built with some form of OpenGL (either regular or ES), so it seems silly to offer two USE flags for one choice. This also allows dependencies to be simplified slightly and avoids silly bugs like bug #514920. Package-Manager: portage-2.2.10 --- kde-base/kwin/kwin-4.97.0.ebuild | 9 +++------ kde-base/kwin/kwin-9999.ebuild | 9 +++------ kde-base/kwin/metadata.xml | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/kde-base/kwin/kwin-4.97.0.ebuild b/kde-base/kwin/kwin-4.97.0.ebuild index f98001a..4b61a30 100644 --- a/kde-base/kwin/kwin-4.97.0.ebuild +++ b/kde-base/kwin/kwin-4.97.0.ebuild @@ -12,9 +12,7 @@ inherit kde5 DESCRIPTION="KDE window manager" LICENSE="GPL-2+" KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="gles2 +opengl wayland" - -REQUIRED_USE="^^ ( gles2 opengl )" +IUSE="gles2 wayland" COMMON_DEPEND=" $(add_frameworks_dep kactivities) @@ -40,7 +38,7 @@ COMMON_DEPEND=" $(add_frameworks_dep plasma) dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5[gles2=,opengl=] + dev-qt/qtgui:5[gles2=,opengl] dev-qt/qtmultimedia:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 @@ -66,9 +64,8 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} dev-qt/designer:5 dev-qt/qtconcurrent:5 + media-libs/mesa[egl,gles2?] x11-proto/xproto - gles2? ( media-libs/mesa[egl,gles2] ) - opengl? ( media-libs/mesa[egl] ) " src_configure() { diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild index 62b2362..d0e1f7d 100644 --- a/kde-base/kwin/kwin-9999.ebuild +++ b/kde-base/kwin/kwin-9999.ebuild @@ -12,9 +12,7 @@ inherit kde5 DESCRIPTION="KDE window manager" LICENSE="GPL-2+" KEYWORDS="" -IUSE="gles2 +opengl wayland" - -REQUIRED_USE="^^ ( gles2 opengl )" +IUSE="gles2 wayland" COMMON_DEPEND=" $(add_frameworks_dep kactivities) @@ -40,7 +38,7 @@ COMMON_DEPEND=" $(add_frameworks_dep plasma) dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5[gles2=,opengl=] + dev-qt/qtgui:5[gles2=,opengl] dev-qt/qtmultimedia:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 @@ -65,9 +63,8 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} dev-qt/designer:5 dev-qt/qtconcurrent:5 + media-libs/mesa[egl,gles2?] x11-proto/xproto - gles2? ( media-libs/mesa[egl,gles2] ) - opengl? ( media-libs/mesa[egl] ) " src_configure() { diff --git a/kde-base/kwin/metadata.xml b/kde-base/kwin/metadata.xml index b7977769..a14e1ec 100644 --- a/kde-base/kwin/metadata.xml +++ b/kde-base/kwin/metadata.xml @@ -4,6 +4,6 @@ kde Enable support for GLES. - Enable support for GLES2. + Use OpenGL ES 2 instead of full GL