From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-qt/qtmultimedia/Manifest | 5 +- .../qtmultimedia-5.14.2-gstreamer-buffering.patch | 38 ------------ dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild | 72 ---------------------- dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild (limited to 'dev-qt/qtmultimedia') diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 6953e958a6e5..7b35393f8353 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,6 +1,3 @@ -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.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9 -EBUILD qtmultimedia-5.14.2-r1.ebuild 1535 BLAKE2B 94348292c210c42a846f888384cee6d863cc0c0d6dc27f2c63cfbdb7119f4460b648f7b9ae92e9437f526d4c9d5fd1968369521b019c58ee0da166109d26ba92 SHA512 a46fb3b2e26d3dbd6235236899632b29d0226b4734a93b94c163436e86f3866b1279f6d7ba9ff9b4cd2d729bb3e17bf958d1391cb85e5eca52d52a355ad656bc -EBUILD qtmultimedia-5.15.1.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a +EBUILD qtmultimedia-5.15.1.ebuild 1462 BLAKE2B 9036ccdd8a1690afdf2a8fb07a38aed37365cc7a9059a192120c8a2136caff7ab592f9eb76308a85f285a50af4f074a4785c4340403bde2da72d49855a99982e SHA512 b4a2434eb36eddb127ee7f0d73c3af7c0c55950fe350dea2bdf7544bd9c91a3c30edb0ddb7548fc866f70c0068a60838aea8f5349fee7be8749ff14a35f4d00d MISC metadata.xml 717 BLAKE2B 66c4caae8c3c2d342dda85c4fd88d7dc3ddd8415e5b1e14a6278b324df257212b128b75468581609959b774fd9ba67a01d1294e539bf1c1cbc393aaf1a0bbbdd SHA512 d3d69ed7c2f42dbbf33aa360ef34dc2a0687be44a795ce2ee6c4b34603a7767b4e66c652e500ae3beed47cb1d6e73be5ffa13cf4bb1d33e3fc3f0154f950bee5 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 deleted file mode 100644 index 5d17b079613d..000000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d8d072417b08dd75734b3f0aa86c3a49db934770 Mon Sep 17 00:00:00 2001 -From: Roman Valov -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 ---- - 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.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild deleted file mode 100644 index fdcd87079b9e..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild +++ /dev/null @@ -1,72 +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="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -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-buffering.patch" # QTBUG-83417 -) - -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.15.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild index f8b9dfe3d426..33eb59e9fbe4 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.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" -- cgit v1.2.3