Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package smplayer for openSUSE:Factory
checked in at 2024-08-16 12:24:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smplayer (Old)
and /work/SRC/openSUSE:Factory/.smplayer.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smplayer"
Fri Aug 16 12:24:12 2024 rev:51 rq:1194245 version:24.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/smplayer/smplayer.changes 2024-07-01
11:22:57.980724076 +0200
+++ /work/SRC/openSUSE:Factory/.smplayer.new.2698/smplayer.changes
2024-08-16 12:24:49.297953681 +0200
@@ -1,0 +2,7 @@
+Fri Aug 16 06:05:23 UTC 2024 - Alynx Zhou <alynx.z...@suse.com>
+
+- Add 0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch:
+ Adapt MPV's option change to fix error (bsc#1227841,
+ gh#smplayer-dev/smplayer!1029).
+
+-------------------------------------------------------------------
New:
----
0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch
BETA DEBUG BEGIN:
New:
- Add 0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch:
Adapt MPV's option change to fix error (bsc#1227841,
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smplayer.spec ++++++
--- /var/tmp/diff_new_pack.I3VpP6/_old 2024-08-16 12:24:49.805974794 +0200
+++ /var/tmp/diff_new_pack.I3VpP6/_new 2024-08-16 12:24:49.809974960 +0200
@@ -1,7 +1,7 @@
#
# spec file for package smplayer
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,8 @@
Patch1: %{name}-defaults.patch
# PATCH-FIX-UPSTREAM smplayer-add_kde_protocols_to_desktop_file.patch -- To
play network shared video correctly: #PM-48.
Patch2: %{name}-add_kde_protocols_to_desktop_file.patch
+# PATCH-FIX-UPSTREAM
0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch bsc#1227841,
gh#smplayer-dev/smplayer!1029 alynx.z...@suse.com -- Adapt MPV's option
renaming.
+Patch3: 0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
++++++ 0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch ++++++
>From a35524d8f58e5efec42a3f00e4d5de5446f7abb4 Mon Sep 17 00:00:00 2001
From: Alynx Zhou <alynx.z...@gmail.com>
Date: Fri, 16 Aug 2024 13:49:44 +0800
Subject: [PATCH] Adapt MPV's renaming --sub-forced-only to
--sub-forced-events-only
See
<https://github.com/mpv-player/mpv/commit/9b9475e21809fbb4736b4290c2648900d9c49e2e>.
---
src/mpvoptions.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/mpvoptions.cpp b/src/mpvoptions.cpp
index 4cbdfd564..7a1265cca 100644
--- a/src/mpvoptions.cpp
+++ b/src/mpvoptions.cpp
@@ -398,7 +398,12 @@ void MPVProcess::setOption(const QString & option_name,
const QVariant & value)
}
else
if (option_name == "forcedsubsonly") {
- arg << "--sub-forced-only";
+ // See
<https://github.com/mpv-player/mpv/commit/9b9475e21809fbb4736b4290c2648900d9c49e2e>.
+ if (isOptionAvailable("--sub-forced-events-only")) {
+ arg << "--sub-forced-events-only";
+ } else {
+ arg << "--sub-forced-only";
+ }
}
else
if (option_name == "prefer-ipv4" || option_name == "prefer-ipv6" ||
@@ -1065,7 +1070,12 @@ void MPVProcess::seekSub(int value) {
}
void MPVProcess::setSubForcedOnly(bool b) {
- sendCommand(QString("set sub-forced-only %1").arg(b ? "yes" : "no"));
+ // See
<https://github.com/mpv-player/mpv/commit/9b9475e21809fbb4736b4290c2648900d9c49e2e>.
+ if (isOptionAvailable("--sub-forced-events-only")) {
+ sendCommand(QString("set sub-forced-events-only %1").arg(b ?
"yes" : "no"));
+ } else {
+ sendCommand(QString("set sub-forced-only %1").arg(b ? "yes" :
"no"));
+ }
}
void MPVProcess::setSpeed(double value) {
--
2.45.2
