From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 69483138CEE for ; Wed, 24 Jun 2015 16:38:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C591E08F6; Wed, 24 Jun 2015 16:38:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28115E08F6 for ; Wed, 24 Jun 2015 16:38:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0B23340948 for ; Wed, 24 Jun 2015 16:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC51FA2F for ; Wed, 24 Jun 2015 16:38:21 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1435163406.ac8227ee706bab705776681e3bd2719f297e6259.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/metadata.xml dev-qt/qtgui/qtgui-5.5.0_rc.ebuild dev-qt/qtgui/qtgui-5.5.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: ac8227ee706bab705776681e3bd2719f297e6259 X-VCS-Branch: master Date: Wed, 24 Jun 2015 16:38:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a951afe2-bfdb-4c9f-844d-67869124a8a6 X-Archives-Hash: f05379cec894834fa04b42dc9750a062 commit: ac8227ee706bab705776681e3bd2719f297e6259 Author: Davide Pesavento gentoo org> AuthorDate: Wed Jun 24 16:30:06 2015 +0000 Commit: Davide Pesavento gentoo 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 @@ Use media-libs/harfbuzz for text shaping Build the IBus input method plugin Build the KMS platform plugin + Enable input device support via dev-libs/libinput Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. 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)