| 1 |
commit: ad614521cd6496095d0880e069da9fa3d7f5ab27 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 7 17:17:00 2012 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 7 17:17:00 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ad614521 |
| 7 |
|
| 8 |
[kde-base/kwin] kwin-4.8 needs at least some opengl to build, bug 402029 |
| 9 |
|
| 10 |
(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kwin/kwin-4.8.49.9999.ebuild | 12 +++++------- |
| 14 |
kde-base/kwin/kwin-9999.ebuild | 12 +++++------- |
| 15 |
2 files changed, 10 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/kwin/kwin-4.8.49.9999.ebuild b/kde-base/kwin/kwin-4.8.49.9999.ebuild |
| 18 |
index 01fa87b..d377847 100644 |
| 19 |
--- a/kde-base/kwin/kwin-4.8.49.9999.ebuild |
| 20 |
+++ b/kde-base/kwin/kwin-4.8.49.9999.ebuild |
| 21 |
@@ -5,15 +5,16 @@ |
| 22 |
EAPI=4 |
| 23 |
|
| 24 |
KMNAME="kde-workspace" |
| 25 |
-OPENGL_REQUIRED="optional" |
| 26 |
+OPENGL_REQUIRED="always" |
| 27 |
inherit kde4-meta |
| 28 |
|
| 29 |
DESCRIPTION="KDE window manager" |
| 30 |
KEYWORDS="" |
| 31 |
-IUSE="debug gles xinerama" |
| 32 |
+IUSE="debug gles opengl xinerama" |
| 33 |
|
| 34 |
COMMONDEPEND=" |
| 35 |
$(add_kdebase_dep kactivities) |
| 36 |
+ $(add_kdebase_dep kdelibs opengl) |
| 37 |
$(add_kdebase_dep kephal) |
| 38 |
$(add_kdebase_dep libkworkspace) |
| 39 |
$(add_kdebase_dep liboxygenstyle) |
| 40 |
@@ -51,11 +52,8 @@ PATCHES=( |
| 41 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 42 |
) |
| 43 |
|
| 44 |
-# normally, you can use just gles or opengl or none |
| 45 |
-#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )" |
| 46 |
- |
| 47 |
-# right now, upstream requires opengl to always be enabled with gles |
| 48 |
-REQUIRED_USE="gles? ( opengl )" |
| 49 |
+# you need one of these |
| 50 |
+REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" |
| 51 |
|
| 52 |
src_configure() { |
| 53 |
# FIXME Remove when activity API moved away from libkworkspace |
| 54 |
|
| 55 |
diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild |
| 56 |
index 01fa87b..d377847 100644 |
| 57 |
--- a/kde-base/kwin/kwin-9999.ebuild |
| 58 |
+++ b/kde-base/kwin/kwin-9999.ebuild |
| 59 |
@@ -5,15 +5,16 @@ |
| 60 |
EAPI=4 |
| 61 |
|
| 62 |
KMNAME="kde-workspace" |
| 63 |
-OPENGL_REQUIRED="optional" |
| 64 |
+OPENGL_REQUIRED="always" |
| 65 |
inherit kde4-meta |
| 66 |
|
| 67 |
DESCRIPTION="KDE window manager" |
| 68 |
KEYWORDS="" |
| 69 |
-IUSE="debug gles xinerama" |
| 70 |
+IUSE="debug gles opengl xinerama" |
| 71 |
|
| 72 |
COMMONDEPEND=" |
| 73 |
$(add_kdebase_dep kactivities) |
| 74 |
+ $(add_kdebase_dep kdelibs opengl) |
| 75 |
$(add_kdebase_dep kephal) |
| 76 |
$(add_kdebase_dep libkworkspace) |
| 77 |
$(add_kdebase_dep liboxygenstyle) |
| 78 |
@@ -51,11 +52,8 @@ PATCHES=( |
| 79 |
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
| 80 |
) |
| 81 |
|
| 82 |
-# normally, you can use just gles or opengl or none |
| 83 |
-#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )" |
| 84 |
- |
| 85 |
-# right now, upstream requires opengl to always be enabled with gles |
| 86 |
-REQUIRED_USE="gles? ( opengl )" |
| 87 |
+# you need one of these |
| 88 |
+REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
# FIXME Remove when activity API moved away from libkworkspace |
Archives