Hello community, here is the log from the commit of package libqt5-qtmultimedia for openSUSE:Factory checked in at 2014-12-21 11:57:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtmultimedia (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtmultimedia" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtmultimedia/libqt5-qtmultimedia.changes 2014-09-18 07:56:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new/libqt5-qtmultimedia.changes 2014-12-21 11:56:22.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Dec 10 11:00:08 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.4 Final + * For more details please see: + http://blog.qt.digia.com/blog/2014/12/10/qt-5-4-released/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.4 + +------------------------------------------------------------------- +Thu Nov 27 15:58:44 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.4 RC + * For more details please see: + http://blog.qt.digia.com/blog/2014/11/27/qt-5-4-release-candidate-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.4 +- Add pkgconfig(gstreamer-plugins-bad-1.0) BuildRequires +- Swap Initial-porting-effort-to-GStreamer-1.0.patch for + 0001-GStreamer-port-to-1.0.patch, which was commited upstream + for Qt 5.5 + +------------------------------------------------------------------- +Mon Nov 3 20:44:31 UTC 2014 - hrvoje.senjan@gmail.com + +- Don't BuildRequire openal-soft-devel for SLE +- Downgrade external packages to suggests of the devel package, they + are private deps + +------------------------------------------------------------------- Old: ---- Initial-porting-effort-to-GStreamer-1.0.patch qtmultimedia-opensource-src-5.3.2.tar.xz New: ---- 0001-GStreamer-port-to-1.0.patch qtmultimedia-opensource-src-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtmultimedia.spec ++++++ --- /var/tmp/diff_new_pack.n4GHgs/_old 2014-12-21 11:56:23.000000000 +0100 +++ /var/tmp/diff_new_pack.n4GHgs/_new 2014-12-21 11:56:23.000000000 +0100 @@ -16,25 +16,30 @@ # -%define qt5_snapshot 0 - +%define qt5_snapshot 1 %define libname libQt5Multimedia5 +%ifarch %arm aarch64 +%define gles 1 +%else +%define gles 0 +%endif + Name: libqt5-qtmultimedia -Version: 5.3.2 +Version: 5.4.0 Release: 0 Summary: Qt 5 Multimedia Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.3.2 -%define so_version 5.3.2 +%define real_version 5.4.0 +%define so_version 5.4.0 %define tar_version qtmultimedia-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM Initial-porting-effort-to-GStreamer-1.0.patch -- support building with gstreamer 1.0 API (taken from upstream wip/gstreamer-1.0 branch) -Patch0: Initial-porting-effort-to-GStreamer-1.0.patch +# PATCH-FIX-UPSTREAM 0001-GStreamer-port-to-1.0.patch -- support building with gstreamer 1.0 API (taken from upstream dev branch) +Patch0: 0001-GStreamer-port-to-1.0.patch BuildRequires: alsa-devel BuildRequires: fdupes %if 0%{?suse_version} < 1315 @@ -50,6 +55,7 @@ BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-base-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) %endif @@ -58,7 +64,9 @@ BuildRequires: libpulse-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libwmf-devel +%if !0%{?suse_version} == 1315 BuildRequires: openal-soft-devel +%endif BuildRequires: pkgconfig(Qt5Qml) >= %{version} BuildRequires: pkgconfig(Qt5Quick) >= %{version} %if %qt5_snapshot @@ -77,9 +85,7 @@ %prep %setup -q -n qtmultimedia-opensource-src-%{real_version} -%if 0%{?suse_version} >= 1315 %patch0 -p1 -%endif %package -n %libname Summary: Qt 5 Multimedia Library @@ -95,10 +101,12 @@ Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %{version} -Requires: libpulse-devel Requires: libqt5-qtdeclarative-devel >= %{version} -Requires: libwmf-devel -Requires: openal-soft-devel +Suggests: libpulse-devel +Suggests: libwmf-devel +%if !0%{?suse_version} == 1315 +Suggests: openal-soft-devel +%endif Provides: libQt5Multimedia-devel = %{version} Obsoletes: libQt5Multimedia-devel < %{version} @@ -134,11 +142,16 @@ %postun -n %libname -p /sbin/ldconfig %build +%if 0%{?suse_version} >= 1315 +GST="1.0" +%else +GST="0.10" +%endif %if %qt5_snapshot #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif -%qmake5 +%qmake5 GST_VERSION=$GST %make_jobs %install @@ -152,22 +165,25 @@ %files -n %libname %defattr(-,root,root,755) -%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL +%doc LGPL_EXCEPTION.txt LICENSE.* %{_libqt5_libdir}/libQt5*.so.* %{_libqt5_plugindir}/mediaservice %{_libqt5_plugindir}/playlistformats %{_libqt5_libdir}/libqgsttools_p.so.* %{_libqt5_plugindir}/audio +%if %gles +%{_libqt5_plugindir}/video +%endif %{_libqt5_archdatadir}/qml/Qt* %files private-headers-devel %defattr(-,root,root,755) -%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL +%doc LGPL_EXCEPTION.txt LICENSE.* %{_libqt5_includedir}/Qt*/%{so_version} %files devel %defattr(-,root,root,755) -%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL +%doc LGPL_EXCEPTION.txt LICENSE.* %exclude %{_libqt5_includedir}/Qt*/%{so_version} %{_libqt5_includedir}/Qt* %{_libqt5_libdir}/cmake/Qt5* @@ -180,7 +196,7 @@ %files examples %defattr(-,root,root,755) -%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL +%doc LGPL_EXCEPTION.txt LICENSE.* %{_libqt5_examplesdir}/ %changelog ++++++ 0001-GStreamer-port-to-1.0.patch ++++++ ++++ 7649 lines (skipped) ++++++ qtmultimedia-opensource-src-5.3.2.tar.xz -> qtmultimedia-opensource-src-5.4.0.tar.xz ++++++ ++++ 79573 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org