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 5A5F559CAF for ; Sun, 10 Apr 2016 12:10:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03CA421C002; Sun, 10 Apr 2016 12:10:44 +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 7AEF521C002 for ; Sun, 10 Apr 2016 12:10:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0A63E340A6A for ; Sun, 10 Apr 2016 12:10:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12ED520E for ; Sun, 10 Apr 2016 12:10:38 +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: <1460290136.0a3e292d14ae4b74a92f8886588444535d044188.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 0a3e292d14ae4b74a92f8886588444535d044188 X-VCS-Branch: master Date: Sun, 10 Apr 2016 12:10:38 +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: f1b1bea2-8998-4d33-83f4-763b9cff6f30 X-Archives-Hash: d45c3b9a09925aba6628728a75e98463 commit: 0a3e292d14ae4b74a92f8886588444535d044188 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 10 12:08:28 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 10 12:08:56 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a3e292d dev-qt/qtmultimedia: really fix egl/gles2 handling The videonode plugin requires both egl and gles2, therefore depending on [-gles2] is enough to disable the plugin, and makes much more sense than depending on [-egl], since the USE flag is called 'gles2'. Thanks to rhill for pointing this out. While at it, use a [gles2=] dependency on both qtgui and qtwidgets, like we do everywhere else in the Qt stack. Gentoo-Bug: 576636 Package-Manager: portage-2.2.28 dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild | 7 +++---- dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild | 7 +++---- dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild | 7 +++---- dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild | 7 +++---- dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 7 +++---- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild index cc48647..1a2ca34 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild @@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} alsa? ( media-libs/alsa-lib ) gstreamer? ( @@ -34,13 +34,12 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV} - gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] ) - !gles2? ( ~dev-qt/qtgui-${PV}[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV} + ~dev-qt/qtwidgets-${PV}[gles2=] ) " DEPEND="${RDEPEND} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild index cc48647..1a2ca34 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild @@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} alsa? ( media-libs/alsa-lib ) gstreamer? ( @@ -34,13 +34,12 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV} - gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] ) - !gles2? ( ~dev-qt/qtgui-${PV}[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV} + ~dev-qt/qtwidgets-${PV}[gles2=] ) " DEPEND="${RDEPEND} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild index cc48647..1a2ca34 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.0_alpha.ebuild @@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} alsa? ( media-libs/alsa-lib ) gstreamer? ( @@ -34,13 +34,12 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV} - gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] ) - !gles2? ( ~dev-qt/qtgui-${PV}[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV} + ~dev-qt/qtwidgets-${PV}[gles2=] ) " DEPEND="${RDEPEND} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild index cc48647..1a2ca34 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.9999.ebuild @@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} alsa? ( media-libs/alsa-lib ) gstreamer? ( @@ -34,13 +34,12 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV} - gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] ) - !gles2? ( ~dev-qt/qtgui-${PV}[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV} + ~dev-qt/qtwidgets-${PV}[gles2=] ) " DEPEND="${RDEPEND} diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild index cc48647..1a2ca34 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild @@ -16,7 +16,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV} + ~dev-qt/qtgui-${PV}[gles2=] ~dev-qt/qtnetwork-${PV} alsa? ( media-libs/alsa-lib ) gstreamer? ( @@ -34,13 +34,12 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV} - gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] ) - !gles2? ( ~dev-qt/qtgui-${PV}[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-${PV} - ~dev-qt/qtwidgets-${PV} + ~dev-qt/qtwidgets-${PV}[gles2=] ) " DEPEND="${RDEPEND}