summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-13 16:26:11 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-18 18:15:28 +0200
commit1c0947091db651f4e7d136e22d4887b47d9245cd (patch)
treedd264a79b23c6103b138807ca5b05d76fcd07959 /dev-qt/qtmultimedia
parentmedia-sound/alsa-utils: x86 stable (bug #749159) (diff)
downloadgentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.tar.gz
gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.tar.bz2
gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.zip
dev-qt: Drop Qt 5.14.2
Bug: https://bugs.gentoo.org/734600 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtmultimedia')
-rw-r--r--dev-qt/qtmultimedia/Manifest1
-rw-r--r--dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch38
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild72
3 files changed, 0 insertions, 111 deletions
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 1e04e0e9fcc4..388380dc4ea5 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,2 +1 @@
-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
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 <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.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
-}