diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2012-03-07 18:17:00 +0100 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2012-03-07 18:17:00 +0100 |
| commit | ad614521cd6496095d0880e069da9fa3d7f5ab27 (patch) | |
| tree | fb39c18c4178300f76008a7c680cd2add7cf76e5 | |
| parent | e8fc22f8ff391dced29dc04c40561e87100ec460 (diff) | |
| download | kde-ad614521cd6496095d0880e069da9fa3d7f5ab27.tar.gz kde-ad614521cd6496095d0880e069da9fa3d7f5ab27.tar.bz2 kde-ad614521cd6496095d0880e069da9fa3d7f5ab27.zip | |
[kde-base/kwin] kwin-4.8 needs at least some opengl to build, bug 402029
(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | kde-base/kwin/kwin-4.8.49.9999.ebuild | 12 | ||||
| -rw-r--r-- | kde-base/kwin/kwin-9999.ebuild | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/kde-base/kwin/kwin-4.8.49.9999.ebuild b/kde-base/kwin/kwin-4.8.49.9999.ebuild index 01fa87be688..d377847e738 100644 --- a/kde-base/kwin/kwin-4.8.49.9999.ebuild +++ b/kde-base/kwin/kwin-4.8.49.9999.ebuild @@ -5,15 +5,16 @@ EAPI=4 KMNAME="kde-workspace" -OPENGL_REQUIRED="optional" +OPENGL_REQUIRED="always" inherit kde4-meta DESCRIPTION="KDE window manager" KEYWORDS="" -IUSE="debug gles xinerama" +IUSE="debug gles opengl xinerama" COMMONDEPEND=" $(add_kdebase_dep kactivities) + $(add_kdebase_dep kdelibs opengl) $(add_kdebase_dep kephal) $(add_kdebase_dep libkworkspace) $(add_kdebase_dep liboxygenstyle) @@ -51,11 +52,8 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) -# normally, you can use just gles or opengl or none -#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )" - -# right now, upstream requires opengl to always be enabled with gles -REQUIRED_USE="gles? ( opengl )" +# you need one of these +REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" src_configure() { # FIXME Remove when activity API moved away from libkworkspace diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild index 01fa87be688..d377847e738 100644 --- a/kde-base/kwin/kwin-9999.ebuild +++ b/kde-base/kwin/kwin-9999.ebuild @@ -5,15 +5,16 @@ EAPI=4 KMNAME="kde-workspace" -OPENGL_REQUIRED="optional" +OPENGL_REQUIRED="always" inherit kde4-meta DESCRIPTION="KDE window manager" KEYWORDS="" -IUSE="debug gles xinerama" +IUSE="debug gles opengl xinerama" COMMONDEPEND=" $(add_kdebase_dep kactivities) + $(add_kdebase_dep kdelibs opengl) $(add_kdebase_dep kephal) $(add_kdebase_dep libkworkspace) $(add_kdebase_dep liboxygenstyle) @@ -51,11 +52,8 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) -# normally, you can use just gles or opengl or none -#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )" - -# right now, upstream requires opengl to always be enabled with gles -REQUIRED_USE="gles? ( opengl )" +# you need one of these +REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" src_configure() { # FIXME Remove when activity API moved away from libkworkspace |