!17 update to upstream version 5.15.2
Merge pull request !17 from lyn/openEuler-22.03-LTS-Next
This commit is contained in:
commit
1e342e6a1e
@ -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
|
||||
|
||||
@ -3,19 +3,18 @@
|
||||
%global openal 0
|
||||
|
||||
Name: qt5-qtmultimedia
|
||||
Version: 5.11.1
|
||||
Release: 8
|
||||
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
|
||||
Source0: https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qtmultimedia-everywhere-src-%{version}.tar.xz
|
||||
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(gstreamer-plugins-bad-1.0) pkgconfig(gstreamer-video-1.0) make
|
||||
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) pkgconfig(xv) chrpath wayland-devel
|
||||
%if 0%{?openal}
|
||||
BuildRequires: pkgconfig(openal)
|
||||
%endif
|
||||
@ -79,6 +78,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 +87,9 @@ chrpath -d %{buildroot}/%{_qt5_examplesdir}/multimedia/spectrum/spectrum
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 17 2022 liyanan <liyanan32@huawei.com> - 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
|
||||
|
||||
|
||||
@ -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.
BIN
qtmultimedia-everywhere-src-5.15.2.tar.xz
Normal file
BIN
qtmultimedia-everywhere-src-5.15.2.tar.xz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user