svn commit: r540620 - in head/multimedia/libopenshot: . files

[Li-Wen Hsu]

Author: lwhsu
Date: Sat Jun 27 15:42:35 2020
New Revision: 540620
URL: https://svnweb.freebsd.org/changeset/ports/540620

Log:
  Update to 0.2.5.106
  
  PR:		247532
  Submitted by:	Tatsuki Makino <tatsuki_makino at hotmail.com> (maintainer)

Modified:
  head/multimedia/libopenshot/Makefile
  head/multimedia/libopenshot/distinfo
  head/multimedia/libopenshot/files/patch-src_CMakeLists.txt
  head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp

Modified: head/multimedia/libopenshot/Makefile
==============================================================================
--- head/multimedia/libopenshot/Makefile	Sat Jun 27 15:41:15 2020	(r540619)
+++ head/multimedia/libopenshot/Makefile	Sat Jun 27 15:42:35 2020	(r540620)
@@ -2,8 +2,8 @@
 
 PORTNAME=	libopenshot
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.5-4
-DISTVERSIONSUFFIX=	-gf1e5c9c
+DISTVERSION=	0.2.5-106
+DISTVERSIONSUFFIX=	-g517f289
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Modified: head/multimedia/libopenshot/distinfo
==============================================================================
--- head/multimedia/libopenshot/distinfo	Sat Jun 27 15:41:15 2020	(r540619)
+++ head/multimedia/libopenshot/distinfo	Sat Jun 27 15:42:35 2020	(r540620)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583463600
-SHA256 (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 15c17c3d8af02db5b94e18d295766d20ad59e24d041a25082a45e5d741731a98
-SIZE (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 10295823
+TIMESTAMP = 1592888400
+SHA256 (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = e8cce2ce90a16798519522cb0bca21a8b1367bca3608694552d951bf03350aaa
+SIZE (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = 10303100

Modified: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt
==============================================================================
--- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt	Sat Jun 27 15:41:15 2020	(r540619)
+++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt	Sat Jun 27 15:42:35 2020	(r540620)
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig	2020-03-03 09:00:23 UTC
+--- src/CMakeLists.txt.orig	2020-06-18 10:04:32 UTC
 +++ src/CMakeLists.txt
-@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg)
+@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg)
    set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")
  endif()
  

Modified: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
==============================================================================
--- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp	Sat Jun 27 15:41:15 2020	(r540619)
+++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp	Sat Jun 27 15:42:35 2020	(r540620)
@@ -1,4 +1,4 @@
---- src/FFmpegWriter.cpp.orig	2020-03-03 09:00:23 UTC
+--- src/FFmpegWriter.cpp.orig	2020-06-18 10:04:32 UTC
 +++ src/FFmpegWriter.cpp
 @@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
  		AVCodec *new_codec;
@@ -21,7 +21,24 @@
  #else // not ffmpeg 3
  		new_codec = avcodec_find_encoder_by_name(codec.c_str());
  #endif // HAVE_HW_ACCEL
-@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
+ 						else {
+ 							av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
+ 						}
++						break;
+ 					case AV_CODEC_ID_HEVC :
+ 						c->bit_rate = 0;
+ 						if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
+@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
+ 							av_opt_set_int(c->priv_data, "forced-idr",1,0);
+ 						}
+ 						break;
++					default:
++						break;
+ 				}
+ #endif
+ 		} else {
+@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
  		adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
  		fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
  		if (adapter_num < 3 && adapter_num >=0) {
@@ -30,7 +47,7 @@
  				snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
  				// Maybe 127 is better because the first card would be 1?!
  				adapter_ptr = adapter;
-@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
  				adapter_ptr = NULL;
  #elif defined(__APPLE__)
  				adapter_ptr = NULL;