SMPlayer: disable window embeding

media-video/smplayer/patches/smplayer-18.5.0.patchset

@@ -1,4 +1,4 @@
-From 8850cf98af94bd1e725aea1a98dccf65250d9f7b Mon Sep 17 00:00:00 2001
+From 9af9a5c9b25f633886da934ee36cd50c682cc17a 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,46 +34,46 @@ index d0fb15d..fe60eb8 100644
  
  
 -- 
-2.12.2
+2.16.4
 
 
-From bb800d81042c314b92e3e5196911a09927f25e0f Mon Sep 17 00:00:00 2001
+From 5e8055b699e933f3f75ac821ae8425f04b3080fa Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 5 Jun 2015 17:54:14 +0300
 Subject: Correctly identify Haiku instead of Other OS
 
 
 diff --git a/src/smplayer.cpp b/src/smplayer.cpp
-index 4f3bd88..4804b4d 100644
+index 6369e53..8cb6cb7 100644
 --- a/src/smplayer.cpp
 +++ b/src/smplayer.cpp
-@@ -575,10 +575,14 @@ void SMPlayer::showInfo() {
+@@ -574,10 +574,14 @@ void SMPlayer::showInfo() {
+ #else
  #ifdef Q_OS_OS2
             .arg("eCS (OS/2)")
- #else
++#else
 +#ifdef Q_OS_HAIKU
 +           .arg("Haiku")
-+#else
+ #else
  		   .arg("Other OS")
  #endif
  #endif
- #endif
 +#endif
+ #endif
             ;
  
- 	printf("%s\n", s.toLocal8Bit().data() );
 -- 
-2.12.2
+2.16.4
 
 
-From 5433cf00b5d6a0e1eb35e5b7cfa6cc3c771cd660 Mon Sep 17 00:00:00 2001
+From 9e5c85a39e87bbaf4bdbabcc17d605700261f536 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 cde8dcc..216d445 100644
+index d7873b4..02ead37 100644
 --- a/src/smplayer.pro
 +++ b/src/smplayer.pro
 @@ -24,13 +24,13 @@ DEFINES += MINIGUI
@@ -93,10 +93,10 @@ index cde8dcc..216d445 100644
  DEFINES += INITIAL_BLACKBORDERS
  DEFINES += CHROMECAST_SUPPORT
 -- 
-2.12.2
+2.16.4
 
 
-From e23c0061a78cd61b23dd1afbc615f00533fae266 Mon Sep 17 00:00:00 2001
+From 7f1adb4a079067c680a8d36b5446fdda19d1a7b2 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
@@ -116,10 +116,10 @@ index c88d046..e137a53 100644
  src/smplayer:
  	./get_svn_revision.sh
 -- 
-2.12.2
+2.16.4
 
 
-From 24a11af6f7fa2fbce3a6d644e41f76895eaaa990 Mon Sep 17 00:00:00 2001
+From 58c090b97364ca6f3a22b92265a2e9f2a06200d9 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
@@ -151,20 +151,20 @@ index e137a53..f02a1b9 100644
  ICONS_DIR=$(PREFIX)/share/icons/hicolor/
  APPLNK_DIR=$(PREFIX)/share/applications/
 -- 
-2.12.2
+2.16.4
 
 
-From 71e72819e3bcc2b3c99a38154130d938261d3e60 Mon Sep 17 00:00:00 2001
+From dd000676579371d10f23c20b968b196e85f6b1b9 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 bd72016..83e10cc 100644
+index 673d32c..b8c42ac 100644
 --- a/src/preferences.cpp
 +++ b/src/preferences.cpp
-@@ -389,6 +389,7 @@ void Preferences::reset() {
+@@ -409,12 +409,14 @@ void Preferences::reset() {
  
  	resize_method = Never;
  
@@ -172,14 +172,36 @@ index bd72016..83e10cc 100644
  #if STYLE_SWITCHING
  	#if QT_VERSION >= 0x050000
  	style = "Fusion";
-@@ -396,6 +397,7 @@ void Preferences::reset() {
+ 	#else
  	style="";
  	#endif
- #endif
 +#endif
+ #endif
  
  	center_window = false;
- 	center_window_if_outside = false;
 -- 
-2.12.2
+2.16.4
+
+
+From 49e5d10435ec8953a95b4ceba9eef261ccdcaf1b 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
+
+
+diff --git a/src/core.cpp b/src/core.cpp
+index 1faa0ed..accb96e 100644
+--- a/src/core.cpp
++++ b/src/core.cpp
+@@ -1828,6 +1828,8 @@ void Core::startMplayer( QString file, double seek ) {
+ #if defined(Q_OS_OS2)
+ 		#define WINIDFROMHWND(hwnd) ( ( hwnd ) - 0x80000000UL )
+ 		proc->setOption("wid", QString::number( WINIDFROMHWND( (int) mplayerwindow->videoLayer()->winId() ) ));
++#elif defined(Q_OS_HAIKU)
++		proc->setOption("wid", QString::number(0));
+ #else
+ 		proc->setOption("wid", QString::number( (qint64) mplayerwindow->videoLayer()->winId() ) );
+ #endif
+-- 
+2.16.4
 

media-video/smplayer/smplayer-18.5.0.recipe

@@ -7,7 +7,7 @@ possibility to play Youtube videos or download subtitles."
 HOMEPAGE="http://www.smplayer.info/"
 COPYRIGHT="2006-2018 Ricardo Villalba"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://downloads.sf.net/smplayer/smplayer-$portVersion.tar.bz2"
 CHECKSUM_SHA256="36a3aeda0f1fcbffdf05039185dd76160551a2905056ef933fd3b772eb47ad3b"
 PATCHES="smplayer-$portVersion.patchset"