From 90389c79068448104277d0b204419dcebf43be9b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 21 Apr 2021 14:19:21 +0000 Subject: [PATCH] import qt5-qtmultimedia-5.15.2-1.el8 --- .gitignore | 2 +- .qt5-qtmultimedia.metadata | 2 +- SPECS/qt5-qtmultimedia.spec | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e58d940..01d12d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtmultimedia-everywhere-src-5.12.5.tar.xz +SOURCES/qtmultimedia-everywhere-src-5.15.2.tar.xz diff --git a/.qt5-qtmultimedia.metadata b/.qt5-qtmultimedia.metadata index 2c42e81..f34b8a9 100644 --- a/.qt5-qtmultimedia.metadata +++ b/.qt5-qtmultimedia.metadata @@ -1 +1 @@ -7b43e23781b95d47744a766bb8bbf6f07b949f57 SOURCES/qtmultimedia-everywhere-src-5.12.5.tar.xz +35a54788c835f8c31af5ce35a04fa54d847855b8 SOURCES/qtmultimedia-everywhere-src-5.15.2.tar.xz diff --git a/SPECS/qt5-qtmultimedia.spec b/SPECS/qt5-qtmultimedia.spec index e21dbf4..9ee79c0 100644 --- a/SPECS/qt5-qtmultimedia.spec +++ b/SPECS/qt5-qtmultimedia.spec @@ -11,7 +11,7 @@ Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.12.5 +Version: 5.15.2 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -24,6 +24,9 @@ Patch0: qtmultimedia-python-shebang.patch # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ +# 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 BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-private-devel #libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit) @@ -125,7 +128,6 @@ popd %ldconfig_scriptlets - %files %license LICENSE.* %{_qt5_libdir}/libQt5Multimedia.so.5* @@ -158,6 +160,8 @@ popd %{_qt5_libdir}/libQt5MultimediaGstTools.prl %{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake %{_qt5_libdir}/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig*.cmake +%{_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 @@ -174,6 +178,10 @@ popd %endif %changelog +* Sun Apr 04 2021 Jan Grulich - 5.15.2-1 +- 5.15.2 + Resolves: bz#1930048 + * Mon Nov 18 2019 Jan Grulich - 5.12.5-1 - 5.12.5 Resolves: bz#1733144