commit: 648d83e691da9a49cd4f76ade3c8466a377ac0b8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 13:23:07 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 13:28:47 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=648d83e6
dev-qt/qtwayland: introduce libinput USE flag
qtwayland has conditionals like qtConfig(xkbcommon-evdev), which is provided by
qtgui[libinput].
Enabling it by default for now, since currently keyboard does not work in
Plasma/Wayland without it.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwayland/metadata.xml | 1 +
dev-qt/qtwayland/qtwayland-5.9.0.ebuild | 14 ++++++++++++--
dev-qt/qtwayland/qtwayland-5.9.9999.ebuild | 14 ++++++++++++--
dev-qt/qtwayland/qtwayland-5.9999.ebuild | 14 ++++++++++++--
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 138dabc2..852fb93d 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="egl">Use EGL instead of GLX to manage OpenGL
contexts</flag>
+ <flag name="libinput">Enable support for input devices via
<pkg>dev-libs/libinput</pkg></flag>
<flag name="qml">Build QML/QtQuick bindings</flag>
<flag name="wayland-compositor">Build Qt compositor for
wayland</flag>
</use>
diff --git a/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
b/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
index 5f9fc27a..ff3ca8ba 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
+ ~dev-qt/qtgui-${PV}[egl=,libinput?]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+src_prepare() {
+ qt_use_disable_config libinput xkbcommon-evdev \
+ src/client/client.pro \
+ src/compositor/wayland_wrapper/wayland_wrapper.pri \
+ src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+ tests/auto/compositor/compositor/compositor.pro
+
+ qt5-build_src_prepare
+}
+
src_configure() {
qt_use_compile_test xcomposite
diff --git a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
index 5f9fc27a..ff3ca8ba 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
+ ~dev-qt/qtgui-${PV}[egl=,libinput?]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+src_prepare() {
+ qt_use_disable_config libinput xkbcommon-evdev \
+ src/client/client.pro \
+ src/compositor/wayland_wrapper/wayland_wrapper.pri \
+ src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+ tests/auto/compositor/compositor/compositor.pro
+
+ qt5-build_src_prepare
+}
+
src_configure() {
qt_use_compile_test xcomposite
diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index 5f9fc27a..ff3ca8ba 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
+ ~dev-qt/qtgui-${PV}[egl=,libinput?]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+src_prepare() {
+ qt_use_disable_config libinput xkbcommon-evdev \
+ src/client/client.pro \
+ src/compositor/wayland_wrapper/wayland_wrapper.pri \
+ src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+ tests/auto/compositor/compositor/compositor.pro
+
+ qt5-build_src_prepare
+}
+
src_configure() {
qt_use_compile_test xcomposite
