[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     dd99c2642b5e2b098a1406ca7a8bcdf7df30cd88
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 16:38:28 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 16:38:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd99c264

[qt5-build.eclass] Some updates for 5.5 support.

 eclass/qt5-build.eclass | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d0db81f..008700c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -535,9 +535,6 @@ qt5_base_configure() {
                -system-zlib
                -system-pcre
 
-               # don't specify -no-gif because there is no way to override it 
later
-               #-no-gif
-
                # disable everything to prevent automagic deps (part 1)
                -no-mtdev
                -no-journald
@@ -545,8 +542,12 @@ qt5_base_configure() {
                -no-freetype -no-harfbuzz
                -no-openssl
                $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
+               $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-evdev)
                -no-xinput2 -no-xcb-xlib
 
+               # don't specify -no-gif because there is no way to override it 
later
+               #-no-gif
+
                # always enable glib event loop support
                -glib
 
@@ -578,7 +579,10 @@ qt5_base_configure() {
                -iconv
 
                # disable everything to prevent automagic deps (part 3)
-               -no-cups -no-evdev -no-icu -no-fontconfig -no-dbus
+               -no-cups -no-evdev
+               $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib)
+               -no-icu -no-fontconfig
+               -no-dbus
 
                # don't strip
                -no-strip
@@ -614,9 +618,16 @@ qt5_base_configure() {
                # typedef qreal to double (warning: changing this flag breaks 
the ABI)
                -qreal double
 
-               # disable opengl and egl by default, override in qtgui and 
qtopengl
+               # disable OpenGL and EGL support by default, override in qtgui,
+               # qtopengl, qtprintsupport and qtwidgets
                -no-opengl -no-egl
 
+               # disable libinput-based generic plugin by default, override in 
qtgui
+               $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput)
+
+               # disable gstreamer by default, override in qtmultimedia
+               $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer)
+
                # use upstream default
                #-no-system-proxies