!21 [sync] PR-20: update to version 5.15.10-1

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

qt5-qtmultimedia-gcc11.patch

@@ -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"
+ 

qt5-qtmultimedia.spec

@@ -1,48 +1,81 @@
+%global qt_module qtmultimedia
+
+%global openal 1
+
+Name:          qt5-%{qt_module}
+Version:       5.15.10
+Release:       1
+Summary:       Qt5 - Multimedia support
+
+# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
+License:       LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+Url:           http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0:       https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
+Patch0:        %{name}-gcc11.patch
+
+# filter plugin/qml provides
 %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
 
-%global openal 0
-
-Name:          qt5-qtmultimedia
-Version:       5.11.1
-Release:       6
-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
-
-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)
+BuildRequires: make
+BuildRequires: qt5-qtbase-devel >= %{version}
+BuildRequires: qt5-qtbase-private-devel
+#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit)
+#libQt5Gui.so.5(Qt_5_PRIVATE_API)(64bit)
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: qt5-qtdeclarative-devel >= %{version}
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(gstreamer-app-1.0)
+BuildRequires: pkgconfig(gstreamer-audio-1.0)
+BuildRequires: pkgconfig(gstreamer-base-1.0)
+BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
+BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
+BuildRequires: pkgconfig(gstreamer-video-1.0)
+BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
 %if 0%{?openal}
 BuildRequires: pkgconfig(openal)
 %endif
-
-%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
+BuildRequires: pkgconfig(xv)
+# workaround missing dep
+# /usr/include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h:26:10: fatal error: wayland-client.h: No such file or directory
+BuildRequires: wayland-devel
 
 %description
-The Qt Multimedia module provides a set of QML types and C++ classes
-to handle multimedia content. It also provides APIs to access the
-camera and radio functionality. The included Qt Audio Engine provides
-types for 3D positional audio playback and content management.
+The Qt Multimedia module provides a rich feature set that enables you to
+easily take advantage of a platforms multimedia capabilites and hardware.
+This ranges from the playback and recording of audio and video content to
+the use of available devices like cameras and radios.
 
 %package devel
-Summary:       Development files for qt5-qtmultimedia
-Requires:      %{name} = %{version}-%{release} qt5-qtbase-devel
-Requires:      qt5-qtdeclarative-devel pkgconfig(libpulse-mainloop-glib)
-Provides:      qt5-qtmultimedia-examples = %{version}-%{release}
-Obsoletes:     qt5-qtmultimedia-examples < %{version}-%{release}
-
+Summary:       Development files for %{name}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+Requires:      qt5-qtbase-devel%{?_isa}
+Requires:      qt5-qtdeclarative-devel%{?_isa}
+# Qt5Multimedia.pc containts:
+# Libs.private: ... -lpulse-mainloop-glib -lpulse -lglib-2.0
+Requires:      pkgconfig(libpulse-mainloop-glib)
 %description devel
-This package provides Libraries and header files for qt5-qtmultimedia.
+%{summary}.
+
+%package examples
+Summary:       Programming examples for %{name}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+%description examples
+%{summary}.
+
 
 %prep
-%autosetup -n qtmultimedia-everywhere-src-%{version} -p1
+%setup -q -n %{qt_module}-everywhere-src-%{version}
+%patch0 -p1
+
 
 %build
-%{qmake_qt5} CONFIG+=git_build GST_VERSION=1.0
+%{qmake_qt5} \
+  CONFIG+=git_build \
+  GST_VERSION=%{gst}
+
 %make_build
 
 %install
@@ -58,32 +91,70 @@ for prl_file in *.prl ; do
 done
 popd
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %license LICENSE.*
-%{_qt5_libdir}/libQt5Multimedia*.so.5*
-%{_qt5_libdir}/cmake/Qt5Multimedia/Qt5Multimedia_*Plugin.cmake
-%{_qt5_archdatadir}/qml/{QtAudioEngine/,QtMultimedia/}
-%{_qt5_plugindir}/{audio/,mediaservice/,playlistformats/}
+%{_qt5_libdir}/libQt5Multimedia.so.5*
+%{_qt5_libdir}/libQt5MultimediaQuick.so.5*
+%{_qt5_libdir}/libQt5MultimediaWidgets.so.5*
+%{_qt5_libdir}/libQt5MultimediaGstTools.so.5*
+%if 0%{?openal}
+%{_qt5_archdatadir}/qml/QtAudioEngine/
+%endif
+%{_qt5_archdatadir}/qml/QtMultimedia/
+%{_qt5_plugindir}/audio/
+%{_qt5_plugindir}/mediaservice/
+%{_qt5_plugindir}/playlistformats/
 %dir %{_qt5_libdir}/cmake/Qt5Multimedia/
+%{_qt5_libdir}/cmake/Qt5Multimedia/Qt5Multimedia_*Plugin.cmake
 %dir %{_qt5_libdir}/cmake/Qt5MultimediaWidgets/
 
 %files devel
-%{_qt5_libdir}/libQt5Multimedia*.{so,prl}
-%{_qt5_libdir}/pkgconfig/Qt5Multimedia*.pc
+%{_qt5_headerdir}/QtMultimedia/
+%{_qt5_headerdir}/QtMultimediaQuick/
+%{_qt5_headerdir}/QtMultimediaWidgets/
+%{_qt5_headerdir}/QtMultimediaGstTools/
+%{_qt5_libdir}/libQt5Multimedia.so
+%{_qt5_libdir}/libQt5Multimedia.prl
+%{_qt5_libdir}/libQt5MultimediaQuick.so
+%{_qt5_libdir}/libQt5MultimediaQuick.prl
+%{_qt5_libdir}/libQt5MultimediaWidgets.so
+%{_qt5_libdir}/libQt5MultimediaWidgets.prl
+%{_qt5_libdir}/libQt5MultimediaGstTools.so
+%{_qt5_libdir}/libQt5MultimediaGstTools.prl
 %{_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_libdir}/pkgconfig/Qt5Multimedia.pc
+%{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
+
 %if 0%{?_qt5_examplesdir:1}
+%files examples
 %license LICENSE.FDL
 %{_qt5_examplesdir}/
 %endif
 
+
 %changelog
+* Mon Aug 21 2023 huayadong <huayadong@kylinos.cn> - 5.15.10-1
+- update to version 5.15.10-1
+
+* Wed Aug 24 2022 liyanan <liyanan32@h-partners.com> - 5.15.2-2
+- fix rpath problem
+
+* 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
+
+* Wed Jul 14 2021 zhaoshuang <zhaoshuang@uniontech.com> - 5.11.1-7
+- Add patch Fix-gst_mini_object_unref to fix gstreamer related issue
+
 * Mon Sep 14 2020 liuweibo <liuweibo10@huawei.com> - 5.11.1-6
 - Fix Source0
 

qt5-qtmultimedia.yaml

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