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

[Michael Palimaka]

commit:     28d0d26ec883a62ad55844cd8e683d24b259c1b1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 16:40:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 16:59:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=28d0d26e

qt5-build.eclass: adjust to upstream multimedia build system changes in qtbase

Change-Id: I1a2ee8be3efb7c4ee9a29d2a8e3fc1f3eea704fc
Gentoo-bug: 600226

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f9de34e..f66fde0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -582,8 +582,8 @@ qt5_base_configure() {
                -glib
 
                # disable everything to prevent automagic deps (part 2)
-               -no-pulseaudio -no-alsa
                $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo 
-no-gtkstyle)
+               $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio 
-no-alsa)
 
                # exclude examples and tests from default build
                -nomake examples
@@ -647,7 +647,7 @@ qt5_base_configure() {
                -no-libinput
 
                # disable gstreamer by default, override in qtmultimedia
-               -no-gstreamer
+               $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer)
 
                # respect system proxies by default: it's the most natural
                # setting, and it'll become the new upstream default in 5.8