Hello community, here is the log from the commit of package QtAV for openSUSE:Factory checked in at 2019-12-05 17:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QtAV (Old) and /work/SRC/openSUSE:Factory/.QtAV.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QtAV" Thu Dec 5 17:36:03 2019 rev:6 rq:754390 version:1.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/QtAV/QtAV.changes 2019-07-23 22:34:49.643002960 +0200 +++ /work/SRC/openSUSE:Factory/.QtAV.new.4691/QtAV.changes 2019-12-05 17:39:10.653356164 +0100 @@ -1,0 +2,5 @@ +Thu Dec 5 13:37:04 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Fix-build-with-Qt-5.14.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.14.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QtAV.spec ++++++ --- /var/tmp/diff_new_pack.fTzX2w/_old 2019-12-05 17:39:11.841355735 +0100 +++ /var/tmp/diff_new_pack.fTzX2w/_new 2019-12-05 17:39:11.841355735 +0100 @@ -1,7 +1,7 @@ # # spec file for package QtAV # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,14 +26,17 @@ Summary: Qt multimedia framework License: LGPL-2.1-or-later AND GPL-3.0-only Group: Productivity/Multimedia/Other -Url: http://qtav.org/ +URL: http://qtav.org/ Source0: QtAV-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-build-with-Qt-5.14.patch Patch1: fix-linking.patch Patch2: disable_cuda.patch BuildRequires: ImageMagick BuildRequires: dos2unix BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem +BuildRequires: pkgconfig BuildRequires: portaudio-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) @@ -135,8 +138,7 @@ applications using QtAV headers. %prep -%setup -q -n %{src_name}-%{version} -%autopatch -p1 +%autosetup -p1 -n %{src_name}-%{version} # Fix incorrect sRGB profile for f in $(find . -type f -name \*.png); do @@ -180,27 +182,22 @@ %post -n lib%{Qt_name}%{sover} -p /sbin/ldconfig %postun -n lib%{Qt_name}%{sover} -p /sbin/ldconfig - %post -n lib%{Qt_name}Widgets%{sover} -p /sbin/ldconfig %postun -n lib%{Qt_name}Widgets%{sover} -p /sbin/ldconfig - %post -n %{Qt_name}-players %desktop_database_post %postun -n %{Qt_name}-players %desktop_database_postun %files -%defattr(-,root,root) -%doc Changelog gpl-3.0* lgpl-2.1* README* +%license gpl-3.0* lgpl-2.1* +%doc Changelog README* %files -n lib%{Qt_name}%{sover} -%defattr(-,root,root) %{_libqt5_libdir}/lib%{Qt_name}.so.* %files -n lib%{Qt_name}Widgets%{sover} -%defattr(-,root,root) %{_libqt5_libdir}/lib%{Qt_name}Widgets.so.* %files -n %{Qt_name}-qml -%defattr(-,root,root) %dir %{_kf5_qmldir}/%{Qt_name} %{_kf5_qmldir}/%{Qt_name}/Video.qml %{_kf5_qmldir}/%{Qt_name}/libQmlAV.so @@ -208,28 +205,26 @@ %{_kf5_qmldir}/%{Qt_name}/qmldir %files -n %{Qt_name}-players -%defattr(-,root,root) %{_bindir}/Player %{_bindir}/QMLPlayer -%{_libqt5_bindir}/Player -%{_libqt5_bindir}/QMLPlayer -%{_datadir}/applications/QMLPlayer.desktop %{_datadir}/applications/Player.desktop +%{_datadir}/applications/QMLPlayer.desktop %{_datadir}/icons/hicolor/scalable/apps/%{Qt_name}.svg +%{_libqt5_bindir}/Player +%{_libqt5_bindir}/QMLPlayer %files -n %{Qt_name}-devel -%defattr(-,root,root) -%{_libqt5_libdir}/lib%{Qt_name}.so -%{_libqt5_libdir}/lib%{Qt_name}.prl -%{_libqt5_libdir}/lib%{Qt_name}Widgets.so -%{_libqt5_libdir}/lib%{Qt_name}Widgets.prl -%{_libqt5_archdatadir}/mkspecs/features/av.prf -%{_libqt5_archdatadir}/mkspecs/features/avwidgets.prf %{_kf5_mkspecsdir}/qt_lib_av.pri %{_kf5_mkspecsdir}/qt_lib_av_private.pri %{_kf5_mkspecsdir}/qt_lib_avwidgets.pri %{_kf5_mkspecsdir}/qt_lib_avwidgets_private.pri +%{_libqt5_archdatadir}/mkspecs/features/av.prf +%{_libqt5_archdatadir}/mkspecs/features/avwidgets.prf %{_libqt5_includedir}/QtAV %{_libqt5_includedir}/QtAVWidgets +%{_libqt5_libdir}/lib%{Qt_name}.prl +%{_libqt5_libdir}/lib%{Qt_name}.so +%{_libqt5_libdir}/lib%{Qt_name}Widgets.prl +%{_libqt5_libdir}/lib%{Qt_name}Widgets.so %changelog ++++++ 0001-Fix-build-with-Qt-5.14.patch ++++++ >From 6d57ad92415805ba29fddfb4fe5b010b968cd73c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 5 Dec 2019 14:36:36 +0100 Subject: [PATCH] Fix build with Qt 5.14. --- qml/SGVideoNode.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp index b12089d..3f2a07d 100644 --- a/qml/SGVideoNode.cpp +++ b/qml/SGVideoNode.cpp @@ -25,6 +25,7 @@ #include "QtAV/VideoFrame.h" #include <QtCore/QScopedPointer> #include <QtGui/QOpenGLFunctions> +#include <QtQuick/QSGMaterial> #include <QtQuick/QSGMaterialShader> // all in QSGRenderThread -- 2.24.0
