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 8C1CE1381F3 for ; Fri, 7 Jun 2013 21:35:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BB9BE095A; Fri, 7 Jun 2013 21:35:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D79CE095A for ; Fri, 7 Jun 2013 21:35:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CA0233E5F0 for ; Fri, 7 Jun 2013 21:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E132BE468F for ; Fri, 7 Jun 2013 21:35:29 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1370640925.0204eb2f5f08141bd41c1a41aff9c3857965aaf5.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kwin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kwin/kwin-9999.ebuild X-VCS-Directories: kde-base/kwin/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0204eb2f5f08141bd41c1a41aff9c3857965aaf5 X-VCS-Branch: master Date: Fri, 7 Jun 2013 21:35:29 +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: 403da7d6-a692-4c86-9c59-8cd45d35e13a X-Archives-Hash: edf377adfa3943955e479e9b52612488 commit: 0204eb2f5f08141bd41c1a41aff9c3857965aaf5 Author: Johannes Huber gentoo org> AuthorDate: Fri Jun 7 21:35:25 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Jun 7 21:35:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0204eb2f [kde-base/kwin] Add wayland build option. Package-Manager: portage-2.2.0_alpha177 --- kde-base/kwin/kwin-9999.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild index 9bdb8c0..081ab71 100644 --- a/kde-base/kwin/kwin-9999.ebuild +++ b/kde-base/kwin/kwin-9999.ebuild @@ -11,7 +11,7 @@ inherit flag-o-matic kde4-meta DESCRIPTION="KDE window manager" KEYWORDS="" -IUSE="debug gles opengl" +IUSE="debug gles opengl wayland" COMMONDEPEND=" $(add_kdebase_dep kactivities) @@ -32,10 +32,8 @@ COMMONDEPEND=" x11-libs/libXrender x11-libs/libXxf86vm opengl? ( >=media-libs/mesa-7.10 ) - gles? ( - || ( ( >=media-libs/mesa-7.10[egl(+),gles] =media-libs/mesa-7.12[egl(+),gles2] ) - ) + gles? ( >=media-libs/mesa-7.12[egl(+),gles2] ) + wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] ) " DEPEND="${COMMONDEPEND} x11-proto/compositeproto @@ -55,7 +53,7 @@ KMEXTRACTONLY=" " # you need one of these -REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" +REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )" src_configure() { # FIXME Remove when activity API moved away from libkworkspace @@ -65,6 +63,7 @@ src_configure() { $(cmake-utils_use_with gles OpenGLES) $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES) $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with wayland Wayland) -DWITH_X11_Xcomposite=ON )