rpms/qt5-qtmultimedia
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update Qt 5.7.0

Browse Source
This commit is contained in:
Helio Chissini de Castro 2016-07-15 23:39:22 +02:00
parent fd21ad5de3
commit 6464f02754
4 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/qtmultimedia-opensource-src-5.6.0-rc.tar.xz /qtmultimedia-opensource-src-5.6.0-rc.tar.xz
/qtmultimedia-opensource-src-5.6.0.tar.xz /qtmultimedia-opensource-src-5.6.0.tar.xz
/qtmultimedia-opensource-src-5.6.1.tar.xz /qtmultimedia-opensource-src-5.6.1.tar.xz
/qtmultimedia-opensource-src-5.7.0.tar.xz

25
qt5-qtmultimedia.spec
View File

@ -19,25 +19,21 @@
%global gst 1.0 %global gst 1.0
%endif %endif
#define prerelease #define prerelease rc
Summary: Qt5 - Multimedia support Summary: Qt5 - Multimedia support
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.6.1 Version: 5.7.0
Release: 3%{?prerelease:.%{prerelease}}%{?dist} Release: 2%{?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
Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz Source0: http://download.qt.io/official_releases/qt/5.7/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
## upstreamable paches
# FTBFS on el6
Patch50: qtmultimedia-opensource-src-5.6.1-nullptr.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: pkgconfig(Qt5Quick) >= %{version}
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
%if "%{?gst}" == "0.10" %if "%{?gst}" == "0.10"
BuildRequires: pkgconfig(gstreamer-interfaces-0.10) BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
@ -55,7 +51,6 @@ BuildRequires: pkgconfig(openal)
%endif %endif
BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xv)
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%description %description
@ -94,8 +89,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
%patch50 -p1 -b .nullptr
%build %build
mkdir %{_target_platform} mkdir %{_target_platform}
@ -184,11 +177,11 @@ popd
%changelog %changelog
* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3 * Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
- drop pkgconfig-style Qt5 deps - Compiled with gcc
* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2 * Mon Jun 13 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-1
- BR: qt5-qtbase-private-devel, nullptr el6 FTBFS - Qt 5.7.0 release
* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1 * Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
- Update to 5.6.1 - Update to 5.6.1

12
qtmultimedia-opensource-src-5.6.1-nullptr.patch
View File

@ -1,12 +0,0 @@
diff -up qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp.nullptr qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp
--- qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp.nullptr 2016-05-31 05:23:00.000000000 -0500
+++ qtmultimedia-opensource-src-5.6.1/src/gsttools/qgstreamerbushelper.cpp 2016-06-15 15:48:15.325108680 -0500
@@ -52,7 +52,7 @@ public:
m_tag(0),
m_bus(bus),
m_helper(parent),
- m_intervalTimer(nullptr)
+ m_intervalTimer(Q_NULLPTR)
{
// glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher
QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();

2
sources
View File

@ -1 +1 @@
01e90a2ba304625305170f04cf3e6704 qtmultimedia-opensource-src-5.6.1.tar.xz 44c1b9a1dfb0e8b13f2d9571829500ee qtmultimedia-opensource-src-5.7.0.tar.xz