Hello community, here is the log from the commit of package shotcut for openSUSE:Factory checked in at 2018-06-29 22:29:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotcut (Old) and /work/SRC/openSUSE:Factory/.shotcut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shotcut" Fri Jun 29 22:29:02 2018 rev:14 rq:617539 version:18.06.02 Changes: -------- --- /work/SRC/openSUSE:Factory/shotcut/shotcut.changes 2018-05-13 16:05:12.934002429 +0200 +++ /work/SRC/openSUSE:Factory/.shotcut.new/shotcut.changes 2018-06-29 22:29:16.338353015 +0200 @@ -1,0 +2,56 @@ +Mon Jun 11 15:07:48 UTC 2018 - [email protected] + +- Update to release 18.06.02 and rebased patches. +- Fixes build against latest qt5 with shotcut-QAction.patch. +- Upstream changes: + *Remove the old variant with MLT logo, and add 2x variants. + *Change app launch splash image. + *Add Detach Audio to timeline clip context menu. + *Only use YAML for presets with MLT v6.9.0+ + *Use YAML for filter presets. * + *The legacy preset format does not support multiline text. The YAML + *format does support multiline text. Maintain backwards compatiblity + *Add double-click action to timeline faders. + *Double-click toggles between one second and removing the filters. + *Fix audio filters get incorrect channel count state. + *Add support for mono and surround to Swap Channels filter. + *Add mono and surround support the the Copy Channel filter. + *Set bounds on dragging keyframes. + *Fix #576 squashed commit of the following: + Fix nullptr c++11, which we are not using yet. + Copy file date when converting files. + *Add support for AMD AMF to Export panel. + *Add simple and advanced keyframes to Mask filter. + *Add AMD AMF support to FFmpeg build on Windows. + *Fix building FFmpeg with NVENC. + *Add --enable-libjack for FFmpeg 4.0 + *Upgrade to FFmpeg 4.0 + *Add keyframes to Saturation filter. + *Add a keyboard shortcuts link to the Help menu. + *Fix #572 restart with command line arguments. + *Refresh after changing interpolation or deinterlacer. + *Fix many frames dropped on start of playback from pause. + *Fix small memory leak in Open Other dialog. + *Add keyframes to Blur filter. + *Fix KeyframesButton's tooltip getting stuck showing. + *Add undo buttons to Size and Position filter UI. + *Fix #568 libopus breaks audio rate control options. + *Add Reverse to clip Properties menu. + *Add many animated presets to Size and Position. + *Fix filter duration and simple keyframes after split and merge. + *Fix animate/fade out when trimming in on timeline. + *Add double-click for simple keyframes. + *Increase size of avformat producer cache per MLT change. + *Fix #557 by limiting threads and thus memory usage on 32-bit. + *Only adjust filter when trimming clip if filter is not trimmed. + *Use UTF-8 for FFmpeg device strings. + *Change Mask default rotation to 50%. + *Adjust simple keyframes on non-current filters when trimming. + *Reduce opacity when VUI rectangle control is disabled. + *Fix #555 track & master filter durations not adjusted. + *Fix name of master & track filters in Keyframes dock. + *Additional GPU checking and clarifications. + *Make MLT XML file dropped onto Playlist into a virtual clip. + *Fix #554 repeated File > Close crashes. + +------------------------------------------------------------------- Old: ---- shotcut-18.05.08.tar.gz New: ---- shotcut-18.06.02.tar.gz shotcut-QAction.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotcut.spec ++++++ --- /var/tmp/diff_new_pack.BLSKiD/_old 2018-06-29 22:29:16.882352601 +0200 +++ /var/tmp/diff_new_pack.BLSKiD/_new 2018-06-29 22:29:16.882352601 +0200 @@ -22,13 +22,13 @@ %bcond_with x264 Name: shotcut -Version: 18.05.08 +Version: 18.06.02 Release: 0 # This package creates a build time version from the current date and uses it to check # for updates. See patch1 and prep/build section. For reproducible builds. %define _vstring %(echo %{version} |tr -d ".") Summary: Video and audio editor and creator -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.shotcut.org/ Source: https://github.com/mltframework/shotcut/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -36,6 +36,7 @@ Patch0: shotcut-desktopfile.patch # PATCH-FIX-OPENSUSE shotcut-noupdatecheck.patch [email protected] -- Disable automatic update check Patch1: shotcut-noupdatecheck.patch +Patch2: shotcut-QAction.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libqt5-qtdeclarative-private-headers-devel @@ -87,8 +88,9 @@ %prep %setup -q echo "Qt5Core = %{qt5version}" -%patch0 +#%%patch0 %patch1 +%patch2 # Search for executable files find . \ @@ -110,7 +112,7 @@ PREFIX="%{_prefix}" -Wall -recursive make %{_smp_mflags} VERBOSE=1 - +# CC=gcc-8 CPP=cpp-8 CXX=g++-8 %install %qmake5_install @@ -136,14 +138,16 @@ done popd cp -v version.json %{buildroot}%{_datadir}/%{name} -%suse_update_desktop_file -i %{name} +%suse_update_desktop_file -i org.%{name}.Shotcut chmod 0755 %{buildroot}/%{_datadir}/%{name}/qml/export-edl/rebuild.sh %fdupes -s %{buildroot}/%{_datadir} %post +%mime_database_post %desktop_database_post %postun +%mime_database_postun %desktop_database_postun %files @@ -152,9 +156,15 @@ %license COPYING %{_bindir}/%{name} %{_datadir}/%{name}/ +%{_datadir}/icons/ +%{_datadir}/metainfo/ %{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/%{name}.desktop +%{_datadir}/mime/ +%{_datadir}/applications/org.%{name}.Shotcut.desktop %exclude %{_datadir}/%{name}/translations + /usr/share/icons/hicolor/64x64/apps/org.shotcut.Shotcut.png + /usr/share/metainfo/org.shotcut.Shotcut.appdata.xml + /usr/share/mime/packages/org.shotcut.Shotcut.xml %files lang -f %{name}.lang %defattr(-,root,root) ++++++ shotcut-18.05.08.tar.gz -> shotcut-18.06.02.tar.gz ++++++ ++++ 181615 lines of diff (skipped) ++++++ shotcut-QAction.patch ++++++ From: Dave Plater <[email protected]> Date: 2018-06-18 16:31:22 +0200 Subject: QAction now needs to be explicitly included References: opensuse packaging list. Upstream: to be submitted Index: src/docks/recentdock.h =================================================================== --- src/docks/recentdock.h.orig 2018-06-02 17:08:34.000000000 +0200 +++ src/docks/recentdock.h 2018-06-18 16:26:50.335290509 +0200 @@ -22,6 +22,7 @@ #include <QDockWidget> #include <QStandardItemModel> #include <QSortFilterProxyModel> +#include <QAction> namespace Ui { class RecentDock; Index: src/docks/timelinedock.h =================================================================== --- src/docks/timelinedock.h.orig 2018-06-02 17:08:34.000000000 +0200 +++ src/docks/timelinedock.h 2018-06-18 16:33:46.066577642 +0200 @@ -22,6 +22,7 @@ #include <QDockWidget> #include <QQuickWidget> #include <QApplication> +#include <QAction> #include "models/multitrackmodel.h" #include "sharedframe.h" ++++++ shotcut-desktopfile.patch ++++++ --- /var/tmp/diff_new_pack.BLSKiD/_old 2018-06-29 22:29:18.370351469 +0200 +++ /var/tmp/diff_new_pack.BLSKiD/_new 2018-06-29 22:29:18.374351467 +0200 @@ -1,13 +1,13 @@ -Index: snap/gui/shotcut.desktop +Index: packaging/linux/org.shotcut.Shotcut.desktop =================================================================== ---- snap/gui/shotcut.desktop.orig 2017-10-02 04:53:27.000000000 +0200 -+++ snap/gui/shotcut.desktop 2017-10-03 12:58:24.860145264 +0200 -@@ -4,7 +4,7 @@ Name=Shotcut - GenericName=Video Editor - Comment=Free, cross-platform, open source video editor +--- packaging/linux/org.shotcut.Shotcut.desktop.orig 2018-06-02 17:08:34.000000000 +0200 ++++ packaging/linux/org.shotcut.Shotcut.desktop 2018-06-11 16:20:19.327072063 +0200 +@@ -8,7 +8,7 @@ Comment=Video Editor + Comment[de]=Programm zum Bearbeiten und Abspielen von Videodateien. + Comment[ru]=Видеоредактор Exec=shotcut %F --Icon=${SNAP}/meta/gui/shotcut-logo-64.png +-Icon=org.shotcut.Shotcut +Icon=shotcut Terminal=false Categories=AudioVideo;Video;AudioVideoEditing; - MimeType=application/ogg;application/x-ogg;audio/ogg;audio/x-vorbis;audio/x-vorbis+ogg;video/ogg;video/x-ogm+ogg;video/x-theora+ogg;video/x-theora;audio/x-speex;audio/opus;application/x-flac;audio/flac;audio/x-flac;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;audio/x-pn-windows-acm;video/divx;video/msvideo;video/vnd.divx;video/x-avi;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/vnd.rn-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;audio/x-realaudio;video/vnd.rn-realvideo;audio/mpeg;audio/mpg;audio/mp1;audio/mp2;audio/mp3;audio/x-mp1;audio/x-mp2;audio/x-mp3;audio/x-mpeg;audio/x-mpg;video/mp2t;video/mpeg;video/mpeg-system;video/x-mpeg;video/x-mpeg2;video/x-mpeg-system;application/mpeg4-iod;application/mpeg4-muxcodetable;application/x-extension-m4a;application/x-extension-mp4;audio/aac;audio/m4a;audio/mp4;audio/x-m4a;audio/x-aac;video/mp4;video/mp4v-es;video/x-m4v;application/x-quicktime-media-link;application/x-quicktimeplayer;video/quicktime;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/3gpp;audio/3gpp2;audio/AMR;audio/AMR-WB;audio/amr;audio/amr-wb;video/3gp;video/3gpp;video/3gpp2;x-scheme-handler/mms;x-scheme-handler/mmsh;x-scheme-handler/rtsp;x-scheme-handler/rtp;x-scheme-handler/rtmp;x-scheme-handler/icy;x-scheme-handler/icyx;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/x-cd-image;application/ram;application/xspf+xml;audio/mpegurl;audio/x-mpegurl;audio/scpls;audio/x-scpls;text/google-video-pointer;text/x-google-video-pointer;video/vnd.mpegurl;application/vnd.apple.mpegurl;application/vnd.ms-asf;application/vnd.ms-wpl;application/sdp;audio/dv;video/dv;audio/x-aiff;audio/x-pn-aiff;video/x-anim;video/x-nsv;video/fli;video/flv;video/x-flc;video/x-fli;video/x-flv;audio/wav;audio/x-pn-au;audio/x-pn-wav;audio/x-wav;audio/ac3;audio/eac3;audio/vnd.dts;audio/vnd.dts.hd;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/vnd.dolby.mlp;audio/basic;audio/midi;audio/x-ape;audio/x-gsm;audio/x-musepack;audio/x-tta;audio/x-wavpack;audio/x-shorten;application/x-shockwave-flash;application/x-flash-video;misc/ultravox;image/vnd.rn-realpix;audio/x-it;audio/x-mod;audio/x-s3m;audio/x-xm;application/mxf;application/xml; + MimeType=application/vnd.mlt+xml ++++++ shotcut-noupdatecheck.patch ++++++ --- /var/tmp/diff_new_pack.BLSKiD/_old 2018-06-29 22:29:18.382351461 +0200 +++ /var/tmp/diff_new_pack.BLSKiD/_new 2018-06-29 22:29:18.382351461 +0200 @@ -1,8 +1,8 @@ Index: src/mainwindow.cpp =================================================================== ---- src/mainwindow.cpp.orig 2018-05-03 20:16:01.000000000 +0200 -+++ src/mainwindow.cpp 2018-05-04 15:28:59.108830949 +0200 -@@ -3059,7 +3059,7 @@ void MainWindow::on_menuExternal_aboutTo +--- src/mainwindow.cpp.orig 2018-06-02 17:08:34.000000000 +0200 ++++ src/mainwindow.cpp 2018-06-11 16:21:07.928586245 +0200 +@@ -3109,7 +3109,7 @@ void MainWindow::on_menuExternal_aboutTo void MainWindow::on_actionUpgrade_triggered() { showStatusMessage("Checking for upgrade..."); @@ -11,7 +11,7 @@ } void MainWindow::on_actionOpenXML_triggered() -@@ -3191,7 +3191,7 @@ void MainWindow::onUpgradeCheckFinished( +@@ -3241,7 +3241,7 @@ void MainWindow::onUpgradeCheckFinished( m_upgradeUrl = json.object().value("url").toString(); showStatusMessage(action, 10 /* seconds */); } else { @@ -22,9 +22,9 @@ return; Index: src/src.pro =================================================================== ---- src/src.pro.orig 2018-05-03 20:16:01.000000000 +0200 -+++ src/src.pro 2018-05-04 15:28:59.144832529 +0200 -@@ -337,7 +337,7 @@ debug_and_release { +--- src/src.pro.orig 2018-06-02 17:08:34.000000000 +0200 ++++ src/src.pro 2018-06-11 16:21:07.936586495 +0200 +@@ -311,7 +311,7 @@ debug_and_release { LIBS += -lCuteLogger -lmvcp -lpthread isEmpty(SHOTCUT_VERSION) {
