multimedia/libopenshot: Update to 0.3.1

ChangeLog: https://www.openshot.org/blog/2023/04/06/new_openshot_release_310/

PR:		270762
Reported by:	tatsuki_makino@hotmail.com

6 files changed, 49 insertions, 22 deletions

diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
index 6fd8fa9c29a7..241fdbbe76f9 100644
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.0
-PORTREVISION=	2
+DISTVERSION=	0.3.1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +11,7 @@ WWW=		https://www.openshot.org/
 LICENSE=	BSD3CLAUSE LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSES/BSD-3-Clause.txt
-LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt
+LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	swig:devel/swig \
 		${LOCALBASE}/include/zmq.hpp:net/cppzmq
@@ -22,7 +21,7 @@ LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libopenshot-audio.so:audio/libopenshot-audio \
 		libzmq.so:net/libzmq4
 
-USES=		cmake pkgconfig python qt:5
+USES=		cmake pkgconfig python:build qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenShot
 USE_LDCONFIG=	yes
@@ -30,12 +29,11 @@ USE_PYTHON=	flavors
 USE_QT=		core gui widgets buildtools:build qmake:build
 CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
 		USE_HW_ACCEL ENABLE_PYTHON\
-		CMAKE_DISABLE_FIND_PACKAGE_Catch2\
-		CMAKE_DISABLE_FIND_PACKAGE_Ruby
+		CMAKE_DISABLE_FIND_PACKAGE_Catch2
 CMAKE_OFF=	ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\
-		APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS ENABLE_RUBY
+		APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS
 
-OPTIONS_DEFINE=	DOCS IMAGEMAGICK OPENCV RESVG
+OPTIONS_DEFINE=	DOCS IMAGEMAGICK OPENCV RESVG RUBY
 OPTIONS_DEFAULT=	IMAGEMAGICK OPENCV
 OPTIONS_SUB=	yes
 RESVG_DESC?=	SVG vector graphics support via resvg
@@ -57,6 +55,9 @@ RESVG_LIB_DEPENDS=	libresvg.so:graphics/resvg-capi
 RESVG_USE_OFF=	QT=svg
 RESVG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Resvg
 RESVG_CMAKE_ON=	-DRESVGDIR:STRING=${LOCALBASE:Q}
+RUBY_USES=	ruby:build
+RUBY_CMAKE_BOOL=	ENABLE_RUBY
+RUBY_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Ruby
 
 .if !exists(/usr/include/omp.h)
 USES+=		compiler:gcc-c++11-lib
diff --git a/multimedia/libopenshot/distinfo b/multimedia/libopenshot/distinfo
index de668a7db0c6..221087b79125 100644
--- a/multimedia/libopenshot/distinfo
+++ b/multimedia/libopenshot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670814000
-SHA256 (OpenShot-libopenshot-v0.3.0_GH0.tar.gz) = 5b289432b1209f11fe60c17c07e9365ab62e3074dcc7d50996fc816dfe54a282
-SIZE (OpenShot-libopenshot-v0.3.0_GH0.tar.gz) = 26122831
+TIMESTAMP = 1681095600
+SHA256 (OpenShot-libopenshot-v0.3.1_GH0.tar.gz) = 239f9df1f5b547257d5e76062c3177ff3ff372b8cda336637d752141a5a8e625
+SIZE (OpenShot-libopenshot-v0.3.1_GH0.tar.gz) = 26131959
diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt
index fe66e19d8c7b..c94d5a8ab374 100644
--- a/multimedia/libopenshot/files/patch-src_CMakeLists.txt
+++ b/multimedia/libopenshot/files/patch-src_CMakeLists.txt
@@ -1,15 +1,20 @@
---- src/CMakeLists.txt.orig	2022-12-01 22:04:03 UTC
+--- src/CMakeLists.txt.orig	2023-03-27 18:48:43 UTC
 +++ src/CMakeLists.txt
-@@ -516,6 +516,13 @@ See https://github.com/opencv/opencv/issues/19260]])
+@@ -516,6 +516,18 @@ See https://github.com/opencv/opencv/issues/19260]])
  endif()  # ENABLE_OPENCV
  add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")
  
 +# EXECINFO
-+find_library(EXECINFO_LIBRARY NAMES execinfo)
-+if(NOT EXECINFO_LIBRARY)
-+	message(FATAL_ERROR "${EXECINFO_LIBRARY}")
-+endif(NOT EXECINFO_LIBRARY)
-+target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})
++include(CheckFunctionExists)
++check_function_exists("backtrace" FUNCTION_BACKTRACE_FOUND)
++if(NOT FUNCTION_BACKTRACE_FOUND)
++	find_library(EXECINFO_LIBRARY NAMES execinfo)
++	if(NOT EXECINFO_LIBRARY)
++		message(FATAL_ERROR "${EXECINFO_LIBRARY}")
++	endif(NOT EXECINFO_LIBRARY)
++	target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})
++endif(NOT FUNCTION_BACKTRACE_FOUND)
++unset(FUNCTION_BACKTRACE_FOUND)
 +
  ###############  LINK LIBRARY  #################
  # Link remaining dependency libraries
diff --git a/multimedia/libopenshot/files/patch-src_CrashHandler.cpp b/multimedia/libopenshot/files/patch-src_CrashHandler.cpp
new file mode 100644
index 000000000000..68352051a92e
--- /dev/null
+++ b/multimedia/libopenshot/files/patch-src_CrashHandler.cpp
@@ -0,0 +1,19 @@
+--- src/CrashHandler.cpp.orig	2023-03-27 18:48:43 UTC
++++ src/CrashHandler.cpp
+@@ -204,14 +204,14 @@ void CrashHandler::printStackTrace(FILE *out, unsigned
+ 	// Resolve addresses into strings containing "filename(function+address)",
+ 	// Actually it will be ## program address function + offset
+ 	// this array must be free()-ed
+-	char** symbollist = backtrace_symbols( addrlist, addrlen );
++	char** symbollist = backtrace_symbols_fmt( addrlist, addrlen, "%f(%n%D) [%a]" );
+ 
+ 	size_t funcnamesize = 1024;
+ 	char funcname[1024];
+ 
+ 	// Iterate over the returned symbol lines. Skip the first 4, it is the
+ 	// address of this function.
+-	for ( unsigned int i = 4; i < addrlen; i++ )
++	for ( unsigned int i = 1; i < addrlen; i++ )
+ 	{
+ 		char* begin_name   = NULL;
+ 		char* begin_offset = NULL;
diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
index 827ea05a2821..369816073bd3 100644
--- a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
+++ b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
@@ -1,4 +1,4 @@
---- src/FFmpegWriter.cpp.orig	2022-12-01 22:04:03 UTC
+--- src/FFmpegWriter.cpp.orig	2023-03-27 18:48:43 UTC
 +++ src/FFmpegWriter.cpp
 @@ -166,7 +166,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
  		const AVCodec *new_codec;
@@ -35,7 +35,7 @@
  				}
  #endif  // FFmpeg 4.0+
  		} else {
-@@ -1459,21 +1462,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+@@ -1470,21 +1473,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
  		adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
  		std::clog << "Encoding Device Nr: " << adapter_num << "\n";
  		if (adapter_num < 3 && adapter_num >=0) {
diff --git a/multimedia/libopenshot/pkg-plist b/multimedia/libopenshot/pkg-plist
index f7198faf1671..5e82b8c0aecc 100644
--- a/multimedia/libopenshot/pkg-plist
+++ b/multimedia/libopenshot/pkg-plist
@@ -1,5 +1,6 @@
 include/libopenshot/AudioBufferSource.h
 include/libopenshot/AudioDevices.h
+include/libopenshot/AudioLocation.h
 include/libopenshot/AudioReaderSource.h
 include/libopenshot/AudioResampler.h
 include/libopenshot/AudioWaveformer.h
@@ -96,7 +97,8 @@ include/libopenshot/effects/Wave.h
 include/libopenshot/sort_filter/Hungarian.h
 include/libopenshot/sort_filter/KalmanTracker.h
 lib/libopenshot.so
-lib/libopenshot.so.0.3.0
-lib/libopenshot.so.23
+lib/libopenshot.so.0.3.1
+lib/libopenshot.so.24
 %%PYTHON_SITELIBDIR%%/_openshot.so
 %%PYTHON_SITELIBDIR%%/openshot.py
+%%RUBY%%%%RUBY_VENDORARCHLIBDIR%%/openshot.so