gentoo resync : 13.06.2020

4 files changed, 47 insertions, 5 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 437b09f8bec7..77cd22796602 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,7 +1,7 @@
-DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
+AUX qtmultimedia-5.14.2-gstreamer-buffering.patch 1516 BLAKE2B 8e80c834a0bb5cc4bcd7b0995a62c7d23777ac4ff5ebe22dad4eb09c0428253b3a4ba28fc6440f5461bb5e1be1c32a3f7f63e63a20a19a6ab750884e26f8f643 SHA512 2ba151ea48aa5dee3e670cfe9b03adfe1ceef23e15d79fdbe2eedf7bb42bf406b8753d2a00fdf14953b6730503bd98687e760cec36b77aface52dc88a06810e0
 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
 DIST qtmultimedia-everywhere-src-5.15.0.tar.xz 3796364 BLAKE2B 3ab2137f811910c25c86aee10ee8266729ba186412bb0d61c02c655573cff66c2725f30c3d8782473820a1b9e0388d9fdb24c218c09afdcde26d899039bd7bb6 SHA512 120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6
-EBUILD qtmultimedia-5.14.1-r1.ebuild 1463 BLAKE2B e1a9cc0ac94ea56a784de8614d08bd14abec07d0d5086f6d0261bab4cd9efa97215a8d5a5970243fd4ee4d8fe8709038309afe2e745849225608eb14e1fa8dbf SHA512 3b96b93dbe94b5dca6186ae7e7c1b722f034fbe20adc6aba8af225e310bdf16088d2d785f6514cbfdbeba0a9af5ebae10216ac430b7b6455e0c27a7d40150c20
-EBUILD qtmultimedia-5.14.2.ebuild 1463 BLAKE2B a8d8942473b50cf29baeab99af5ea3025080d617a94fba609746bd3c85d50e6b0a2526e4e822cb26866d02a6c48703579a053e491e78aeb5694322057355252f SHA512 41c3942cf81540b458a95a7854ed24aaee0636d62f26973de46b9e254051baf3bc4e8b7586ae2b574ffca0f091a6bdfa8f7b814f263eb423f5f42ace5c1c7796
+EBUILD qtmultimedia-5.14.2-r1.ebuild 1541 BLAKE2B c5647f1bd3f1e9a23c56f8a6a52663f2a36e1f19b9b638bb2aa759211774671883da9365ab7e0edde38d0feac843fc261e92039b1337828c7dbcb96f8947ef48 SHA512 940834c345566966d037dec62bac2d6a3753be9202a745f15fa3e1c64330cf9603eb040142e5b1cc64082f909f671641c7de5852a3dbbe83c0daf9c8ca734d22
+EBUILD qtmultimedia-5.14.2.ebuild 1462 BLAKE2B 9036ccdd8a1690afdf2a8fb07a38aed37365cc7a9059a192120c8a2136caff7ab592f9eb76308a85f285a50af4f074a4785c4340403bde2da72d49855a99982e SHA512 b4a2434eb36eddb127ee7f0d73c3af7c0c55950fe350dea2bdf7544bd9c91a3c30edb0ddb7548fc866f70c0068a60838aea8f5349fee7be8749ff14a35f4d00d
 EBUILD qtmultimedia-5.15.0.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
 MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
new file mode 100644
index 000000000000..5d17b079613d
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
@@ -0,0 +1,38 @@
+From d8d072417b08dd75734b3f0aa86c3a49db934770 Mon Sep 17 00:00:00 2001
+From: Roman Valov <roman.valov@gmail.com>
+Date: Mon, 13 Apr 2020 12:54:09 +0000
+Subject: [PATCH] Gstreamer: fix stream buffering
+
+Gstreamer client should handle GST_MESSAGE_BUFFERING to play and pause
+streams based on buffer-percent value and Qt does it properly.
+However `updateSessionState` of QGstreamerPlayerControl was implemented
+to go back into playing state each time session state becomes paused.
+That behavior resulted into choppy stream playback.
+Fix with condition to un-pause playback only if it's already buffered.
+
+Fixes: QTBUG-83417
+Change-Id: Ida4a9e2e196de00050bdc64725fa818c7e939785
+Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
+---
+ src/gsttools/qgstreamerplayercontrol.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp
+index 165978288..d65102e2f 100644
+--- a/src/gsttools/qgstreamerplayercontrol.cpp
++++ b/src/gsttools/qgstreamerplayercontrol.cpp
+@@ -439,8 +439,10 @@ void QGstreamerPlayerControl::updateSessionState(QMediaPlayer::State state)
+         }
+         m_pendingSeekPosition = -1;
+ 
+-        if (m_currentState == QMediaPlayer::PlayingState)
+-            m_session->play();
++        if (m_currentState == QMediaPlayer::PlayingState) {
++            if (m_mediaStatus == QMediaPlayer::BufferedMedia)
++                m_session->play();
++        }
+     }
+ 
+     updateMediaStatus();
+-- 
+2.16.3
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
index 13a8f895e24d..57c260a9bee9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.1-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.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"
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
 	gstreamer? ( x11-base/xorg-proto )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-gstreamer-buffering.patch" # QTBUG-83417
+)
+
 src_prepare() {
 	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 		src/multimedia/multimedia.pro || die
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
index aa661ade1e26..33eb59e9fbe4 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"