gentoo resync : 14.05.2020

4 files changed, 2 insertions, 115 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b281f04b07e6..4a4bf8daf94f 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,8 +1,5 @@
-AUX qtmultimedia-5.13.2-gstreamer-crash.patch 1395 BLAKE2B d53993a824ee9bcf43d23c2d0a5755ede01d232bd71a0f578cb242147de3b3835e0670ad982c4e3ff3109d53c452517770948b6ca11f3656180d1659aeb2b831 SHA512 5cc9b7986648420bcbce372286f93637e772ea55d25d953569b61eae18e6e678f2c1a0fca00e96528cbe00543872151a3e07abc02850b96df6ad297284317958
-DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
 DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
-EBUILD qtmultimedia-5.13.2-r2.ebuild 1491 BLAKE2B dc9e2c5bc6df45278ee1179d5ab57b2cae17297388f31e6e1a4e1b7a1d4126990bee31c6d7327c97c7ababa97a78f6732b059d3f5cafe5a4efe85b5bfeb46c32 SHA512 f3e19bcfb74d750aaa97db0453508ebbe05f5d6cd3c1df9dda3d7cfd92716efe962a30766f4324e0a41ad2eaa88e8feb607ec909593fe516feadf85daae8cb64
 EBUILD qtmultimedia-5.14.1-r1.ebuild 1463 BLAKE2B e1a9cc0ac94ea56a784de8614d08bd14abec07d0d5086f6d0261bab4cd9efa97215a8d5a5970243fd4ee4d8fe8709038309afe2e745849225608eb14e1fa8dbf SHA512 3b96b93dbe94b5dca6186ae7e7c1b722f034fbe20adc6aba8af225e310bdf16088d2d785f6514cbfdbeba0a9af5ebae10216ac430b7b6455e0c27a7d40150c20
-EBUILD qtmultimedia-5.14.2.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
+EBUILD qtmultimedia-5.14.2.ebuild 1466 BLAKE2B 4fecd64481969699b4377b83005a2b4f5be4c44c65d8f2bc2275e0b95a97c0ae391ffc554d159c3a8f87dfbf4ae177c3cc837978eda1bcf34c29917f90de274f SHA512 a8bf1af802ee94226ace78479e32ec6b8ae391cf4a3914bd3796480cdfcee809f74b35ea9d61b00dd1be9d80303ca09bc455ad174de923044efd212dd489692d
 MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
deleted file mode 100644
index ffcdc89c1d3a..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4d251f072c6f97b4cf4618103e4e857e499c5ed7 Mon Sep 17 00:00:00 2001
-From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-Date: Tue, 5 Nov 2019 13:39:55 +0100
-Subject: [PATCH] GStreamer: Fix crash when video sink is used when it has been
- destroyed
-
-When custom pipeline is requested, all playbin related elements must be cleared.
-
-Also when QMediaPlayer is destroying, it disables showing preroll frames,
-property of the video sink, which was already destroyed.
-
-Destroying of m_videoOutputBin decreases refcounter for m_videoSink,
-since the video sink is owned by m_videoOutputBin.
-
-Fixes: QTBUG-79753
-Change-Id: I2fcbd19372caf46adf2ae1ed2e5a7d0ee70040ad
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
----
- src/gsttools/qgstreamerplayersession.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp
-index c0998d7ae..05e419b10 100644
---- a/src/gsttools/qgstreamerplayersession.cpp
-+++ b/src/gsttools/qgstreamerplayersession.cpp
-@@ -252,8 +252,11 @@ void QGstreamerPlayerSession::resetElements()
-     resetGstObject(m_nullVideoSink);
-     resetGstObject(m_videoOutputBin);
- 
-+    m_audioSink = nullptr;
-     m_volumeElement = nullptr;
-     m_videoIdentity = nullptr;
-+    m_pendingVideoSink = nullptr;
-+    m_videoSink = nullptr;
- }
- 
- GstElement *QGstreamerPlayerSession::playbin() const
--- 
-2.16.3
-
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild
deleted file mode 100644
index 6946c997e652..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~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
-	)
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${P}-gstreamer-crash.patch" ) # QTBUG-79753
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	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=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
index f8b9dfe3d426..13f1b39dbc18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"