Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtmultimedia for openSUSE:Factory checked in at 2021-06-27 18:58:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtmultimedia (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtmultimedia" Sun Jun 27 18:58:54 2021 rev:51 rq:902341 version:5.15.2+kde3 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtmultimedia/libqt5-qtmultimedia.changes 2021-01-26 14:44:05.495194099 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new.2625/libqt5-qtmultimedia.changes 2021-06-27 18:59:46.908331226 +0200 @@ -1,0 +2,11 @@ +Tue Jun 22 19:33:55 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de> + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde3: + * Revert "Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrame" + * Add changes file for Qt 5.15.2 + * Bump version +- Add patch to reset version to 5.15.2: + * 0001-Revert-Bump-version.patch + +------------------------------------------------------------------- Old: ---- qtmultimedia-everywhere-src-5.15.2.tar.xz New: ---- 0001-Revert-Bump-version.patch _service _servicedata qtmultimedia-everywhere-src-5.15.2+kde3.obscpio qtmultimedia-everywhere-src.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtmultimedia.spec ++++++ --- /var/tmp/diff_new_pack.KaiS2p/_old 2021-06-27 18:59:48.184332903 +0200 +++ /var/tmp/diff_new_pack.KaiS2p/_new 2021-06-27 18:59:48.188332908 +0200 @@ -19,7 +19,7 @@ # Internal QML imports of examples %global __requires_exclude qmlimport\\((FrequencyMonitor|qmlvideofilter).* -%define qt5_snapshot 0 +%define qt5_snapshot 1 %define libname libQt5Multimedia5 %ifarch %{arm} aarch64 %define gles 1 @@ -29,20 +29,22 @@ %define base_name libqt5 %define real_version 5.15.2 %define so_version 5.15.2 -%define tar_version qtmultimedia-everywhere-src-5.15.2 +%define tar_version qtmultimedia-everywhere-src-%{version} Name: libqt5-qtmultimedia -Version: 5.15.2 +Version: 5.15.2+kde3 Release: 0 Summary: Qt 5 Multimedia Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz +Source: %{tar_version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version.patch BuildRequires: alsa-devel BuildRequires: fdupes -BuildRequires: libQt5Gui-private-headers-devel >= %{version} -BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +BuildRequires: libQt5Gui-private-headers-devel >= %{real_version} +BuildRequires: libQt5Widgets-private-headers-devel >= %{real_version} BuildRequires: libpulse-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libwmf-devel @@ -52,8 +54,8 @@ %endif BuildRequires: pkgconfig BuildRequires: xz -BuildRequires: pkgconfig(Qt5Qml) >= %{version} -BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: pkgconfig(Qt5Qml) >= %{real_version} +BuildRequires: pkgconfig(Qt5Quick) >= %{real_version} BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-base-1.0) @@ -71,7 +73,7 @@ management. %prep -%setup -q -n %{tar_version} +%autosetup -p1 -n %{tar_version} %package -n %{libname} Summary: Qt 5 Multimedia Library @@ -92,7 +94,7 @@ Requires: %{libname} = %{version} # The mkspec adds -lpulse-mainloop-glib -lpulse -lglib-2.0 Requires: libpulse-devel -Requires: libqt5-qtdeclarative-devel >= %{version} +Requires: libqt5-qtdeclarative-devel >= %{real_version} Provides: libQt5Multimedia-devel = %{version} Obsoletes: libQt5Multimedia-devel < %{version} @@ -104,8 +106,8 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Requires: libQt5Gui-private-headers-devel >= %{version} -Requires: libQt5Widgets-private-headers-devel >= %{version} +Requires: libQt5Gui-private-headers-devel >= %{real_version} +Requires: libQt5Widgets-private-headers-devel >= %{real_version} Provides: libQt5Multimedia-private-headers-devel = %{version} Obsoletes: libQt5Multimedia-private-headers-devel < %{version} BuildArch: noarch ++++++ 0001-Revert-Bump-version.patch ++++++ >From e9925bda6f46df22371de29d388d058cd89f493e Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fv...@suse.de> Date: Tue, 22 Jun 2021 21:33:55 +0200 Subject: [PATCH] Revert "Bump version" This reverts commit 7335d6853f753510236c3ab569788611dbcb9bef. --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 5fb75cffe..1dc5dd15f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.3 +MODULE_VERSION = 5.15.2 -- 2.20.1 ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="changesgenerate">enable</param> <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param> <param name="url">https://invent.kde.org/qt/qt/qtmultimedia.git</param> <param name="scm">git</param> <param name="filename">qtmultimedia-everywhere-src</param> <param name="revision">kde/5.15</param> <param name="parent-tag">v5.15.2</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="disabled"/> <service name="tar" mode="buildtime"/> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://invent.kde.org/qt/qt/qtmultimedia.git</param> <param name="changesrevision">bd29c87027637a013f2c5e3b549fcda84e4d7545</param></service></servicedata>++++++ qtmultimedia-everywhere-src.obsinfo ++++++ name: qtmultimedia-everywhere-src version: 5.15.2+kde3 mtime: 1606744021 commit: bd29c87027637a013f2c5e3b549fcda84e4d7545