Compare commits

...

No commits in common. "imports/c8-beta/qt5-qtmultimedia-5.11.1-2.el8" and "c8" have entirely different histories.

5 changed files with 86 additions and 10 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/qtmultimedia-everywhere-src-5.11.1.tar.xz SOURCES/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz

View File

@ -1 +1 @@
52f57f28406a89c4e74d4568c63624563c2acf1c SOURCES/qtmultimedia-everywhere-src-5.11.1.tar.xz 73d3392cc23117fd723dbc35ffa5e46805b7fb90 SOURCES/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz

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

@ -0,0 +1,10 @@
diff --git a/tests/auto/runautotests.py b/tests/auto/runautotests.py
index ba277e9..162dd1d 100755
--- a/tests/auto/runautotests.py
+++ b/tests/auto/runautotests.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.

View File

@ -7,19 +7,27 @@
%global gst 1.0 %global gst 1.0
%endif %endif
%global build_tests 1
Summary: Qt5 - Multimedia support Summary: Qt5 - Multimedia support
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.11.1 Version: 5.15.3
Release: 2%{?dist} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2) %global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
Patch0: qtmultimedia-python-shebang.patch
Patch1: %{name}-gcc11.patch
# filter plugin/qml provides # filter plugin/qml provides
%global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ %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-devel >= %{version}
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
#libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit) #libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit)
@ -66,22 +74,48 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples %description examples
%{summary}. %{summary}.
%if 0%{?build_tests}
%package tests
Summary: Unit tests for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests
%{summary}.
%endif
%prep %prep
%setup -q -n %{qt_module}-everywhere-src-%{version} %setup -q -n %{qt_module}-everywhere-src-%{version}
%patch0 -p1
%patch1 -p1
%build %build
%{qmake_qt5} \ %{qmake_qt5} \
CONFIG+=git_build \ CONFIG+=git_build \
GST_VERSION=%{gst} GST_VERSION=%{gst}
make %{?_smp_mflags} %make_build
%if 0%{?build_tests}
make sub-tests %{?_smp_mflags} -k ||:
%endif
%install %install
make install INSTALL_ROOT=%{buildroot} make install INSTALL_ROOT=%{buildroot}
%if 0%{?build_tests}
# Install tests for gating
mkdir -p %{buildroot}%{_qt5_libdir}/qt5
find ./tests -not -path '*/\.*' -type d | while read LINE
do
mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE"
done
find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE
do
cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/
done
%endif
## .prl/.la file love ## .prl/.la file love
# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
pushd %{buildroot}%{_qt5_libdir} pushd %{buildroot}%{_qt5_libdir}
@ -94,9 +128,7 @@ for prl_file in *.prl ; do
done done
popd popd
%ldconfig_scriptlets
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%license LICENSE.* %license LICENSE.*
@ -130,6 +162,8 @@ popd
%{_qt5_libdir}/libQt5MultimediaGstTools.prl %{_qt5_libdir}/libQt5MultimediaGstTools.prl
%{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake %{_qt5_libdir}/cmake/Qt5Multimedia/Qt5MultimediaConfig*.cmake
%{_qt5_libdir}/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig*.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/Qt5Multimedia.pc
%{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc %{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri %{_qt5_archdatadir}/mkspecs/modules/*.pri
@ -140,8 +174,28 @@ popd
%{_qt5_examplesdir}/ %{_qt5_examplesdir}/
%endif %endif
%if 0%{?build_tests}
%files tests
%{_qt5_libdir}/qt5/tests
%endif
%changelog %changelog
* Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
- 5.15.3
Resolves: bz#2061396
* Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
- Rebuild (binutils)
Resolves: bz#1930048
* Sun Apr 04 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- 5.15.2
Resolves: bz#1930048
* Mon Nov 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5
Resolves: bz#1733144
* Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2 * Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
- Rebuild to fix CET notes - Rebuild to fix CET notes
Resolves: bz#1657249 Resolves: bz#1657249