Hello community, here is the log from the commit of package minitube for openSUSE:Factory checked in at 2020-06-06 23:39:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minitube (Old) and /work/SRC/openSUSE:Factory/.minitube.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minitube" Sat Jun 6 23:39:06 2020 rev:17 rq:811903 version:3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/minitube/minitube.changes 2020-03-19 19:54:02.496277134 +0100 +++ /work/SRC/openSUSE:Factory/.minitube.new.3606/minitube.changes 2020-06-06 23:39:39.220962790 +0200 @@ -1,0 +2,16 @@ +Sun May 31 14:18:19 UTC 2020 - Carsten Ziepke <[email protected]> + +- Update to version 3.4: + * 0-9 keyboard shortcuts to navigate video + * Left and Right arrow keyboard shortcuts to seek 10 seconds + * New icons + * Fixed layout bug when window is maximized on macOS + * Fixed playback for some videos + * Updated Polish and Japanese translations +- Run spec-cleaner +- Rebase minitube-no-update-check.patch, + minitube-qt5-lessthan-ten.patch and + minitube-fix-for-upstream-missing-qthelper.hpp-in-newer-mpv-version.patch +- Add minitube-fix_audio_playback.patch + +------------------------------------------------------------------- Old: ---- minitube-3.3.tar.xz New: ---- minitube-3.4.tar.xz minitube-fix_audio_playback.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minitube.spec ++++++ --- /var/tmp/diff_new_pack.xMcA9M/_old 2020-06-06 23:39:41.148968841 +0200 +++ /var/tmp/diff_new_pack.xMcA9M/_new 2020-06-06 23:39:41.152968853 +0200 @@ -1,7 +1,7 @@ # # spec file for package minitube # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: minitube -Version: 3.3 +Version: 3.4 Release: 0 Summary: Native YouTube Client License: GPL-3.0-or-later @@ -28,8 +28,10 @@ Source1: minitube.1 # PATCH-FIX-OPENSUSE minitube-no-update-check.patch [email protected] -- Disable update check. Patch0: %{name}-no-update-check.patch -# PATCH-FIX-UPSTREAM minitube-fix-for-upstream-missing-qthelper.hpp-in-newer-mpv-version.patch +# PATCH-FIX-UPSTREAM minitube-fix-for-upstream-missing-qthelper.hpp-in-newer-mpv-version.patch- gh#flaviotordini/minitube/#157 Patch1: %{name}-fix-for-upstream-missing-qthelper.hpp-in-newer-mpv-version.patch +# PATCH-FIX-UPSTREAM minitube-fix_audio_playback.patch - gh#flaviotordini/minitube/#155 +Patch2: %{name}-fix_audio_playback.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist @@ -61,6 +63,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE="$(LC_ALL=C date -u -d "@${SOURCE_DATE_EPOCH}" '+%%b %%e %%Y')" @@ -70,7 +73,7 @@ %qmake5 \ "DEFINES+=APP_GOOGLE_API_KEY=AIzaSyBs1wuIgc-QDnk5u7OavF1loJVO0r89B4Y" \ PREFIX=%{_prefix} -make %{?_smp_mflags} V=1 +%make_build %install %qmake5_install @@ -78,7 +81,7 @@ %suse_update_desktop_file -r %{name} AudioVideo Video Player # symlink for german translation file de_DE -> de pushd %{buildroot}%{_datadir}/%{name}/locale -%{__ln_s} de_DE.qm de.qm +ln -s de_DE.qm de.qm popd %fdupes %{buildroot}%{_datadir}/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xMcA9M/_old 2020-06-06 23:39:41.176968929 +0200 +++ /var/tmp/diff_new_pack.xMcA9M/_new 2020-06-06 23:39:41.176968929 +0200 @@ -4,7 +4,7 @@ <param name="url">https://github.com/flaviotordini/minitube.git</param> <param name="filename">minitube</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">3.3</param> + <param name="revision">3.4</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ minitube-3.3.tar.xz -> minitube-3.4.tar.xz ++++++ ++++ 2925 lines of diff (skipped) ++++++ minitube-fix-for-upstream-missing-qthelper.hpp-in-newer-mpv-version.patch ++++++ --- /var/tmp/diff_new_pack.xMcA9M/_old 2020-06-06 23:39:41.496969933 +0200 +++ /var/tmp/diff_new_pack.xMcA9M/_new 2020-06-06 23:39:41.496969933 +0200 @@ -1,18 +1,6 @@ -diff -Nur minitube-3.3/lib/media/src/mpv/mediampv.cpp new/lib/media/src/mpv/mediampv.cpp ---- minitube-3.3/lib/media/src/mpv/mediampv.cpp 2019-12-21 01:57:27.000000000 +0100 -+++ new/lib/media/src/mpv/mediampv.cpp 2020-03-18 18:02:54.101895593 +0100 -@@ -1,7 +1,7 @@ - #include "mediampv.h" - - #include <clocale> --#include <mpv/qthelper.hpp> -+#include <qthelper.hpp> - - #ifndef MEDIA_AUDIOONLY - #include "mpvwidget.h" -diff -Nur minitube-3.3/lib/media/src/mpv/mpvwidget.h new/lib/media/src/mpv/mpvwidget.h ---- minitube-3.3/lib/media/src/mpv/mpvwidget.h 2019-12-21 01:57:27.000000000 +0100 -+++ new/lib/media/src/mpv/mpvwidget.h 2020-03-18 18:03:18.141699378 +0100 +diff -Nur minitube-3.4/lib/media/src/mpv/mpvwidget.h new/lib/media/src/mpv/mpvwidget.h +--- minitube-3.4/lib/media/src/mpv/mpvwidget.h 2020-05-29 16:37:47.000000000 +0200 ++++ new/lib/media/src/mpv/mpvwidget.h 2020-05-31 16:14:28.458350102 +0200 @@ -3,7 +3,7 @@ #include <QtWidgets> @@ -22,9 +10,9 @@ #include <mpv/render_gl.h> class MpvWidget Q_DECL_FINAL : public QOpenGLWidget { -diff -Nur minitube-3.3/lib/media/src/mpv/qthelper.hpp new/lib/media/src/mpv/qthelper.hpp ---- minitube-3.3/lib/media/src/mpv/qthelper.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ new/lib/media/src/mpv/qthelper.hpp 2020-03-18 17:57:01.084816366 +0100 +diff -Nur minitube-3.4/lib/media/src/mpv/qthelper.hpp new/lib/media/src/mpv/qthelper.hpp +--- minitube-3.4/lib/media/src/mpv/qthelper.hpp 1970-01-01 01:00:00.000000000 +0100 ++++ new/lib/media/src/mpv/qthelper.hpp 2018-07-22 18:46:25.000000000 +0200 @@ -0,0 +1,386 @@ +/* Copyright (C) 2017 the mpv developers + * ++++++ minitube-fix_audio_playback.patch ++++++ diff -ur minitube-3.4.orig/lib/media/src/mpv/mediampv.cpp minitube-3.4/lib/media/src/mpv/mediampv.cpp --- minitube-3.4.orig/lib/media/src/mpv/mediampv.cpp 2020-05-30 17:30:51.000000000 +0200 +++ minitube-3.4/lib/media/src/mpv/mediampv.cpp 2020-06-02 21:40:41.349978099 +0200 @@ -133,6 +133,14 @@ } case MPV_EVENT_FILE_LOADED: + // Add separate audiofile if there is any + if (!audioFileToAdd.isEmpty()) + { + const QByteArray audioUtf8 = audioFileToAdd.toUtf8(); + const char *args2[] = {"audio-add", audioUtf8.constData(), nullptr}; + sendCommand(args2); + audioFileToAdd.clear(); + } setState(Media::PlayingState); break; @@ -257,12 +265,11 @@ const char *args[] = {"loadfile", fileUtf8.constData(), nullptr}; sendCommand(args); - qApp->processEvents(); - - const QByteArray audioUtf8 = audio.toUtf8(); - const char *args2[] = {"audio-add", audioUtf8.constData(), nullptr}; - sendCommand(args2); + // We are playing audio as separate file. The add audio command must executed when the main file is loaded + // Otherwise the audio file doesn't gets played + audioFileToAdd = audio; + qApp->processEvents(); clearTrackState(); } @@ -319,6 +326,8 @@ } void MediaMPV::play(const QString &file) { + audioFileToAdd.clear(); + const QByteArray fileUtf8 = file.toUtf8(); const char *args[] = {"loadfile", fileUtf8.constData(), nullptr}; sendCommand(args); @@ -365,6 +374,7 @@ } void MediaMPV::enqueue(const QString &file) { + audioFileToAdd.clear(); const QByteArray fileUtf8 = file.toUtf8(); const char *args[] = {"loadfile", fileUtf8.constData(), "append", nullptr}; sendCommand(args); diff -ur minitube-3.4.orig/lib/media/src/mpv/mediampv.h minitube-3.4/lib/media/src/mpv/mediampv.h --- minitube-3.4.orig/lib/media/src/mpv/mediampv.h 2020-05-30 17:30:51.000000000 +0200 +++ minitube-3.4/lib/media/src/mpv/mediampv.h 2020-06-02 21:29:32.201010301 +0200 @@ -59,6 +59,8 @@ Media::State currentState = Media::StoppedState; bool aboutToFinishEmitted = false; QString lastErrorString; + + QString audioFileToAdd; }; #endif // MEDIAMPV_H ++++++ minitube-no-update-check.patch ++++++ --- /var/tmp/diff_new_pack.xMcA9M/_old 2020-06-06 23:39:41.512969983 +0200 +++ /var/tmp/diff_new_pack.xMcA9M/_new 2020-06-06 23:39:41.512969983 +0200 @@ -1,7 +1,7 @@ -diff -aur a/src/mainwindow.cpp b/src/mainwindow.cpp ---- a/src/mainwindow.cpp -+++ b/src/mainwindow.cpp -@@ -232,7 +232,7 @@ void MainWindow::lazyInit() { +diff -Nur minitube-3.4/src/mainwindow.cpp new/src/mainwindow.cpp +--- minitube-3.4/src/mainwindow.cpp 2020-05-29 16:37:47.000000000 +0200 ++++ new/src/mainwindow.cpp 2020-05-31 15:56:15.998171572 +0200 +@@ -216,7 +216,7 @@ ChannelAggregator::instance()->start();
