From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-857311-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E35D61388BF
for <garchives@archives.gentoo.org>; Thu, 14 Jan 2016 17:45:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9D59BE07D2;
Thu, 14 Jan 2016 17:45:24 +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 2BD1FE07D2
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Jan 2016 17:45:24 +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 A07AD34092E
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Jan 2016 17:45:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EA68A91
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Jan 2016 17:45:18 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
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" <kensington@gentoo.org>
Message-ID: <1452793504.2297fcb5659e308027166162543aa1c1be51ba72.kensington@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtmultimedia/metadata.xml dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild
X-VCS-Directories: dev-qt/qtmultimedia/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 2297fcb5659e308027166162543aa1c1be51ba72
X-VCS-Branch: master
Date: Thu, 14 Jan 2016 17:45:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 4c128776-dc24-4879-986f-146e507afd69
X-Archives-Hash: ccde75efe0690f07d7318da1a2703496
commit: 2297fcb5659e308027166162543aa1c1be51ba72
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 17:44:31 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 17:45:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2297fcb5
dev-qt/qtmultimedia: revision bump to improve handling of EGL videonode plugin
ALso ensure Qt dependencies are of the same version.
Gentoo-bug: 564560
Gentoo-bug: 565588
Package-Manager: portage-2.2.26
dev-qt/qtmultimedia/metadata.xml | 1 +
dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild | 78 ++++++++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index c018a17..b275b67 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -6,6 +6,7 @@
<flag name="egl">Enable EGL integration</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by upstream)</flag>
+ <flag name="gles2">Enable EGL/GLES2 integration</flag>
<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
<flag name="gstreamer010">Enable audio support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
<flag name="qml">Build QML/QtQuick bindings and imports</flag>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild
new file mode 100644
index 0000000..765a5b3
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+
+RDEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ alsa? ( media-libs/alsa-lib )
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gstreamer010? (
+ dev-libs/glib:2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-bad:0.10
+ media-libs/gst-plugins-base:0.10
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ qml? (
+ ~dev-qt/qtdeclarative-${PV}
+ gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
+ !gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ ~dev-qt/qtopengl-${PV}
+ ~dev-qt/qtwidgets-${PV}
+ )
+"
+DEPEND="${RDEPEND}
+ gstreamer? ( x11-proto/videoproto )
+"
+
+src_prepare() {
+ # do not rely on qtbase configuration
+ sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+ qtmultimedia.pro || die
+
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod qml quick \
+ src/src.pro \
+ src/plugins/plugins.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ $(usex gstreamer 'GST_VERSION=1.0' '')
+ $(usex gstreamer010 'GST_VERSION=0.10' '')
+ )
+ qt5-build_src_configure
+}