multimedia/libopenshot: Update to 0.2.6

PR:	258161

6 files changed, 32 insertions, 25 deletions

diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
index 8646ea1c57f6..4ac8dd016f10 100644
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -1,8 +1,6 @@
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.5-726
-DISTVERSIONSUFFIX=	-gd9ea98eb
-PORTREVISION=	1
+DISTVERSION=	0.2.6
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -37,11 +35,10 @@ OPTIONS_DEFINE=	IMAGEMAGICK OPENCV
 OPTIONS_DEFAULT=	IMAGEMAGICK
 OPTIONS_SUB=	yes
 IMAGEMAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_CMAKE_BOOL=	ENABLE_MAGICK
 IMAGEMAGICK_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
-#OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
-OPENCV_BUILD_DEPENDS=	opencv>=4.5.2:graphics/opencv
-OPENCV_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
-OPENCV_RUN_DEPENDS=	opencv>=4.5.2:graphics/opencv
+OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
+			libprotobuf.so:devel/protobuf
 OPENCV_CMAKE_ON=	-DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4
 OPENCV_CMAKE_BOOL=	ENABLE_OPENCV
 OPENCV_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenCV\
diff --git a/multimedia/libopenshot/distinfo b/multimedia/libopenshot/distinfo
index faa69308bcaa..0fd1042e94d2 100644
--- a/multimedia/libopenshot/distinfo
+++ b/multimedia/libopenshot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623639600
-SHA256 (OpenShot-libopenshot-v0.2.5-726-gd9ea98eb_GH0.tar.gz) = df4edd5a3e5380ca84fb6b78e696ea042b483291ae31e80a3eed0af4218fdb09
-SIZE (OpenShot-libopenshot-v0.2.5-726-gd9ea98eb_GH0.tar.gz) = 22459810
+TIMESTAMP = 1629968400
+SHA256 (OpenShot-libopenshot-v0.2.6_GH0.tar.gz) = 3e6f60c86748ea814a9c0c48e5a59c5b04a5876a43b763258d0dd3f6ae84fde8
+SIZE (OpenShot-libopenshot-v0.2.6_GH0.tar.gz) = 22472140
diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt
index d3b3edc0f3e6..e6fa4208c649 100644
--- a/multimedia/libopenshot/files/patch-src_CMakeLists.txt
+++ b/multimedia/libopenshot/files/patch-src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig	2021-06-07 02:42:27 UTC
+--- src/CMakeLists.txt.orig	2021-08-19 20:40:39 UTC
 +++ src/CMakeLists.txt
-@@ -469,6 +469,15 @@ See https://github.com/opencv/opencv/issues/19260]])
+@@ -494,6 +494,15 @@ See https://github.com/opencv/opencv/issues/19260]])
  endif()  # ENABLE_OPENCV
  add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")
  
diff --git a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
index b394de3787f5..03ba68404250 100644
--- a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
+++ b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
@@ -1,6 +1,6 @@
---- src/FFmpegReader.cpp.orig	2021-06-07 02:42:27 UTC
+--- src/FFmpegReader.cpp.orig	2021-08-19 20:40:39 UTC
 +++ src/FFmpegReader.cpp
-@@ -138,7 +138,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
+@@ -139,7 +139,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
  
  	for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
  		switch (*p) {
@@ -9,7 +9,7 @@
  			// Linux pix formats
  			case AV_PIX_FMT_VAAPI:
  				hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI;
-@@ -294,7 +294,7 @@ void FFmpegReader::Open() {
+@@ -295,7 +295,7 @@ void FFmpegReader::Open() {
  					pCodecCtx->get_format = get_hw_dec_format;
  
  					if (adapter_num < 3 && adapter_num >=0) {
@@ -18,7 +18,7 @@
  						snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
  						adapter_ptr = adapter;
  						i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER;
-@@ -357,11 +357,13 @@ void FFmpegReader::Open() {
+@@ -358,11 +358,13 @@ void FFmpegReader::Open() {
  					}
  
  					// Check if it is there and writable
diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
index 0d155024338d..06948a8a0020 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	2021-06-07 02:42:27 UTC
+--- src/FFmpegWriter.cpp.orig	2021-08-19 20:40:39 UTC
 +++ src/FFmpegWriter.cpp
 @@ -169,7 +169,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
  		AVCodec *new_codec;
@@ -35,7 +35,7 @@
  				}
  #endif  // FFmpeg 4.0+
  		} else {
-@@ -1413,21 +1416,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+@@ -1400,21 +1403,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 106fbaf0415c..670f23916753 100644
--- a/multimedia/libopenshot/pkg-plist
+++ b/multimedia/libopenshot/pkg-plist
@@ -38,7 +38,7 @@ include/libopenshot/ImageWriter.h
 include/libopenshot/Json.h
 include/libopenshot/KeyFrame.h
 include/libopenshot/MagickUtilities.h
-%%OPENCV%%include/libopenshot/OpenCVUtilities.h
+include/libopenshot/OpenCVUtilities.h
 include/libopenshot/OpenMPUtilities.h
 include/libopenshot/OpenShot.h
 include/libopenshot/OpenShotVersion.h
@@ -64,10 +64,20 @@ include/libopenshot/Settings.h
 include/libopenshot/TextReader.h
 include/libopenshot/Timeline.h
 include/libopenshot/TimelineBase.h
-%%OPENCV%%include/libopenshot/TrackedObjectBBox.h
-%%OPENCV%%include/libopenshot/TrackedObjectBase.h
+include/libopenshot/TrackedObjectBBox.h
+include/libopenshot/TrackedObjectBase.h
 include/libopenshot/WriterBase.h
 include/libopenshot/ZmqLogger.h
+include/libopenshot/audio_effects/Compressor.h
+include/libopenshot/audio_effects/Delay.h
+include/libopenshot/audio_effects/Distortion.h
+include/libopenshot/audio_effects/Echo.h
+include/libopenshot/audio_effects/Expander.h
+include/libopenshot/audio_effects/Noise.h
+include/libopenshot/audio_effects/ParametricEQ.h
+include/libopenshot/audio_effects/Robotization.h
+include/libopenshot/audio_effects/STFT.h
+include/libopenshot/audio_effects/Whisperization.h
 include/libopenshot/effects/Bars.h
 include/libopenshot/effects/Blur.h
 include/libopenshot/effects/Brightness.h
@@ -92,11 +102,11 @@ include/libopenshot/effects/Wave.h
 include/libopenshot/sort_filter/Hungarian.h
 include/libopenshot/sort_filter/KalmanTracker.h
 lib/libopenshot.so
-lib/libopenshot.so.0.2.5
-lib/libopenshot.so.19
+lib/libopenshot.so.0.2.6
+lib/libopenshot.so.20
 %%OPENCV%%lib/libopenshot_protobuf.so
-%%OPENCV%%lib/libopenshot_protobuf.so.0.2.5
-%%OPENCV%%lib/libopenshot_protobuf.so.19
+%%OPENCV%%lib/libopenshot_protobuf.so.0.2.6
+%%OPENCV%%lib/libopenshot_protobuf.so.20
 %%PYTHON_SITELIBDIR%%/_openshot.so
 %%PYTHON_SITELIBDIR%%/openshot.py
 %%NO_OPENCV%%@dir include/libopenshot/protobuf_messages