From e8114e141668a4564010ee941f2fca88fc6ac97f Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 31 Oct 2021 18:06:08 +0300
Subject: [PATCH] SMPlayer: bump version

---
 ...6.0.patchset => smplayer-21.10.0.patchset} | 87 ++++++++++---------
 ...-20.6.0.recipe => smplayer-21.10.0.recipe} |  4 +-
 2 files changed, 50 insertions(+), 41 deletions(-)
 rename media-video/smplayer/patches/{smplayer-20.6.0.patchset => smplayer-21.10.0.patchset} (73%)
 rename media-video/smplayer/{smplayer-20.6.0.recipe => smplayer-21.10.0.recipe} (96%)

diff --git a/media-video/smplayer/patches/smplayer-20.6.0.patchset b/media-video/smplayer/patches/smplayer-21.10.0.patchset
similarity index 73%
rename from media-video/smplayer/patches/smplayer-20.6.0.patchset
rename to media-video/smplayer/patches/smplayer-21.10.0.patchset
index 7a4490cf4..be77e9b69 100644
--- a/media-video/smplayer/patches/smplayer-20.6.0.patchset
+++ b/media-video/smplayer/patches/smplayer-21.10.0.patchset
@@ -1,4 +1,4 @@
-From 3fa0c45b2f84301ec6efe43c347789848aae7711 Mon Sep 17 00:00:00 2001
+From 3747ce02ab2135c9952d7bca72049c350b92e46d Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 5 Jun 2015 17:43:34 +0300
 Subject: Disabling QtSingleApplication on Haiku
@@ -34,28 +34,30 @@ index d0fb15d..fe60eb8 100644
  
  
 -- 
-2.19.0
+2.30.2
 
 
-From 1f87d2860cdae862a5bdd4c5b4ff8cf31a6fac97 Mon Sep 17 00:00:00 2001
+From f2514f4e89bc488589cfa2188f13e923cdd17c02 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
-Date: Fri, 5 Jun 2015 17:54:14 +0300
+Date: Sun, 31 Oct 2021 17:21:10 +0300
 Subject: Correctly identify Haiku instead of Other OS
 
 
 diff --git a/src/smplayer.cpp b/src/smplayer.cpp
-index 6369e53..8cb6cb7 100644
+index 9cf774d..02079b1 100644
 --- a/src/smplayer.cpp
 +++ b/src/smplayer.cpp
-@@ -574,10 +574,14 @@ void SMPlayer::showInfo() {
+@@ -618,12 +618,16 @@ void SMPlayer::showInfo() {
  #else
- #ifdef Q_OS_OS2
-            .arg("eCS (OS/2)")
+ #ifdef Q_OS_FREEBSD
+            .arg("FreeBSD")
 +#else
 +#ifdef Q_OS_HAIKU
 +           .arg("Haiku")
  #else
- 		   .arg("Other OS")
+            .arg("Another OS")
+ #endif
+ #endif
  #endif
  #endif
 +#endif
@@ -63,20 +65,20 @@ index 6369e53..8cb6cb7 100644
             ;
  
 -- 
-2.19.0
+2.30.2
 
 
-From 39308adf56bc540cc37e398af3e7fa07a2b62ef4 Mon Sep 17 00:00:00 2001
+From 1d9aa9fb24d1fe96cbf9ae8e4d9a138d2f16e9a7 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Jul 2017 18:58:29 +0300
 Subject: Disable UPDATE_CHECKER and GLOBALSHORTCUTS
 
 
 diff --git a/src/smplayer.pro b/src/smplayer.pro
-index d07ac36..07fe642 100644
+index 273a0ef..23c0c93 100644
 --- a/src/smplayer.pro
 +++ b/src/smplayer.pro
-@@ -24,13 +24,13 @@ DEFINES += MINIGUI
+@@ -25,13 +25,13 @@ DEFINES += MINIGUI
  DEFINES += MPCGUI
  DEFINES += SKINS
  DEFINES += MPRIS2
@@ -93,20 +95,20 @@ index d07ac36..07fe642 100644
  DEFINES += INITIAL_BLACKBORDERS
  DEFINES += CHROMECAST_SUPPORT
 -- 
-2.19.0
+2.30.2
 
 
-From 42f07e21ebd0c45a7c1a4aeb321d069153009925 Mon Sep 17 00:00:00 2001
+From 6ede56a20d29e3f95b31b82b9fed8f92fade915d Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Jul 2017 19:00:30 +0300
 Subject: Disable webserver
 
 
 diff --git a/Makefile b/Makefile
-index c88d046..e137a53 100644
+index 571e611..a9f4f53 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -21,7 +21,7 @@ DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \
+@@ -22,7 +22,7 @@ DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \
       DOC_PATH=\\\"$(DOC_PATH)\\\" THEMES_PATH=\\\"$(THEMES_PATH)\\\" \
       SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\"
  
@@ -116,17 +118,17 @@ index c88d046..e137a53 100644
  src/smplayer:
  	./get_svn_revision.sh
 -- 
-2.19.0
+2.30.2
 
 
-From b857228c6382f36506c6c41df529f4469889cde3 Mon Sep 17 00:00:00 2001
+From 1bfd4e365af4093ead46c933a09b500e5ebdb461 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sun, 9 Jul 2017 16:06:00 +0300
 Subject: Fix PATHS on Haiku
 
 
 diff --git a/Makefile b/Makefile
-index e137a53..f02a1b9 100644
+index a9f4f53..31eca9b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,14 +1,14 @@
@@ -151,20 +153,20 @@ index e137a53..f02a1b9 100644
  ICONS_DIR=$(PREFIX)/share/icons/hicolor/
  APPLNK_DIR=$(PREFIX)/share/applications/
 -- 
-2.19.0
+2.30.2
 
 
-From 1083b40bb8b6b8c0f85117511e71907def029f1d Mon Sep 17 00:00:00 2001
+From 6ff1fa2b6ad55ffb734bb2ab1fc96db0006406ee Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sun, 9 Jul 2017 16:06:44 +0300
 Subject: Use default style on Haiku
 
 
 diff --git a/src/preferences.cpp b/src/preferences.cpp
-index 0ac0fed..7f99f48 100644
+index 1982776..9d9eeac 100644
 --- a/src/preferences.cpp
 +++ b/src/preferences.cpp
-@@ -409,12 +409,14 @@ void Preferences::reset() {
+@@ -407,12 +407,14 @@ void Preferences::reset() {
  
  	resize_method = Never;
  
@@ -180,43 +182,50 @@ index 0ac0fed..7f99f48 100644
  
  	center_window = false;
 -- 
-2.19.0
+2.30.2
 
 
-From 1519cd87f34252a047db5ab4127f8fb8c25c05ff Mon Sep 17 00:00:00 2001
+From a31715d36af696d345befda9004197d5533ae251 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Thu, 14 Jun 2018 05:45:06 +0000
-Subject: Fix winId for haiku
+Date: Sun, 31 Oct 2021 17:28:21 +0300
+Subject: Fix winId on Haiku
 
 
 diff --git a/src/core.cpp b/src/core.cpp
-index 323acb7..6da2e22 100644
+index 71bb60c..5457f5e 100644
 --- a/src/core.cpp
 +++ b/src/core.cpp
-@@ -1831,6 +1831,8 @@ void Core::startMplayer( QString file, double seek ) {
- #if defined(Q_OS_OS2)
+@@ -1842,6 +1842,8 @@ void Core::startMplayer( QString file, double seek ) {
+ 		#ifdef Q_OS_OS2
  		#define WINIDFROMHWND(hwnd) ( ( hwnd ) - 0x80000000UL )
  		proc->setOption("wid", QString::number( WINIDFROMHWND( (int) mplayerwindow->videoLayer()->winId() ) ));
-+#elif defined(Q_OS_HAIKU)
++		+#elif defined(Q_OS_HAIKU)
 +		proc->setOption("wid", QString::number(0));
- #else
+ 		#else
+ 		#ifndef Q_OS_MACX
  		proc->setOption("wid", QString::number( (qint64) mplayerwindow->videoLayer()->winId() ) );
- #endif
+diff --git a/src/svn_revision.h b/src/svn_revision.h
+index c8da1c5..3ffec4b 100644
+--- a/src/svn_revision.h
++++ b/src/svn_revision.h
+@@ -1 +1 @@
+-#define SVN_REVISION "10001"
++#define SVN_REVISION "0UNKNOWN"
 -- 
-2.19.0
+2.30.2
 
 
-From 319d3043ea31ca40f3750ffe0e99882fb63ab82d Mon Sep 17 00:00:00 2001
+From ea1b6d1c1dede5e7d74c49664e5e8a3b2ecf124a Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 19 Sep 2018 15:36:35 +0300
 Subject: Use default iconset on Haiku
 
 
 diff --git a/src/preferences.cpp b/src/preferences.cpp
-index 7f99f48..77b5556 100644
+index 9d9eeac..3c13972 100644
 --- a/src/preferences.cpp
 +++ b/src/preferences.cpp
-@@ -491,6 +491,9 @@ void Preferences::reset() {
+@@ -489,6 +489,9 @@ void Preferences::reset() {
  	gui = "DefaultGUI";
  	iconset = "H2O";
  
@@ -227,5 +236,5 @@ index 7f99f48..77b5556 100644
  #if USE_MINIMUMSIZE
  	gui_minimum_width = 0; // 0 == disabled
 -- 
-2.19.0
+2.30.2
 
diff --git a/media-video/smplayer/smplayer-20.6.0.recipe b/media-video/smplayer/smplayer-21.10.0.recipe
similarity index 96%
rename from media-video/smplayer/smplayer-20.6.0.recipe
rename to media-video/smplayer/smplayer-21.10.0.recipe
index e9e7ccd23..8f7a1dfdb 100644
--- a/media-video/smplayer/smplayer-20.6.0.recipe
+++ b/media-video/smplayer/smplayer-21.10.0.recipe
@@ -5,11 +5,11 @@ audio formats. But apart from providing access for the most common and useful \
 options of MPlayer, SMPlayer adds other interesting features like the \
 possibility to play Youtube videos or download subtitles."
 HOMEPAGE="https://www.smplayer.info/"
-COPYRIGHT="2006-2020 Ricardo Villalba"
+COPYRIGHT="2006-2021 Ricardo Villalba"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://downloads.sf.net/smplayer/smplayer-$portVersion.tar.bz2"
-CHECKSUM_SHA256="be76596b9a0b7079bc41be8f200c1024670bd80ffe9d6ec5f24879519f7ba930"
+CHECKSUM_SHA256="2c0bf10add4bea2582104281553cda9792b74d41273a98bceaa147c70065db8a"
 PATCHES="smplayer-$portVersion.patchset"
 ADDITIONAL_FILES="smplayer.rdef"