Compare commits

...

No commits in common. "c9s" and "c8" have entirely different histories.
c9s ... c8

8 changed files with 31 additions and 118 deletions

16
.gitignore vendored
View File

@ -1,15 +1 @@
/qtmultimedia-everywhere-src-5.10.1.tar.xz SOURCES/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz
/qtmultimedia-everywhere-src-5.11.0.tar.xz
/qtmultimedia-everywhere-src-5.11.1.tar.xz
/qtmultimedia-everywhere-src-5.11.2.tar.xz
/qtmultimedia-everywhere-src-5.11.3.tar.xz
/qtmultimedia-everywhere-src-5.12.1.tar.xz
/qtmultimedia-everywhere-src-5.12.3.tar.xz
/qtmultimedia-everywhere-src-5.12.4.tar.xz
/qtmultimedia-everywhere-src-5.12.5.tar.xz
/qtmultimedia-everywhere-src-5.13.2.tar.xz
/qtmultimedia-everywhere-src-5.14.2.tar.xz
/qtmultimedia-everywhere-src-5.15.1.tar.xz
/qtmultimedia-everywhere-src-5.15.2.tar.xz
/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz
/qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz

View File

@ -1 +1 @@
e52b8b8482bc62232cf1b738f58f2e5747c29f0d qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz 73d3392cc23117fd723dbc35ffa5e46805b7fb90 SOURCES/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz

View File

@ -11,9 +11,8 @@
Summary: Qt5 - Multimedia support Summary: Qt5 - Multimedia support
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.15.9 Version: 5.15.3
Release: 1%{?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
@ -21,12 +20,14 @@ Url: http://www.qt.io
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-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 Patch0: qtmultimedia-python-shebang.patch
Patch1: %{name}-gcc11.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)$
BuildRequires: make # 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)
@ -49,9 +50,6 @@ BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(openal)
%endif %endif
BuildRequires: pkgconfig(xv) 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 %description
The Qt Multimedia module provides a rich feature set that enables you to The Qt Multimedia module provides a rich feature set that enables you to
@ -97,16 +95,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
GST_VERSION=%{gst} GST_VERSION=%{gst}
%make_build %make_build
%if 0%{?build_tests} %if 0%{?build_tests}
%qt5_build_tests make sub-tests %{?_smp_mflags} -k ||:
%endif %endif
%install %install
make install INSTALL_ROOT=%{buildroot} make install INSTALL_ROOT=%{buildroot}
%if 0%{?build_tests} %if 0%{?build_tests}
%qt5_install_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 %endif
## .prl/.la file love ## .prl/.la file love
@ -121,7 +128,6 @@ for prl_file in *.prl ; do
done done
popd popd
%ldconfig_scriptlets %ldconfig_scriptlets
%files %files
@ -174,100 +180,29 @@ popd
%endif %endif
%changelog %changelog
* Tue Apr 18 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
- 5.15.9
Resolves: bz#2175736
* Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1 * Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
- 5.15.3 - 5.15.3
Resolves: bz#2061361 Resolves: bz#2061396
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-7 * Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuild (binutils)
Related: rhbz#1991688 Resolves: bz#1930048
* Thu Jun 10 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-6 * Sun Apr 04 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- Let qt5_install_tests macro handle mangling python shebangs
Resolves: bz#1968467
* Wed Jun 09 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-5
- Add gating tests
Resolves: bz#1968467
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Nov 24 07:54:14 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
- Rebuild for qtbase with -no-reduce-relocations option
* Fri Nov 20 09:30:46 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- 5.15.2 - 5.15.2
Resolves: bz#1930048
* Fri Oct 16 2020 Jeff Law <law@redhat.com> - 5.15.1-2 * Mon Nov 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- Fix missing #include for gcc-11
* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
- 5.15.1
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
- 5.14.2
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
- 5.13.2
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5 - 5.12.5
Resolves: bz#1733144
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-4 * Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuild to fix CET notes
Resolves: bz#1657249
* Fri Jun 28 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-3 * Tue Jul 03 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-1
- rebuild (qtbase)
* Fri Jun 28 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-2
- rebuild (qtbase)
* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
- 5.12.4
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
- 5.12.3
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
- 5.12.1
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
- 5.11.3
* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
- 5.11.2
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
- 5.11.1 - 5.11.1
* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
- 5.11.0
- use %%make_build %%ldconfig_scriptlets
* Wed Feb 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1 * Wed Feb 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
- 5.10.1 - 5.10.1

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1 +0,0 @@
SHA512 (qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz) = f167e7910c19a55858a4b8e53c293908ef50e8a299b5dc6a346c2c877b4f65aa6da17807ec3f297530515b4558c74e97d54d6013c27400c1c4964c7c4dbef6cd

View File

@ -1 +0,0 @@
qtmultimedia-everywhere-src