diff --git a/media-video/smplayer/patches/smplayer-18.5.0.patchset b/media-video/smplayer/patches/smplayer-18.9.0.patchset similarity index 79% rename from media-video/smplayer/patches/smplayer-18.5.0.patchset rename to media-video/smplayer/patches/smplayer-18.9.0.patchset index 808f1e9b9..7a4490cf4 100644 --- a/media-video/smplayer/patches/smplayer-18.5.0.patchset +++ b/media-video/smplayer/patches/smplayer-18.9.0.patchset @@ -1,4 +1,4 @@ -From 9af9a5c9b25f633886da934ee36cd50c682cc17a Mon Sep 17 00:00:00 2001 +From 3fa0c45b2f84301ec6efe43c347789848aae7711 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 5 Jun 2015 17:43:34 +0300 Subject: Disabling QtSingleApplication on Haiku @@ -34,10 +34,10 @@ index d0fb15d..fe60eb8 100644 -- -2.16.4 +2.19.0 -From 5e8055b699e933f3f75ac821ae8425f04b3080fa Mon Sep 17 00:00:00 2001 +From 1f87d2860cdae862a5bdd4c5b4ff8cf31a6fac97 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 5 Jun 2015 17:54:14 +0300 Subject: Correctly identify Haiku instead of Other OS @@ -63,17 +63,17 @@ index 6369e53..8cb6cb7 100644 ; -- -2.16.4 +2.19.0 -From 9e5c85a39e87bbaf4bdbabcc17d605700261f536 Mon Sep 17 00:00:00 2001 +From 39308adf56bc540cc37e398af3e7fa07a2b62ef4 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov 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 d7873b4..02ead37 100644 +index d07ac36..07fe642 100644 --- a/src/smplayer.pro +++ b/src/smplayer.pro @@ -24,13 +24,13 @@ DEFINES += MINIGUI @@ -93,10 +93,10 @@ index d7873b4..02ead37 100644 DEFINES += INITIAL_BLACKBORDERS DEFINES += CHROMECAST_SUPPORT -- -2.16.4 +2.19.0 -From 7f1adb4a079067c680a8d36b5446fdda19d1a7b2 Mon Sep 17 00:00:00 2001 +From 42f07e21ebd0c45a7c1a4aeb321d069153009925 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov 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.16.4 +2.19.0 -From 58c090b97364ca6f3a22b92265a2e9f2a06200d9 Mon Sep 17 00:00:00 2001 +From b857228c6382f36506c6c41df529f4469889cde3 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sun, 9 Jul 2017 16:06:00 +0300 Subject: Fix PATHS on Haiku @@ -151,17 +151,17 @@ index e137a53..f02a1b9 100644 ICONS_DIR=$(PREFIX)/share/icons/hicolor/ APPLNK_DIR=$(PREFIX)/share/applications/ -- -2.16.4 +2.19.0 -From dd000676579371d10f23c20b968b196e85f6b1b9 Mon Sep 17 00:00:00 2001 +From 1083b40bb8b6b8c0f85117511e71907def029f1d Mon Sep 17 00:00:00 2001 From: Sergei Reznikov 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 673d32c..b8c42ac 100644 +index 0ac0fed..7f99f48 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -409,12 +409,14 @@ void Preferences::reset() { @@ -180,20 +180,20 @@ index 673d32c..b8c42ac 100644 center_window = false; -- -2.16.4 +2.19.0 -From 49e5d10435ec8953a95b4ceba9eef261ccdcaf1b Mon Sep 17 00:00:00 2001 +From 1519cd87f34252a047db5ab4127f8fb8c25c05ff 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 +index 323acb7..6da2e22 100644 --- a/src/core.cpp +++ b/src/core.cpp -@@ -1828,6 +1828,8 @@ void Core::startMplayer( QString file, double seek ) { +@@ -1831,6 +1831,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() ) )); @@ -203,5 +203,29 @@ index 1faa0ed..accb96e 100644 proc->setOption("wid", QString::number( (qint64) mplayerwindow->videoLayer()->winId() ) ); #endif -- -2.16.4 +2.19.0 + + +From 319d3043ea31ca40f3750ffe0e99882fb63ab82d Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +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 +--- a/src/preferences.cpp ++++ b/src/preferences.cpp +@@ -491,6 +491,9 @@ void Preferences::reset() { + gui = "DefaultGUI"; + iconset = "H2O"; + ++#ifdef Q_OS_HAIKU ++ iconset = "Default"; ++#endif + + #if USE_MINIMUMSIZE + gui_minimum_width = 0; // 0 == disabled +-- +2.19.0 diff --git a/media-video/smplayer/smplayer-18.5.0.recipe b/media-video/smplayer/smplayer-18.9.0.recipe similarity index 96% rename from media-video/smplayer/smplayer-18.5.0.recipe rename to media-video/smplayer/smplayer-18.9.0.recipe index 067bfe91f..9883a8c72 100644 --- a/media-video/smplayer/smplayer-18.5.0.recipe +++ b/media-video/smplayer/smplayer-18.9.0.recipe @@ -7,9 +7,9 @@ possibility to play Youtube videos or download subtitles." HOMEPAGE="https://www.smplayer.info/" COPYRIGHT="2006-2018 Ricardo Villalba" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://downloads.sf.net/smplayer/smplayer-$portVersion.tar.bz2" -CHECKSUM_SHA256="36a3aeda0f1fcbffdf05039185dd76160551a2905056ef933fd3b772eb47ad3b" +CHECKSUM_SHA256="0df1ed59caea1f321b6a3a0e2a9fff4e87d2553eeacaa5b167e64001bd10ce3d" PATCHES="smplayer-$portVersion.patchset" ADDITIONAL_FILES="smplayer.rdef"