[smplayer] Fix controls with mpv-0.30.0

commit 19bd521f9221380d01e0c39730ec3831080ad5aa Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sat Oct 26 22:12:41 2019 +0100 Fix controls with mpv-0.30.0 Fix_control_problem_with_mpv-0.30.patch | 36 +++++++++++++++++++++++++++++++++ smplayer.spec | 7 ++++++- 2 files changed, 42 insertions(+), 1 deletion(-) --- diff --git a/Fix_control_problem_with_mpv-0.30.patch b/Fix_control_problem_with_mpv-0.30.patch new file mode 100644 index 0000000..e67d9cc --- /dev/null +++ b/Fix_control_problem_with_mpv-0.30.patch @@ -0,0 +1,36 @@ +Index: src/mpvprocess.cpp +=================================================================== +--- src/mpvprocess.cpp (revision 9231) ++++ src/mpvprocess.cpp (revision 9232) +@@ -122,7 +122,7 @@ + + void MPVProcess::initializeRX() { + #ifdef CUSTOM_STATUS +- rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)"); ++ rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)"); + #else + rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56 + #endif +@@ -197,7 +197,7 @@ + static double last_sec = -1; + + // Parse A: V: line +- //qDebug("MPVProcess::parseLine: %s", line.toUtf8().data()); ++ //qDebug() << "MPVProcess::parseLine:" << line; + if (rx_av.indexIn(line) > -1) { + #ifdef CUSTOM_STATUS + double sec = rx_av.cap(1).toDouble(); +Index: src/mpvoptions.cpp +=================================================================== +--- src/mpvoptions.cpp (revision 9233) ++++ src/mpvoptions.cpp (revision 9234) +@@ -63,7 +63,8 @@ + arg << "--term-playing-msg=" + "MPV_VERSION=${=mpv-version:}\n" + "INFO_VIDEO_WIDTH=${=width}\nINFO_VIDEO_HEIGHT=${=height}\n" +- "INFO_VIDEO_ASPECT=${=video-aspect}\n" ++// "INFO_VIDEO_ASPECT=${=video-aspect}\n" // old ++ "INFO_VIDEO_ASPECT=${=video-params/aspect}\n" + // "INFO_VIDEO_DSIZE=${=dwidth}x${=dheight}\n" + "INFO_VIDEO_FPS=${=container-fps:${=fps}}\n" + // "INFO_VIDEO_BITRATE=${=video-bitrate}\n" diff --git a/smplayer.spec b/smplayer.spec index d691e32..114154a 100644 --- a/smplayer.spec +++ b/smplayer.spec @@ -3,7 +3,7 @@ Version: 19.5.0 %global smtube_ver 19.6.0 %global smplayer_themes_ver 18.6.0 %global smplayer_skins_ver 15.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A graphical frontend for mplayer and mpv License: GPLv2+ @@ -15,6 +15,7 @@ Source4: http://downloads.sourceforge.net/smplayer/smplayer-skins-%{smpla # Fix regression in Thunar (TODO: re-check in upcoming versions!) # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217 Patch0: smplayer-0.8.3-desktop-files.patch +Patch1: Fix_control_problem_with_mpv-0.30.patch Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch Patch3: smtube-18.11.0-system-qtsingleapplication.patch Patch4: smplayer-19.5.0-webserver.patch @@ -96,6 +97,7 @@ rm -rf smtube-%{smtube_ver}/src/qtsingleapplication/ #rm -rf src/findsubtitles/libmaia %patch0 -p1 -b .desktop-files +%patch1 -p0 -b .new-mpv %patch2 -p1 -b .qtsingleapplication pushd smtube-%{smtube_ver} %patch3 -p1 -b .qtsingleapplication @@ -212,6 +214,9 @@ fi %{_datadir}/smplayer/themes/ %changelog +* Sat Oct 26 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 19.5.0-4 +- Fix controls with mpv-0.30.0 + * Fri Sep 13 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 19.5.0-3 - Update smtube to 19.6.0