commit: 4ae95666e06fc33441a1bc2dbbba71b1e8f1eec2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 12:06:09 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 15:11:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae95666
kde-plasma/kwin: Fix build against >=x11-libs/libdrm-2.4.78
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../kwin/files/kwin-5.8.6-libdrm-2.4.78.patch | 44 ++++++++++++++++++++++
kde-plasma/kwin/kwin-5.8.6.ebuild | 2 +
.../{kwin-5.8.6.ebuild => kwin-5.9.4-r1.ebuild} | 9 +++--
3 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-5.8.6-libdrm-2.4.78.patch
b/kde-plasma/kwin/files/kwin-5.8.6-libdrm-2.4.78.patch
new file mode 100644
index 00000000000..663ad8c7495
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.8.6-libdrm-2.4.78.patch
@@ -0,0 +1,44 @@
+commit 4ca3d0d94370002430b5131520a11c06b23bdcaa
+Author: Martin Gräßlin <[email protected]>
+Date: Mon Apr 10 06:52:44 2017 +0200
+
+ [platforms/drm] Explicitly request event context version 2
+
+ Summary:
+ Libdrm 2.4.78 introduces a version 2 and if KWin gets built against it
+ our code would break. Given that this change is for Plasma/5.8 branch.
+
+ Closes T5839
+
+ Reviewers: #kwin, #plasma
+
+ Subscribers: plasma-devel, kwin
+
+ Tags: #kwin
+
+ Maniphest Tasks: T5839
+
+ Differential Revision: https://phabricator.kde.org/D5380
+
+diff --git a/plugins/platforms/drm/drm_backend.cpp
b/plugins/platforms/drm/drm_backend.cpp
+index dc2b79696..9e9cb60e1 100644
+--- a/plugins/platforms/drm/drm_backend.cpp
++++ b/plugins/platforms/drm/drm_backend.cpp
+@@ -61,6 +61,8 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
+ #define DRM_CAP_CURSOR_HEIGHT 0x9
+ #endif
+
++#define KWIN_DRM_EVENT_CONTEXT_VERSION 2
++
+ namespace KWin
+ {
+
+@@ -240,7 +242,7 @@ void DrmBackend::openDrm()
+ }
+ drmEventContext e;
+ memset(&e, 0, sizeof e);
+- e.version = DRM_EVENT_CONTEXT_VERSION;
++ e.version = KWIN_DRM_EVENT_CONTEXT_VERSION;
+ e.page_flip_handler = pageFlipHandler;
+ drmHandleEvent(m_fd, &e);
+ }
diff --git a/kde-plasma/kwin/kwin-5.8.6.ebuild
b/kde-plasma/kwin/kwin-5.8.6.ebuild
index ce1a94ff34b..269401e31b4 100644
--- a/kde-plasma/kwin/kwin-5.8.6.ebuild
+++ b/kde-plasma/kwin/kwin-5.8.6.ebuild
@@ -89,6 +89,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-libdrm-2.4.78.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.8.6.ebuild
b/kde-plasma/kwin/kwin-5.9.4-r1.ebuild
similarity index 94%
copy from kde-plasma/kwin/kwin-5.8.6.ebuild
copy to kde-plasma/kwin/kwin-5.9.4-r1.ebuild
index ce1a94ff34b..dad7f6668cc 100644
--- a/kde-plasma/kwin/kwin-5.8.6.ebuild
+++ b/kde-plasma/kwin/kwin-5.9.4-r1.ebuild
@@ -3,7 +3,6 @@
EAPI=6
-KDE_GCC_MINIMAL="4.8"
KDE_HANDBOOK="optional"
KDE_TEST="optional"
VIRTUALX_REQUIRED="test"
@@ -11,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="gles2 multimedia"
# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
@@ -50,7 +49,7 @@ COMMON_DEPEND="
$(add_qt_dep qtscript)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
- >=dev-libs/libinput-1.2
+ >=dev-libs/libinput-1.5
>=dev-libs/wayland-1.2
media-libs/fontconfig
media-libs/freetype
@@ -63,7 +62,7 @@ COMMON_DEPEND="
x11-libs/libXi
x11-libs/libdrm
>=x11-libs/libxcb-1.10
- >=x11-libs/libxkbcommon-0.5.0
+ >=x11-libs/libxkbcommon-0.7.0
x11-libs/xcb-util-cursor
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
@@ -89,6 +88,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-5.8.6-libdrm-2.4.78.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
