[gentoo-commits] proj/kde-sunset:master commit in: kde-plasma/kwin/

[Andreas Sturmlechner]

commit: cbaaf02736cb909a0fa52e5b314c4b7964d412ab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 10:27:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:15:49 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=cbaaf027

kde-plasma/kwin: EAPI-6 bump, drop IUSE="opengl,wayland", gles->gles2-only

- wayland is irrelevant in KDE SC4 times
- drop REQUIRED_USE completely
- drop unused cmake args

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-plasma/kwin/kwin-4.11.22.ebuild | 34 +-
 kde-plasma/kwin/metadata.xml|  3 ---
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild 
b/kde-plasma/kwin/kwin-4.11.22.ebuild
index 3358c7b2..a481b672 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 KMNAME="kde-workspace"
 DECLARATIVE_REQUIRED="always"
 OPENGL_REQUIRED="always"
-
 #VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 8: kwin-TestVirtualDesktops hangs even with virtualx
-
 inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KDE window manager"
 HOMEPAGE+=" https://userbase.kde.org/KWin;
+
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles opengl wayland"
+IUSE="debug gles2-only"
+
+RESTRICT+=" test"
+# test 8: kwin-TestVirtualDesktops hangs even with virtualx
 
 COMMONDEPEND="
kde-frameworks/kactivities:4
@@ -38,9 +38,8 @@ COMMONDEPEND="
>=x11-libs/libXrandr-1.2.1
x11-libs/libXrender
x11-libs/libXxf86vm
-   opengl? ( >=media-libs/mesa-7.10 )
-   gles? ( >=media-libs/mesa-7.12[egl(+),gles2] )
-   wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] )
+   !gles2-only? ( >=media-libs/mesa-7.10 )
+   gles2-only? ( >=media-libs/mesa-7.12[egl(+),gles2] )
 "
 DEPEND="${COMMONDEPEND}
x11-libs/xcb-util-renderutil
@@ -56,23 +55,16 @@ KMEXTRACTONLY="
libs/oxygen/
 "
 
-PATCHES=(
-   "${FILESDIR}/${P}-gcc6.patch"
-)
-
-# you need one of these
-REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )"
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
 
 src_configure() {
# FIXME Remove when activity API moved away from libkworkspace
append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
 
local mycmakeargs=(
-   $(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
+   -DWITH_Wayland=OFF
+   -DWITH_OpenGLES=$(usex gles2-only)
+   -DWITH_OpenGL=$(usex !gles2-only)
)
 
kde4-meta_src_configure

diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 5640fb6e..7a38bb90 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -2,7 +2,4 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   
-   Enable support for GLES
-   
 

[gentoo-commits] proj/kde-sunset:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/

[Andreas Sturmlechner]

commit: 2cbfeabe27292baa58182c30840aad8afb2943bb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 16 16:00:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 16 16:00:39 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=2cbfeabe

kde-plasma/kwin: Fix build in GCC 6

Thanks-to: Stas Cymbalov  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-plasma/kwin/files/kwin-4.11.22-gcc6.patch | 11 +++
 kde-plasma/kwin/kwin-4.11.22.ebuild   |  6 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/kwin/files/kwin-4.11.22-gcc6.patch 
b/kde-plasma/kwin/files/kwin-4.11.22-gcc6.patch
new file mode 100644
index ..60bd08a0
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-4.11.22-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/kwin/glxbackend.cpp
 b/kwin/glxbackend.cpp
+@@ -45,7 +45,7 @@
+ , window(None)
+ , fbconfig(NULL)
+ , glxWindow(None)
+-, ctx(None)
++, ctx(NULL)
+ , m_bufferAge(0)
+ , haveSwapInterval(false)
+ {

diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild 
b/kde-plasma/kwin/kwin-4.11.22.ebuild
index b11d168b..c691ead5 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -56,6 +56,10 @@ KMEXTRACTONLY="
libs/oxygen/
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-gcc6.patch"
+)
+
 # you need one of these
 REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )"