media-libs/libopenshot: bump to 0.2.0

media-libs/libopenshot/libopenshot-0.2.0.recipe

@@ -4,39 +4,50 @@ delivering high quality video editing, animation, and playback solutions to \
 the world. This is the same library which powers OpenShot Video Editor \
 (version 2.0+). C++, Python are fully supported."
 HOMEPAGE="http://www.openshot.org"
-COPYRIGHT="2008-2017 OpenShot Studios, LLC"
+COPYRIGHT="2008-2018 OpenShot Studios, LLC"
 LICENSE="GNU LGPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="2547969818092d77a1c742e27cf416b34b4d326abf6b089fc10b921f4a4141ec"
+CHECKSUM_SHA256="f6f79c18023253720698c3049a0cd4b5783354cfbc6345e736e15268be6e297d"
 SOURCE_FILENAME="libopenshot-$portVersion.tar.gz"
 PATCHES="libopenshot-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="15"
 
 PROVIDES="
 	libopenshot$secondaryArchSuffix = $portVersion
-	lib:libopenshot$secondaryArchSuffix = 14 compat >= 14
+	lib:libopenshot$secondaryArchSuffix = $libVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libavcodec$secondaryArchSuffix
+	lib:libavdevice$secondaryArchSuffix
+	lib:libavformat$secondaryArchSuffix
+	lib:libavresample$secondaryArchSuffix
+	lib:libavutil$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
 	lib:libMagick++_6.Q16$secondaryArchSuffix
+	lib:libMagickCore_6.Q16$secondaryArchSuffix
+	lib:libMagickWand_6.Q16$secondaryArchSuffix
 	lib:libopenshot_audio$secondaryArchSuffix
 	lib:libpython3.6m$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Multimedia$secondaryArchSuffix
 	lib:libQt5MultimediaWidgets$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libswresample$secondaryArchSuffix
+	lib:libswscale$secondaryArchSuffix
 	lib:libzmq$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libopenshot${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libopenshot${secondaryArchSuffix} = 14 compat >= 14
+	devel:libopenshot${secondaryArchSuffix} = $libVersion
 	"
 REQUIRES_devel="
 	libopenshot$secondaryArchSuffix == $portVersion base
@@ -46,14 +57,19 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	unittest++${secondaryArchSuffix}_devel
 	devel:libavcodec$secondaryArchSuffix
+	devel:libavdevice$secondaryArchSuffix
+	devel:libavformat$secondaryArchSuffix
+	devel:libavresample$secondaryArchSuffix
+	devel:libavutil$secondaryArchSuffix
 	devel:libexecinfo$secondaryArchSuffix
 	devel:libMagick++_6.Q16$secondaryArchSuffix
 	devel:libopenshot_audio$secondaryArchSuffix >= 6
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Multimedia$secondaryArchSuffix
 	devel:libQt5MultimediaWidgets$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libswresample$secondaryArchSuffix
+	devel:libswscale$secondaryArchSuffix
 	devel:libzmq$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -62,19 +78,17 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:python3
-	cmd:swig
+	cmd:swig$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	local UNITTEST_SUBDIR=
-	if [ -n "$secondaryArchSuffix" ]; then
-		UNITTEST_SUBDIR="$secondaryArchSuffix/"
-	fi
-	export UNITTEST_INCLUDE_DIR=$portPackageLinksDir/unittest++${secondaryArchSuffix}_devel/develop/headers$UNITTEST_SUBDIR/UnitTest++
-	export UNITTEST_LIB_DIR=$portPackageLinksDir/unittest++${secondaryArchSuffix}_devel/develop/lib$UNITTEST_SUBDIR
+	python=$portPackageLinksDir/cmd~python3/bin/python3
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 
-	cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
+	cmake . $cmakeDirArgs \
+		-DPYTHON_MODULE_PATH=$installLocation \
 		-DENABLE_RUBY=OFF
 	make $jobArgs
 }
@@ -84,19 +98,6 @@ INSTALL()
 	make install
 
 	prepareInstalledDevelLibs libopenshot
-	fixPkgconfig
-
-	mkdir -p $includeDir
-	mv $prefix/include/libopenshot $includeDir
-	rmdir $prefix/include
-
-	python=$portPackageLinksDir/cmd~python3/bin/python3
-	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
-	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
-
-	mkdir -p $installLocation
-	# TODO fix install location
-	mv /python3-*/.self/non-packaged/lib/python3*/site-packages/* $installLocation/
 
 	# devel package
 	packageEntries devel \

media-libs/libopenshot/patches/libopenshot-0.1.9.patchset

@@ -1,79 +0,0 @@
-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
-
-
-diff --git a/cmake/Modules/FindOpenShotAudio.cmake b/cmake/Modules/FindOpenShotAudio.cmake
-index 720b93a..bca4aee 100644
---- a/cmake/Modules/FindOpenShotAudio.cmake
-+++ b/cmake/Modules/FindOpenShotAudio.cmake
-@@ -11,7 +11,8 @@ message("$ENV{LIBOPENSHOT_AUDIO_DIR}")
- find_path(LIBOPENSHOT_AUDIO_BASE_DIR JuceHeader.h
- 			PATHS /usr/include/libopenshot-audio/
- 			/usr/local/include/libopenshot-audio/
--			$ENV{LIBOPENSHOT_AUDIO_DIR}/include/libopenshot-audio/ )
-+			$ENV{LIBOPENSHOT_AUDIO_DIR}/include/libopenshot-audio/
-+			/system/develop/headers/libopenshot-audio/ )
- 
- # Get a list of all header file paths
- FILE(GLOB_RECURSE JUCE_HEADER_FILES
-diff --git a/cmake/Modules/FindUnitTest++.cmake b/cmake/Modules/FindUnitTest++.cmake
-index 545f62a..edcc511 100644
---- a/cmake/Modules/FindUnitTest++.cmake
-+++ b/cmake/Modules/FindUnitTest++.cmake
-@@ -9,6 +9,7 @@ FIND_PATH(UNITTEST++_INCLUDE_DIR UnitTest++.h
-     $ENV{UNITTEST_DIR}/include/unittest++
- 	$ENV{UNITTEST_DIR}/src
-     $ENV{UNITTEST_DIR}
-+    $ENV{UNITTEST_INCLUDE_DIR}
-     ~/Library/Frameworks
-     /Library/Frameworks
-     /usr/local/include
-@@ -33,6 +34,7 @@ FIND_LIBRARY(UNITTEST++_LIBRARY
-     $ENV{UNITTEST_DIR}/lib
- 	$ENV{UNITTEST_DIR}/build
-     $ENV{UNITTEST_DIR}
-+    $ENV{UNITTEST_LIB_DIR}
-     ~/Library/Frameworks
-     /Library/Frameworks
-     /usr/local/lib
--- 
-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
-