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 AEBF71384B4 for ; Thu, 19 Nov 2015 16:01:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0BCDE07A3; Thu, 19 Nov 2015 16:01:02 +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 40E56E07A3 for ; Thu, 19 Nov 2015 16:01:02 +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 A75B53408F9 for ; Thu, 19 Nov 2015 16:01:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4858E9F5 for ; Thu, 19 Nov 2015 16:00:57 +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: <1447948830.6a549174bb957dabc91737e5f8b39b87e7895306.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtmultimedia/metadata.xml dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 6a549174bb957dabc91737e5f8b39b87e7895306 X-VCS-Branch: master Date: Thu, 19 Nov 2015 16:00:57 +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: da7c493a-3f67-4217-b0e4-d631e9117024 X-Archives-Hash: 309522c1a358e83aaad788ab8346b8ab commit: 6a549174bb957dabc91737e5f8b39b87e7895306 Author: Michael Palimaka gentoo org> AuthorDate: Thu Nov 19 16:00:25 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Nov 19 16:00:30 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a549174 dev-qt/qtmultimedia: rename egl USE flag -> gles2 This avoids conflicts where egl was enabled but gles2 was not (gles2 must have the same setting across all Qt modules). Gentoo-bug: 565588 Package-Manager: portage-2.2.25 dev-qt/qtmultimedia/metadata.xml | 2 +- dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 6 +++--- dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild | 6 +++--- dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index c018a17..536277f 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -3,9 +3,9 @@ qt - Enable EGL integration Add support for exceptions - like catching them inside the event loop (recommended by upstream) + Enable EGL/GLES2 integration Enable audio support via media-libs/gstreamer:1.0 Enable audio support via media-libs/gstreamer:0.10 Build QML/QtQuick bindings and imports diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild index d760a39..721ad83 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets" +IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" @@ -34,8 +34,8 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV}:5 - egl? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) - !egl? ( ~dev-qt/qtgui-${PV}:5[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) + !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? ( diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild index d760a39..721ad83 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets" +IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" @@ -34,8 +34,8 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV}:5 - egl? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) - !egl? ( ~dev-qt/qtgui-${PV}:5[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) + !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? ( diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild index d760a39..721ad83 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets" +IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" @@ -34,8 +34,8 @@ RDEPEND=" pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-${PV}:5 - egl? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) - !egl? ( ~dev-qt/qtgui-${PV}:5[-egl] ) + gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) + !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? (