update to upstream version 5.15.2

This commit is contained in:
pei-jiankang 2021-10-13 15:59:23 +08:00
parent 0d8b977397
commit 7d1ad72546
6 changed files with 32 additions and 42 deletions

View File

@ -1,30 +0,0 @@
From d84c7d09df16d5e60cd5067005ec97498f8b4e32 Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Wed, 22 Aug 2018 10:25:39 +0200
Subject: [PATCH] Gstreamer: Fix gst_mini_object_unref: assertion refcount > 0
failed
gst_value_get_sample does not return a reference to the sample.
Should not call gst_sample_unref.
Change-Id: Ibf71e6844b5756d85aac541a68e4e4ae4eefe498
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index cfbc94bb4..1c14444bb 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -997,7 +997,6 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
GstVideoInfo previewInfo;
if (gst_video_info_from_caps(&previewInfo, previewCaps))
image = QGstUtils::bufferToImage(buffer, previewInfo);
- gst_sample_unref(sample);
#else
image = QGstUtils::bufferToImage(buffer);
gst_buffer_unref(buffer);
--
2.20.1

View File

@ -0,0 +1,12 @@
diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
index 475200d..5c786c1 100644
--- a/examples/multimedia/spectrum/app/wavfile.cpp
+++ b/examples/multimedia/spectrum/app/wavfile.cpp
@@ -48,6 +48,7 @@
**
****************************************************************************/
+#include <limits>
#include <qendian.h>
#include "wavfile.h"

View File

@ -1,25 +1,27 @@
%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
%global openal 0
%global openal 1
Name: qt5-qtmultimedia
Version: 5.11.1
Release: 8
Summary: Qt5 multimedia support
Version: 5.15.2
Release: 1
Summary: Qt5 - Multimedia support
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io
Source0: https://download.qt.io/new_archive/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-%{version}.tar.xz
Patch0: Fix-gst_mini_object_unref.patch
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qtmultimedia-everywhere-src-%{version}.tar.xz
Patch0: %{name}-gcc11.patch
BuildRequires: make
BuildRequires: qt5-qtbase-devel >= %{version} qt5-qtbase-private-devel
BuildRequires: qt5-qtdeclarative-devel >= %{version} pkgconfig(alsa) pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0) pkgconfig(gstreamer-audio-1.0)
BuildRequires: pkgconfig(gstreamer-base-1.0) pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) pkgconfig(gstreamer-video-1.0)
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) pkgconfig(xv) chrpath
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) pkgconfig(xv)
%if 0%{?openal}
BuildRequires: pkgconfig(openal)
%endif
BuildRequires: wayland-devel
%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
%description
@ -39,7 +41,9 @@ Obsoletes: qt5-qtmultimedia-examples < %{version}-%{release}
This package provides Libraries and header files for qt5-qtmultimedia.
%prep
%autosetup -n qtmultimedia-everywhere-src-%{version} -p1
%setup -q -n qtmultimedia-everywhere-src-%{version}
%patch0 -p1
%build
%{qmake_qt5} CONFIG+=git_build GST_VERSION=1.0
@ -58,7 +62,6 @@ for prl_file in *.prl ; do
done
popd
chrpath -d %{buildroot}/%{_qt5_examplesdir}/multimedia/spectrum/spectrum
%post -p /sbin/ldconfig
@ -79,6 +82,8 @@ chrpath -d %{buildroot}/%{_qt5_examplesdir}/multimedia/spectrum/spectrum
%{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake
%{_qt5_libdir}/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig*.cmake
%{_qt5_headerdir}/{QtMultimedia/,QtMultimediaQuick/,QtMultimediaWidgets/,QtMultimediaGstTools/}
%{_qt5_libdir}/cmake/Qt5MultimediaGstTools/Qt5MultimediaGstToolsConfig*.cmake
%{_qt5_libdir}/cmake/Qt5MultimediaQuick/Qt5MultimediaQuickConfig*.cmake
%{_qt5_archdatadir}/mkspecs/modules/*.pri
%if 0%{?_qt5_examplesdir:1}
%license LICENSE.FDL
@ -86,6 +91,9 @@ chrpath -d %{buildroot}/%{_qt5_examplesdir}/multimedia/spectrum/spectrum
%endif
%changelog
* Wed Oct 13 2021 peijiankang <peijiankang@kylinos.cn> - 5.15.2-1
- update to upstream version 5.15.2
* Thu Sep 09 2021 wangyue <wangyue92@huawei.com> - 5.11.1-8
- fix rpath problem

View File

@ -1,4 +1,4 @@
version_control: git
src_repo: https://code.qt.io/qt/qtmultimedia.git
tag_prefix: ^v
seperator: .
tag_prefix: "^v"
separator: "."

Binary file not shown.