diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-05-09 10:18:51 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-05-09 10:18:51 +0200 |
commit | afd35d48cef2832a1e5db5169d3d0d84d1345a62 (patch) | |
tree | e4e8b2bbc796f97a60c8a21b947c14dcc072755d /dev-qt/qtmultimedia | |
parent | net-misc/httpie: x86 stable wrt bug #721524 (diff) | |
download | gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.gz gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.bz2 gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.zip |
dev-qt: Drop Qt 5.13.2
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtmultimedia')
-rw-r--r-- | dev-qt/qtmultimedia/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch | 40 | ||||
-rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild | 70 |
3 files changed, 0 insertions, 111 deletions
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index d527e93a416b..5922bf11250c 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,3 +1,2 @@ -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 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 -} |