From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A847E1395E2 for ; Sat, 19 Nov 2016 17:00:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE6BEE0B7E; Sat, 19 Nov 2016 17:00:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98798E0B7E for ; Sat, 19 Nov 2016 17:00:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C5E43412CB for ; Sat, 19 Nov 2016 16:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF0652EF for ; Sat, 19 Nov 2016 16:59:56 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1479574784.28d0d26ec883a62ad55844cd8e683d24b259c1b1.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 28d0d26ec883a62ad55844cd8e683d24b259c1b1 X-VCS-Branch: master Date: Sat, 19 Nov 2016 16:59:56 +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: b2022abe-1a25-4faa-9912-a772549ba1a9 X-Archives-Hash: 1421be6933015eb77ed0858b81354bff commit: 28d0d26ec883a62ad55844cd8e683d24b259c1b1 Author: Michael Palimaka gentoo org> AuthorDate: Sat Nov 19 16:40:25 2016 +0000 Commit: Michael Palimaka gentoo 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