Accepting request 1295930 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1295930
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/smplayer?expand=0&rev=52

0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch

@@ -1,46 +0,0 @@
-From a35524d8f58e5efec42a3f00e4d5de5446f7abb4 Mon Sep 17 00:00:00 2001
-From: Alynx Zhou <alynx.zhou@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
-

smplayer-24.5.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9550f17c0bf09141ca6ce2770fccde80e17a50f21bb74e69bb4a7f37db1fd72
-size 5221961

smplayer-25.6.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4a01e61d469edebaab617fa39b9014f7adeab05f95910b9400aafb2fc7e2ee5
+size 5264430

smplayer.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Jul 26 04:24:23 UTC 2025 - munix9@googlemail.com
+
+- Update to 25.6.0:
+  * Fix play/pause button.
+  * Some fixes to stop the screensaver on Linux.
+  * Fixed some issues related to disc playback.
+  * Various bug fixes and stability improvements.
+
+- Remove 0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch
+  (merged upstream)
+- Clean up spec file
+
 -------------------------------------------------------------------
 Fri Aug 16 06:05:23 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
 

smplayer.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package smplayer
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,19 @@
 
 
 Name:           smplayer
-Version:        24.5.0
+Version:        25.6.0
 Release:        0
 Summary:        Complete frontend for MPV
 License:        GPL-2.0-or-later
 URL:            https://smplayer.info/
 Source:         https://github.com/smplayer-dev/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE smplayer-makeflags.patch
-Patch0:         %{name}-makeflags.patch
+Patch0:         smplayer-makeflags.patch
 # PATCH-FEATURE-OPENSUSE smplayer-defaults.patch sor.alexei@meowr.ru -- Use PulseAudio, system Qt5 theme, and "Papirus" icon theme by default.
-Patch1:         %{name}-defaults.patch
+Patch1:         smplayer-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.zhou@suse.com -- Adapt MPV's option renaming.
-Patch3:         0001-Adapt-MPV-s-renaming-sub-forced-only-to-sub-forced-e.patch
+Patch2:         smplayer-add_kde_protocols_to_desktop_file.patch
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
@@ -38,8 +37,6 @@ BuildRequires:  libQt5Gui-private-headers-devel
 BuildRequires:  libqt5-qttools-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
-BuildRequires:  zlib-devel
 BuildRequires:  cmake(Qt5Concurrent)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5DBus)
@@ -52,6 +49,7 @@ BuildRequires:  cmake(Qt5Sql)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(zlib)
 # Either mpv >= 0.6.2 or MPlayer >= 1.0rc4_r32607.
 Requires:       mpv >= 0.6.2
 Recommends:     smplayer-lang
@@ -74,7 +72,7 @@ same chosen audio track, subtitles and volume level.
 %autosetup -p1
 
 # Fix CRLF in .txt files.
-sed -i 's/\r$//' *.txt
+sed -i 's/\r$//' *.txt *.md
 
 find . -type f -name '*.pro' | while read f; do
 cat << EOF >> "$f"
@@ -103,21 +101,20 @@ rm -r %{buildroot}%{_docdir}/%{name}/*
 
 mv %{buildroot}%{_bindir}/{,%{name}-}simple_web_server
 
-%suse_update_desktop_file %{name}
-%suse_update_desktop_file %{name}_enqueue
-
 %find_lang %{name} --with-qt
 %fdupes %{buildroot}%{_datadir}/
 
+%check
+desktop-file-validate \
+	%{buildroot}%{_datadir}/applications/%{name}{,_enqueue}.desktop
+
 %files
 %license Copying*.txt
 %doc Readme.txt Release_notes.md
 %{_bindir}/%{name}
 %{_bindir}/%{name}-simple_web_server
-%{_datadir}/applications/%{name}*.desktop
-%dir %{_datadir}/icons/hicolor/*/
-%dir %{_datadir}/icons/hicolor/*/apps/
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/applications/%{name}{,_enqueue}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.{png,svg}
 %{_datadir}/metainfo/%{name}.appdata.xml
 %{_datadir}/%{name}/
 %exclude %{_datadir}/%{name}/translations/