commit: ac8227ee706bab705776681e3bd2719f297e6259
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 16:30:06 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 16:30:06 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ac8227ee
[dev-qt/qtgui:5] Add USE=libinput and enable udev by default.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 1 +
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 15 ++++++++++++---
dev-qt/qtgui/qtgui-5.5.9999.ebuild | 15 ++++++++++++---
dev-qt/qtgui/qtgui-5.9999.ebuild | 15 ++++++++++++---
4 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index a3505b0..539f157 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -14,6 +14,7 @@
<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for
text shaping</flag>
<flag name="ibus">Build the IBus input method plugin</flag>
<flag name="kms">Build the KMS platform plugin</flag>
+ <flag name="libinput">Enable input device support via
<pkg>dev-libs/libinput</pkg></flag>
<flag name="qt3support">Enable the Qt3Support libraries for
Qt4. Note that
this does not mean you can compile pure Qt3 programs
with Qt4.</flag>
<flag name="trace">Build the 'trace' graphicssystem engine
which allows to record
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index 2ec9eca..a70a21d 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -12,16 +12,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
- ibus jpeg kms +png tslib tuio udev +xcb"
+ ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
kms? ( egl gles2 )
+ libinput? ( udev )
"
RDEPEND="
@@ -47,6 +48,10 @@ RDEPEND="
virtual/libudev:=
x11-libs/libdrm
)
+ libinput? (
+ dev-libs/libinput:=
+ x11-libs/libxkbcommon
+ )
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
@@ -67,7 +72,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
- test? ( ~dev-qt/qtnetwork-${PV} )
+ udev? ( sys-kernel/linux-headers )
"
PDEPEND="
ibus? ( app-i18n/ibus )
@@ -105,6 +110,8 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
+ libinput
+ libinput:xkbcommon-evdev:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -153,6 +160,8 @@ src_configure() {
$(qt_use harfbuzz harfbuzz system)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
+ $(qt_use libinput)
+ $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
index 2ec9eca..a70a21d 100644
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
@@ -12,16 +12,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
- ibus jpeg kms +png tslib tuio udev +xcb"
+ ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
kms? ( egl gles2 )
+ libinput? ( udev )
"
RDEPEND="
@@ -47,6 +48,10 @@ RDEPEND="
virtual/libudev:=
x11-libs/libdrm
)
+ libinput? (
+ dev-libs/libinput:=
+ x11-libs/libxkbcommon
+ )
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
@@ -67,7 +72,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
- test? ( ~dev-qt/qtnetwork-${PV} )
+ udev? ( sys-kernel/linux-headers )
"
PDEPEND="
ibus? ( app-i18n/ibus )
@@ -105,6 +110,8 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
+ libinput
+ libinput:xkbcommon-evdev:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -153,6 +160,8 @@ src_configure() {
$(qt_use harfbuzz harfbuzz system)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
+ $(qt_use libinput)
+ $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 2ec9eca..a70a21d 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -12,16 +12,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
- ibus jpeg kms +png tslib tuio udev +xcb"
+ ibus jpeg kms libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
eglfs? ( egl )
ibus? ( dbus )
kms? ( egl gles2 )
+ libinput? ( udev )
"
RDEPEND="
@@ -47,6 +48,10 @@ RDEPEND="
virtual/libudev:=
x11-libs/libdrm
)
+ libinput? (
+ dev-libs/libinput:=
+ x11-libs/libxkbcommon
+ )
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
tuio? ( ~dev-qt/qtnetwork-${PV} )
@@ -67,7 +72,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
- test? ( ~dev-qt/qtnetwork-${PV} )
+ udev? ( sys-kernel/linux-headers )
"
PDEPEND="
ibus? ( app-i18n/ibus )
@@ -105,6 +110,8 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
kms:kms:
+ libinput
+ libinput:xkbcommon-evdev:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -153,6 +160,8 @@ src_configure() {
$(qt_use harfbuzz harfbuzz system)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
+ $(qt_use libinput)
+ $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
