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

- Merge fix

Browse Source
This commit is contained in:
Helio Chissini de Castro 2015-12-10 22:20:00 +01:00
commit 1a6e9516a2
3 changed files with 8 additions and 7547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/qtmultimedia-opensource-src-5.5.1-rc1.tar.xz /qtmultimedia-opensource-src-5.5.1-rc1.tar.xz
/qtmultimedia-opensource-src-5.5.1.tar.xz /qtmultimedia-opensource-src-5.5.1.tar.xz
/qtmultimedia-opensource-src-5.6.0-beta.tar.gz /qtmultimedia-opensource-src-5.6.0-beta.tar.gz
/qtmultimedia-opensource-src-5.6.0-beta1.tar.xz

7546
0006-GStreamer-port-to-1.0.patch
View File

File diff suppressed because it is too large Load Diff

8
qt5-qtmultimedia.spec
View File

@ -153,7 +153,6 @@ popd
%{_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}/pkgconfig/Qt5Multimedia.pc %{_qt5_libdir}/pkgconfig/Qt5Multimedia.pc
%{_qt5_libdir}/pkgconfig/Qt5MultimediaQuick_p.pc
%{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc %{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri %{_qt5_archdatadir}/mkspecs/modules/*.pri
@ -179,6 +178,13 @@ popd
* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1 * Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
- Start to implement 5.6.0 beta - Start to implement 5.6.0 beta
* Mon Oct 26 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-4
- pull in upstream fixes, QTBUG-48939 in particular
* Thu Oct 22 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-3
- drop gst support on el6 (QTBUG-48939)
>>>>>>> fd4ed5e29285a7afe1be8c8cf30c7247fcad9fbb
* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2 * Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
- Update to final release 5.5.1 - Update to final release 5.5.1