gentoo resync : 15.12.2019

3 files changed, 112 insertions, 0 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 278a7d824ffb..f43f675bc477 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,7 +1,9 @@
+AUX qtmultimedia-5.13.2-gstreamer-crash.patch 1395 BLAKE2B d53993a824ee9bcf43d23c2d0a5755ede01d232bd71a0f578cb242147de3b3835e0670ad982c4e3ff3109d53c452517770948b6ca11f3656180d1659aeb2b831 SHA512 5cc9b7986648420bcbce372286f93637e772ea55d25d953569b61eae18e6e678f2c1a0fca00e96528cbe00543872151a3e07abc02850b96df6ad297284317958
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
 DIST qtmultimedia-everywhere-src-5.12.5.tar.xz 3744764 BLAKE2B 47e7c09ddc4961ea2c479835732cc31139a4ecb577571a9b804a946909292439ef6bd85d5f8afdae0caacf3491391a8b45b2bfdd113dd18902fa097a0dc36253 SHA512 a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3
 DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
 EBUILD qtmultimedia-5.12.3.ebuild 1442 BLAKE2B 9119b837e2b5d05315de59bcff3f050641fbfce0e9c5fa98c83d063b0ff1182a40d109f406efb5585bb21e8a1aa7c882489f754d79ac40da95ebe8848f5936b6 SHA512 e7791558ba9bda82a883aed78a82b53f835db95774b415f19d4e61ac709b8d0fd916dde4b21a15c27c43578cfc8b4ed069da4a2a31f6b0545aac767d3d94fa4a
 EBUILD qtmultimedia-5.12.5.ebuild 1445 BLAKE2B bed865095f592c13c0642b5b364525f59c97060f648a66d0582f632f0353f7b4cbede150ae6f7db7812281d48e333a2e562293c7ca78796c46781622154a608f SHA512 4349ea4bdec5a86403b781c66ab0e71ce76aee9c2c2267d098a3ae6b9e0bdfa191734c40cfdf57b9581a8fe785d20b9bb069ec065664633a75010fdbb6535203
+EBUILD qtmultimedia-5.13.2-r1.ebuild 1516 BLAKE2B e2d37eeffd0af2a25a99068b4be42a211f9506c415d0df65a4e68f8c1fcc4cb1bdabf04e9753c0421c720a26f5eb2df9fffde704e468199b9dd1d2ed5a4c5ce8 SHA512 d0806e288afc925d44b5bf89cd7b2a03523874ee84a79f708fa52ec9aa70720f7d7906cc7bd2e24418b75ec66a7be9d3e884388f6722f928d4b5a02f66cff744
 EBUILD qtmultimedia-5.13.2.ebuild 1448 BLAKE2B a932815ba950f6ca4a92467f5b7fee3b768b485b4f5a29ee604cf1ec234444d0fa3c3002eabe7990aa70e4f2be8eb6b5327498ac09279991d8ea5c71a1f8f8c5 SHA512 ab5a885ebedfd17b62ce5762197bc9b689cae6c3a46ffc16d0d37b7f4b43561fcfae6dc3949cab01bf119d492a2a9dbd096dc6a081592391f61a4010692acfb5
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
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
new file mode 100644
index 000000000000..ffcdc89c1d3a
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
@@ -0,0 +1,40 @@
+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-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
new file mode 100644
index 000000000000..767ac97515a5
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 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="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~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? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+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
+}