Attachment #217906 for bug #249271

View | Details | Raw Unified | Return to bug 249271
Collapse All | Expand All

Lines 2-10 Link Here

(-)multimedia/libopenshot/Makefile (-3 / +2 lines)
2		2
3	PORTNAME= libopenshot	3	PORTNAME= libopenshot
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.2.5-106	5	DISTVERSION= 0.2.5-172
6	DISTVERSIONSUFFIX= -g517f289	6	DISTVERSIONSUFFIX= -gac8966a
7	PORTREVISION= 1
8	CATEGORIES= multimedia	7	CATEGORIES= multimedia
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
10		9

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1592888400	1	TIMESTAMP = 1599886800
2	SHA256 (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = e8cce2ce90a16798519522cb0bca21a8b1367bca3608694552d951bf03350aaa	2	SHA256 (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = d90d146d167108eab98dbf1aadce564267c2f6741e2836501e25f3037f4b3b9c
3	SIZE (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = 10303100	3	SIZE (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = 10305575

Lines 1-7 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-4 / +4 lines)
1	--- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC	1	--- src/CMakeLists.txt.orig 2020-09-11 02:37:02 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg)	3	@@ -384,7 +384,13 @@ if (TARGET RESVG::resvg)
4	set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")	4
5	endif()	5	endif()
6		6
7	+find_library(EXECINFO_LIBRARY NAMES execinfo)	7	+find_library(EXECINFO_LIBRARY NAMES execinfo)
Lines 13-16 Link Here
13	+	13	+
14	# Link remaining dependency libraries	14	# Link remaining dependency libraries
15	target_link_libraries(openshot PUBLIC	15	target_link_libraries(openshot PUBLIC
16	${LIBOPENSHOT_AUDIO_LIBRARIES}	16	${LIBOPENSHOT_AUDIO_LIBRARIES}




--- src/FFmpegReader.cpp.orig	2020-09-11 02:37:02 UTC
+++ src/FFmpegReader.cpp
@@ -165,7 +165,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
 
 	for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
 		switch (*p) {

 			// Linux pix formats
 			case AV_PIX_FMT_VAAPI:
 				hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI;
@@ -321,7 +321,7 @@ void FFmpegReader::Open() {
 					pCodecCtx->get_format = get_hw_dec_format;
 
 					if (adapter_num < 3 && adapter_num >=0) {

 						snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
 						adapter_ptr = adapter;
 						i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER;
@@ -384,11 +384,13 @@ void FFmpegReader::Open() {
 					}
 
 					// Check if it is there and writable




--- src/FFmpegWriter.cpp.orig	2020-09-11 02:37:02 UTC
+++ src/FFmpegWriter.cpp
@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
 		AVCodec *new_codec;

 #else // not ffmpeg 3
 		new_codec = avcodec_find_encoder_by_name(codec.c_str());
 #endif // HAVE_HW_ACCEL
@@ -556,6 +556,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
 						else {
 							av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
 						}

 					case AV_CODEC_ID_HEVC :
 						c->bit_rate = 0;
 						if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
@@ -564,6 +565,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
 							av_opt_set_int(c->priv_data, "forced-idr",1,0);
 						}
 						break;

 				}
 #endif
 		} else {
@@ -1456,7 +1459,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) {

 				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;
@@ -1464,17 +1467,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 				adapter_ptr = NULL;
 #elif defined(__APPLE__)
 				adapter_ptr = NULL;

Lines 51-56 Link Here

(-)multimedia/libopenshot/pkg-plist (+1 lines)
51	include/libopenshot/QtImageReader.h	51	include/libopenshot/QtImageReader.h
52	include/libopenshot/QtPlayer.h	52	include/libopenshot/QtPlayer.h
53	include/libopenshot/QtTextReader.h	53	include/libopenshot/QtTextReader.h
		54	include/libopenshot/QtUtilities.h
54	include/libopenshot/ReaderBase.h	55	include/libopenshot/ReaderBase.h
55	include/libopenshot/RendererBase.h	56	include/libopenshot/RendererBase.h
56	include/libopenshot/Settings.h	57	include/libopenshot/Settings.h

Return to bug 249271

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (-4 / +4 lines)
1	--- src/FFmpegReader.cpp.orig 2020-02-10 17:52:00 UTC	1	--- src/FFmpegReader.cpp.orig 2020-09-11 02:37:02 UTC
2	+++ src/FFmpegReader.cpp	2	+++ src/FFmpegReader.cpp
3	@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon	3	@@ -165,7 +165,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
4		4
5	for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {	5	for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
6	switch (*p) {	6	switch (*p) {
Lines 9-15 Link Here
9	// Linux pix formats	9	// Linux pix formats
10	case AV_PIX_FMT_VAAPI:	10	case AV_PIX_FMT_VAAPI:
11	hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI;	11	hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI;
12	@@ -318,7 +318,7 @@ void FFmpegReader::Open() {	12	@@ -321,7 +321,7 @@ void FFmpegReader::Open() {
13	pCodecCtx->get_format = get_hw_dec_format;	13	pCodecCtx->get_format = get_hw_dec_format;
14		14
15	if (adapter_num < 3 && adapter_num >=0) {	15	if (adapter_num < 3 && adapter_num >=0) {
Lines 18-24 Link Here
18	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);	18	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
19	adapter_ptr = adapter;	19	adapter_ptr = adapter;
20	i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER;	20	i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER;
21	@@ -381,11 +381,13 @@ void FFmpegReader::Open() {	21	@@ -384,11 +384,13 @@ void FFmpegReader::Open() {
22	}	22	}
23		23
24	// Check if it is there and writable	24	// Check if it is there and writable

Lines 1-4 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-5 / +5 lines)
1	--- src/FFmpegWriter.cpp.orig 2020-06-18 10:04:32 UTC	1	--- src/FFmpegWriter.cpp.orig 2020-09-11 02:37:02 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std	3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
4	AVCodec *new_codec;	4	AVCodec *new_codec;
Lines 21-27 Link Here
21	#else // not ffmpeg 3	21	#else // not ffmpeg 3
22	new_codec = avcodec_find_encoder_by_name(codec.c_str());	22	new_codec = avcodec_find_encoder_by_name(codec.c_str());
23	#endif // HAVE_HW_ACCEL	23	#endif // HAVE_HW_ACCEL
24	@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s	24	@@ -556,6 +556,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
25	else {	25	else {
26	av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);	26	av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
27	}	27	}
Lines 29-35 Link Here
29	case AV_CODEC_ID_HEVC :	29	case AV_CODEC_ID_HEVC :
30	c->bit_rate = 0;	30	c->bit_rate = 0;
31	if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {	31	if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
32	@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s	32	@@ -564,6 +565,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
33	av_opt_set_int(c->priv_data, "forced-idr",1,0);	33	av_opt_set_int(c->priv_data, "forced-idr",1,0);
34	}	34	}
35	break;	35	break;
Lines 38-44 Link Here
38	}	38	}
39	#endif	39	#endif
40	} else {	40	} else {
41	@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	41	@@ -1456,7 +1459,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
42	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;	42	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
43	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);	43	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
44	if (adapter_num < 3 && adapter_num >=0) {	44	if (adapter_num < 3 && adapter_num >=0) {
Lines 47-53 Link Here
47	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);	47	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
48	// Maybe 127 is better because the first card would be 1?!	48	// Maybe 127 is better because the first card would be 1?!
49	adapter_ptr = adapter;	49	adapter_ptr = adapter;
50	@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	50	@@ -1464,17 +1467,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
51	adapter_ptr = NULL;	51	adapter_ptr = NULL;
52	#elif defined(__APPLE__)	52	#elif defined(__APPLE__)
53	adapter_ptr = NULL;	53	adapter_ptr = NULL;