Hello community, here is the log from the commit of package shotcut for openSUSE:Factory checked in at 2017-05-06 18:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shotcut (Old) and /work/SRC/openSUSE:Factory/.shotcut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shotcut" Sat May 6 18:30:56 2017 rev:3 rq:493011 version:17.05 Changes: -------- --- /work/SRC/openSUSE:Factory/shotcut/shotcut.changes 2017-03-12 20:00:55.335886995 +0100 +++ /work/SRC/openSUSE:Factory/.shotcut.new/shotcut.changes 2017-05-06 18:30:57.600148760 +0200 @@ -1,0 +2,26 @@ +Thu May 4 09:59:21 UTC 2017 - [email protected] + +- Update to 17.05 +- Remove auto update with shotcut-noupdatecheck.patch. This also + enables reproducible builds. +- Rebase shotcut-desktopfile.patch +- Enable libvpx build. +- Upstream changes: + Fix #412 disable waveform generation when hidden. + Fix #406 extension included in EDL reel name. + Fix #405 JavaScript error in Export EDL. + Use MLT to determine decimal point. (#416) + +------------------------------------------------------------------- +Wed May 3 11:11:42 UTC 2017 - [email protected] + +- Update to 17.04 +- Fix desktop file with shotcut-desktopfile.patch +- Upstream changes: + Added Japanese translation. + Added Turkish translation. + Fix #399 crash after trying to save empty file. + Do not include <profile> with internal MLT XML. + Fix missing period before suggested extension. + +------------------------------------------------------------------- Old: ---- shotcut-17.03.tar.gz New: ---- shotcut-17.05.tar.gz shotcut-desktopfile.patch shotcut-noupdatecheck.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotcut.spec ++++++ --- /var/tmp/diff_new_pack.j32jSa/_old 2017-05-06 18:30:58.891966477 +0200 +++ /var/tmp/diff_new_pack.j32jSa/_new 2017-05-06 18:30:58.895965914 +0200 @@ -16,6 +16,9 @@ # +# Find qt version used to build +%define qt5version %(pkg-config --modversion Qt5Core) + %if 0%{?BUILD_ORIG} %bcond_without lame %bcond_without libvpx @@ -25,16 +28,24 @@ %if !%{with ffmpeg} %if 0%{?suse_version} > 1320 || (0%{?suse_version} >= 1315 && 0%{?is_opensuse}) %bcond_without ffmpeg +%bcond_without libvpx %endif %endif Name: shotcut -Version: 17.03 +Version: 17.05 Release: 0 -Summary: A video editor +# This package creates a build time version from the current date and uses it to check +# for updates. See patch1 and prep/build section. +%define _vstring %(echo %{version} |tr -d ".") +Summary: Opensource Video Editor License: GPL-3.0+ 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 +# PATCH-FIX-OPENSUSE shotcut-desktopfile.patch [email protected] -- Fix icon path +Patch0: shotcut-desktopfile.patch +# PATCH-FIX-OPENSUSE shotcut-noupdatecheck.patch [email protected] -- Disable automatic update check +Patch1: shotcut-noupdatecheck.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libqt5-qtdeclarative-private-headers-devel @@ -74,75 +85,50 @@ Requires: %(rpm -qf $(readlink -qne %{_libdir}/libx264.so) --qf '%{NAME} >= %{VERSION}') %endif # needed on runtime for the timeline to work see https://forums.opensuse.org/showthread.php/520592-shotcut-video-editor-timeline-blank/page3 -Requires: libqt5-qtgraphicaleffects +Requires: libqt5-qtgraphicaleffects >= %{qt5version} +Requires: libqt5-qtquickcontrols >= %{qt5version} %description -These are all currently implemented features: - * supports oodles of audio and video formats and codecs; - * supports many image formats as image sequences; - * no import required - native editing; - * frame-accurate seeking for many formats; - * multi-format timeline; - * screen capture including background capture; - * webcam capture; - * audio capture (PulseAudio, JACK, or ALSA); - * network stream playback (HTTP, HLS, RTMP, RTSP, MMS, UDP); - * frei0r video generator plugins (e.g. color bars and plasma); - * Blackmagic Design SDI and HDMI for input and preview monitoring; - * JACK transport sync; - * deinterlacing; - * detailed media properties panel; - * recent files panel with search; - * drag-n-drop files from file manager; - * save and load trimmed clip as MLT XML file; - * load and play complex MLT XML file as a clip; - * audio signal level meter; - * volume control; - * scrubbing and transport control; - * flexible UI through dock-able panels; - * encode/transcode to a variety of formats and codecs; - * capture (record); - * stream (encode to IP) files and any capture source; - * batch encoding with job control; - * MLT XML playlists; - * unlimited undo and redo for playlist edits; - * connect to Melted servers over MVCP TCP protocol; - * control the transport playback of Melted units; - * edit Melted playlists including support for undo/redo; - * OpenGL GPU-based image processing; - * multi-core parallel image processing when not using GPU; - * audio and video filters; - * 3-way color wheels for color correction and grading; - * eye dropper tool to pick neutral color for white balancing; - * HTML5 (sans audio and video) as video source and filters; - * Leap Motion for jog/shuttle control; - * DeckLink SDI keyer output - internal or external; - * UI themes/skins: native-OS look and custom dark and light; - * control video zoom in the player. - * more info: http://www.shotcut.org/bin/view/Shotcut/Features +Shotcut is a free, open source, cross-platform video editor. +It supports many audio and video formats, image formats +such as BMP, GIF, JPEG, PNG, SVG, TGA, TIFF as well as image +sequences. It's compatible with JACK Audio and Melted Server +technology, and it even offers an experimental +GPU Processing feature. Shotcut can test MLT XML files, too. %lang_package %prep %setup -q +echo "Qt5Core = %{qt5version}" +%patch0 +%patch1 # Search for executable files find . \ \( -name \*.html -o -name \*.js \) -type f -executable -exec chmod a-x {} \; || : +# Create version.json from current version +echo "{" > version.json +echo " \"version_number\": %{_vstring}02," >> version.json +echo " \"version_string\": \"%{version}.02\"," >> version.json +echo " \"url\": \"https://shotcut.org/blog/new-release-%{_vstring}/\""; >> version.json +echo "}" >> version.json +echo "" >> version.json + %build +export _VSTRING="%{version}.02" %qmake5 \ QMAKE_STRIP="" \ - PREFIX="%{_prefix}" + _VSTRING="%{version}.02" \ + PREFIX="%{_prefix}" -Wall -recursive -%make_jobs +make %{_smp_mflags} VERBOSE=1 %install %qmake5_install install -D icons/%{name}-logo-64.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png -%{suse_update_desktop_file -c \ -%{name} Shotcut "Video editor" %{name} %{name} AudioVideo AudioVideoEditing} # Install language files langlist="$PWD/%{name}.lang" @@ -163,9 +149,16 @@ echo "%lang($lang) $langdir/$qm" >>"$langlist" done popd - +cp -v version.json %{buildroot}%{_datadir}/%{name} +%suse_update_desktop_file -i %{name} %fdupes -s %{buildroot}/%{_datadir} +%post +%desktop_database_post + +%postun +%desktop_database_postun + %files %defattr(-,root,root) %doc COPYING README.md ++++++ shotcut-17.03.tar.gz -> shotcut-17.05.tar.gz ++++++ ++++ 22411 lines of diff (skipped) ++++++ shotcut-desktopfile.patch ++++++ Index: snap/setup/gui/shotcut.desktop =================================================================== --- snap/gui/shotcut.desktop.orig 2017-04-02 06:05:12.000000000 +0200 +++ snap/gui/shotcut.desktop 2017-05-03 12:54:12.255456495 +0200 @@ -4,7 +4,7 @@ Name=Shotcut GenericName=Video Editor Comment=Free, cross-platform, open source video editor Exec=shotcut %F -Icon=${SNAP}/meta/gui/shotcut-logo-64.png +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; ++++++ shotcut-noupdatecheck.patch ++++++ Index: src/mainwindow.cpp =================================================================== --- src/mainwindow.cpp.orig 2017-05-02 21:22:35.000000000 +0200 +++ src/mainwindow.cpp 2017-05-04 11:36:05.920623513 +0200 @@ -1872,9 +1872,9 @@ void MainWindow::showEvent(QShowEvent* e windowHandle()->installEventFilter(this); - QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0); - connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered())); - showStatusMessage(action, 10 /* seconds */); + //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0); + //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered())); + //showStatusMessage(action, 10 /* seconds */); } void MainWindow::on_actionOpenOther_triggered() @@ -2879,7 +2879,7 @@ void MainWindow::on_menuExternal_aboutTo void MainWindow::on_actionUpgrade_triggered() { showStatusMessage("Checking for upgrade..."); - m_network.get(QNetworkRequest(QUrl("http://check.shotcut.org/version.json";))); + m_network.get(QNetworkRequest(QUrl("file:///usr/share/shotcut/version.json"))); } void MainWindow::on_actionOpenXML_triggered() @@ -3011,7 +3011,7 @@ void MainWindow::onUpgradeCheckFinished( m_upgradeUrl = json.object().value("url").toString(); showStatusMessage(action, 10 /* seconds */); } else { - showStatusMessage(tr("You are running the latest version of Shotcut.")); + showStatusMessage(tr("Use Yast or zypper for updates.")); } reply->deleteLater(); return; Index: src/src.pro =================================================================== --- src/src.pro.orig 2017-05-02 21:22:35.000000000 +0200 +++ src/src.pro 2017-05-04 11:32:03.828104313 +0200 @@ -322,7 +322,7 @@ debug_and_release { LIBS += -lLogger -lmvcp -lpthread isEmpty(SHOTCUT_VERSION) { - !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d") + !win32:SHOTCUT_VERSION = $$_VSTRING win32:SHOTCUT_VERSION = adhoc } DEFINES += SHOTCUT_VERSION=\\\"$$SHOTCUT_VERSION\\\"
