From d9ed3afcca190a4569f798cbe2fc5b850d1e2d9c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 18 Apr 2017 22:43:38 +0200
Subject: [PATCH] libopenshot: bump version.

* depends on zeromq, which normally would bring libunwind.
* disable stacktrace printing.
---
 .../libopenshot/libopenshot-0.1.4.recipe      |  8 +++-
 .../patches/libopenshot-0.1.4.patchset        | 40 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/media-libs/libopenshot/libopenshot-0.1.4.recipe b/media-libs/libopenshot/libopenshot-0.1.4.recipe
index d333f6dc5..f09ef4fe7 100644
--- a/media-libs/libopenshot/libopenshot-0.1.4.recipe
+++ b/media-libs/libopenshot/libopenshot-0.1.4.recipe
@@ -8,8 +8,8 @@ COPYRIGHT="2008-2016 OpenShot Studios, LLC"
 LICENSE="GNU LGPL v3"
 SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="libopenshot-$portVersion.tar.gz"
-CHECKSUM_SHA256="735322c73f6e8ea7bac059970f247c906b4c35f83fad5e5efd9a77adead20d0c"
-REVISION="5"
+CHECKSUM_SHA256="6c1947275f47b233d271021ee8b9b5c55ac1a3374f8eb6de44bd01d86a09e4d7"
+REVISION="1"
 PATCHES="libopenshot-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -24,12 +24,14 @@ REQUIRES="
 	lib:libavcodec$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
 	lib:libopenshot_audio$secondaryArchSuffix
+	lib:libpython3.6m$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5MultimediaWidgets$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libMagick++_6.Q16$secondaryArchSuffix
+	lib:libzmq$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -43,6 +45,7 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libavcodec$secondaryArchSuffix
+	devel:libexecinfo$secondaryArchSuffix
 	devel:libopenshot_audio$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
@@ -50,6 +53,7 @@ BUILD_REQUIRES="
 	devel:libQt5Network$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libMagick++_6.Q16$secondaryArchSuffix
+	devel:libzmq$secondaryArchSuffix
 	unittest++${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
diff --git a/media-libs/libopenshot/patches/libopenshot-0.1.4.patchset b/media-libs/libopenshot/patches/libopenshot-0.1.4.patchset
index c41f6cb9e..d1f68b427 100644
--- a/media-libs/libopenshot/patches/libopenshot-0.1.4.patchset
+++ b/media-libs/libopenshot/patches/libopenshot-0.1.4.patchset
@@ -1,4 +1,4 @@
-From 59f03d79adc89d91c74cf4eba5199228992078a5 Mon Sep 17 00:00:00 2001
+From 86d18afa40b854c69652d0cc48246fe4f6644c54 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 1 Jun 2016 12:35:16 +0200
 Subject: Haiku patch
@@ -39,5 +39,41 @@ index 545f62a..edcc511 100644
      /Library/Frameworks
      /usr/local/lib
 -- 
-2.2.2
+2.12.2
+
+
+From 00f64b383a1e86f3656214c8eb2459d095364a7e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 18 Apr 2017 22:42:41 +0200
+Subject: disable stacktrace printing, as it depends on libunwind.
+
+
+diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp
+index e7827d0..4b05a89 100644
+--- a/src/CrashHandler.cpp
++++ b/src/CrashHandler.cpp
+@@ -198,6 +198,7 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames)
+ 	SymCleanup(process);
+ 
+ #else
++#ifndef __HAIKU__
+     // Linux and Mac stack unwinding
+ 	// Storage array for stack trace address data
+ 	void* addrlist[max_frames+1];
+@@ -311,10 +312,11 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames)
+ 	// Free array
+ 	free(symbollist);
+ #endif
++#endif
+ 
+ 	// Write stacktrace to file (if log path set)
+ 	ZmqLogger::Instance()->LogToFile(stack_output.str());
+ 
+ 	fprintf(out, "---- End of Stack Trace ----\n");
+ 	ZmqLogger::Instance()->LogToFile("---- End of Stack Trace ----\n");
+-}
+\ No newline at end of file
++}
+-- 
+2.12.2