Attachment #209094 for bug #241912

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





PORTNAME=	libopenshot
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.3-490
DISTVERSIONSUFFIX=	-gc271352
PORTREVISION=	3
CATEGORIES=	multimedia

MAINTAINER=	tatsuki_makino@hotmail.com

USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	OpenShot
USE_PYTHON=	noflavors
USE_QT=		core gui network multimedia widgets qmake_build buildtools_build

CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
		DISABLE_TESTS\
		CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
		CMAKE_DISABLE_FIND_PACKAGE_ImageMagick\
		CMAKE_DISABLE_FIND_PACKAGE_RESVG\
		CMAKE_DISABLE_FIND_PACKAGE_Ruby
OPTIONS_DEFAULT=	FFMPEG
OPTIONS_SINGLE=	LIBAVCODEC

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557457200	1	TIMESTAMP = 1573527600
2	SHA256 (OpenShot-libopenshot-v0.2.3-178-g17a2258_GH0.tar.gz) = c0b59d59a12a40c0f8723ce77f5cfff745e4f8cab31664223d26822320845df9	2	SHA256 (OpenShot-libopenshot-v0.2.3-490-gc271352_GH0.tar.gz) = f996b0f36311306e51eabebdc1dc11ee82986c3a98a0d631b9cfbba64b908965
3	SIZE (OpenShot-libopenshot-v0.2.3-178-g17a2258_GH0.tar.gz) = 10266083	3	SIZE (OpenShot-libopenshot-v0.2.3-490-gc271352_GH0.tar.gz) = 10290775




--- src/CMakeLists.txt.orig	2019-11-04 12:14:04 UTC
+++ src/CMakeLists.txt
@@ -340,6 +340,11 @@ if (TARGET cppzmq)
 endif()
 ENDIF(APPLE)
 
 
+find_library(EXECINFO_LIBRARY NAMES execinfo)
+if(NOT EXECINFO_LIBRARY)
+	message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+endif(NOT EXECINFO_LIBRARY)
+
 ###############  LINK LIBRARY  #################
 SET ( REQUIRED_LIBRARIES
 		${LIBOPENSHOT_AUDIO_LIBRARIES}
@@ -386,9 +391,11 @@ target_compile_definitions(openshot-example PRIVATE
 		${PROFILER}
 		${JSONCPP_LIBRARY}
 		${ZMQ_LIBRARIES}
+		${EXECINFO_LIBRARY}
 		)
 
 # Link test executable to the new library
 target_link_libraries(openshot-example openshot)
+target_link_libraries(openshot-example ${EXECINFO_LIBRARY})
 
 add_executable(openshot-html-test examples/ExampleHtml.cpp)
 target_link_libraries(openshot-html-test openshot Qt5::Gui)
+target_link_libraries(openshot-html-test ${EXECINFO_LIBRARY})
 
 ############### PLAYER EXECUTABLE ################
 # Create test executable
@@ -396,6 +403,7 @@ add_executable(openshot-player Qt/demo/main.cpp)
 
 # Link test executable to the new library
 target_link_libraries(openshot-player openshot)
+target_link_libraries(openshot-player ${EXECINFO_LIBRARY})
 
 ############### TEST BLACKMAGIC CAPTURE APP ################
 IF (BLACKMAGIC_FOUND)




--- src/FFmpegReader.cpp.orig	2019-11-04 12:14:04 UTC
+++ src/FFmpegReader.cpp
@@ -162,7 +162,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;
@@ -315,7 +315,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;
@@ -378,11 +378,13 @@ void FFmpegReader::Open() {
 					}
 
 					// Check if it is there and writable

+#else
 					if( adapter_ptr != NULL ) {
 #endif
 						ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device");




--- src/FFmpegWriter.cpp.orig	2019-11-04 12:14:04 UTC
+++ src/FFmpegWriter.cpp
@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str
 		AVCodec *new_codec;
 		// Check if the codec selected is a hardware accelerated codec
 #if IS_FFMPEG_3_2
-#if defined(__linux__)
+#if defined(__unix__)
 		if (strstr(codec.c_str(), "_vaapi") != NULL) {
 			new_codec = avcodec_find_encoder_by_name(codec.c_str());
 			hw_en_on = 1;
@@ -220,9 +220,9 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str
 			hw_en_on = 0;
 			hw_en_supported = 0;
 		}
-	#else  // is FFmpeg 3 but not linux
+#else  // is FFmpeg 3 but not linux
 		new_codec = avcodec_find_encoder_by_name(codec.c_str());
-	#endif //__linux__
+#endif //__unix__
 #else // not ffmpeg 3
 		new_codec = avcodec_find_encoder_by_name(codec.c_str());
 #endif //IS_FFMPEG_3_2
@@ -956,7 +956,7 @@ void FFmpegWriter::flush_encoders() {
 void FFmpegWriter::close_video(AVFormatContext *oc, AVStream *st)
 {
 #if IS_FFMPEG_3_2
-	//  #if defined(__linux__)
+	//  #if defined(__unix__)

 		if (hw_en_on && hw_en_supported) {
 			if (hw_device_ctx) {
 				av_buffer_unref(&hw_device_ctx);
@@ -1351,7 +1351,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;
@@ -1359,17 +1359,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 				adapter_ptr = NULL;
 #elif defined(__APPLE__)
 				adapter_ptr = NULL;

+#else
 		if( adapter_ptr != NULL ) {
 #endif
 				ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "adapter", adapter_num);




include/libopenshot/ImageWriter.h
include/libopenshot/Json.h
include/libopenshot/KeyFrame.h
include/libopenshot/MagickUtilities.h
include/libopenshot/OpenMPUtilities.h
include/libopenshot/OpenShot.h
include/libopenshot/OpenShotVersion.h
include/libopenshot/PlayerBase.h
include/libopenshot/Point.h
include/libopenshot/Profiles.h

include/libopenshot/Qt/VideoPlaybackThread.h
include/libopenshot/Qt/VideoRenderWidget.h
include/libopenshot/Qt/VideoRenderer.h
include/libopenshot/QtHtmlReader.h
include/libopenshot/QtImageReader.h
include/libopenshot/QtPlayer.h
include/libopenshot/QtTextReader.h
include/libopenshot/ReaderBase.h
include/libopenshot/RendererBase.h
include/libopenshot/Settings.h
include/libopenshot/Tests.h
include/libopenshot/TextReader.h
include/libopenshot/Timeline.h
include/libopenshot/Version.h
include/libopenshot/WriterBase.h
include/libopenshot/ZmqLogger.h
include/libopenshot/effects/Bars.h

Return to bug 241912

Lines 2-10 Link Here

(-)multimedia/libopenshot/Makefile (-8 / +8 lines)
2		2
3	PORTNAME= libopenshot	3	PORTNAME= libopenshot
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.2.3-178	5	DISTVERSION= 0.2.3-490
6	DISTVERSIONSUFFIX= -g17a2258	6	DISTVERSIONSUFFIX= -gc271352
7	PORTREVISION= 3
8	CATEGORIES= multimedia	7	CATEGORIES= multimedia
9		8
10	MAINTAINER= tatsuki_makino@hotmail.com	9	MAINTAINER= tatsuki_makino@hotmail.com
Lines 25-37 Link Here
25	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
26	USE_GITHUB= yes	25	USE_GITHUB= yes
27	GH_ACCOUNT= OpenShot	26	GH_ACCOUNT= OpenShot
		27	USE_PYTHON= noflavors
28	USE_QT= core gui network multimedia widgets qmake_build buildtools_build	28	USE_QT= core gui network multimedia widgets qmake_build buildtools_build
29		29
30	CMAKE_ON= USE_SYSTEM_JSONCPP \	30	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
31	DISABLE_TESTS \	31	DISABLE_TESTS\
32	CMAKE_DISABLE_FIND_PACKAGE_Doxygen \	32	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
33	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick \	33	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick\
34	CMAKE_DISABLE_FIND_PACKAGE_RESVG \	34	CMAKE_DISABLE_FIND_PACKAGE_RESVG\
35	CMAKE_DISABLE_FIND_PACKAGE_Ruby	35	CMAKE_DISABLE_FIND_PACKAGE_Ruby
36	OPTIONS_DEFAULT= FFMPEG	36	OPTIONS_DEFAULT= FFMPEG
37	OPTIONS_SINGLE= LIBAVCODEC	37	OPTIONS_SINGLE= LIBAVCODEC

Lines 1-19 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-14 / +29 lines)
1	--- src/CMakeLists.txt.orig 2019-05-08 19:16:50 UTC	1	--- src/CMakeLists.txt.orig 2019-11-04 12:14:04 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -45,6 +45,8 @@ IF (APPLE)	3	@@ -340,6 +340,11 @@ if (TARGET cppzmq)
4	SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES "-framework Carbon -framework Cocoa -framework CoreFoundation -framework CoreAudio -framework CoreMidi -framework IOKit -framework AGL -framework AudioToolbox -framework QuartzCore -lobjc -framework Accelerate")	4	endif()
5	ENDIF(APPLE)
6		5
		6
7	+find_library(EXECINFO_LIBRARY NAMES execinfo)	7	+find_library(EXECINFO_LIBRARY NAMES execinfo)
		8	+if(NOT EXECINFO_LIBRARY)
		9	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")
		10	+endif(NOT EXECINFO_LIBRARY)
8	+	11	+
9	################ IMAGE MAGICK ##################	12	############### LINK LIBRARY #################
10	# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)	13	SET ( REQUIRED_LIBRARIES
11	IF (MAGICKCORE_QUANTUM_DEPTH)	14	${LIBOPENSHOT_AUDIO_LIBRARIES}
12	@@ -312,6 +314,7 @@ SET ( REQUIRED_LIBRARIES	15	@@ -386,9 +391,11 @@ target_compile_definitions(openshot-example PRIVATE
13	${PROFILER}
14	${JSONCPP_LIBRARY}
15	${ZMQ_LIBRARIES}
16	+ ${EXECINFO_LIBRARY}
17	)
18		16
19	IF (AVCODEC_FOUND)	17	# Link test executable to the new library
		18	target_link_libraries(openshot-example openshot)
		19	+target_link_libraries(openshot-example ${EXECINFO_LIBRARY})
		20
		21	add_executable(openshot-html-test examples/ExampleHtml.cpp)
		22	target_link_libraries(openshot-html-test openshot Qt5::Gui)
		23	+target_link_libraries(openshot-html-test ${EXECINFO_LIBRARY})
		24
		25	############### PLAYER EXECUTABLE ################
		26	# Create test executable
		27	@@ -396,6 +403,7 @@ add_executable(openshot-player Qt/demo/main.cpp)
		28
		29	# Link test executable to the new library
		30	target_link_libraries(openshot-player openshot)
		31	+target_link_libraries(openshot-player ${EXECINFO_LIBRARY})
		32
		33	############### TEST BLACKMAGIC CAPTURE APP ################
		34	IF (BLACKMAGIC_FOUND)

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (-5 / +5 lines)
1	--- src/FFmpegReader.cpp.orig 2019-05-08 19:16:50 UTC	1	--- src/FFmpegReader.cpp.orig 2019-11-04 12:14:04 UTC
2	+++ src/FFmpegReader.cpp	2	+++ src/FFmpegReader.cpp
3	@@ -159,7 +159,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon	3	@@ -162,7 +162,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	@@ -312,7 +312,7 @@ void FFmpegReader::Open() {	12	@@ -315,7 +315,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	@@ -375,11 +375,13 @@ void FFmpegReader::Open() {	21	@@ -378,11 +378,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 32-35 Link Here
32	+#else	32	+#else
33	if( adapter_ptr != NULL ) {	33	if( adapter_ptr != NULL ) {
34	#endif	34	#endif
35	ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1);	35	ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device");

Lines 1-26 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-13 / +16 lines)
1	--- src/FFmpegWriter.cpp.orig 2019-05-08 19:16:50 UTC	1	--- src/FFmpegWriter.cpp.orig 2019-11-04 12:14:04 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -166,7 +166,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str	3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str
4	AVCodec *new_codec;	4	AVCodec *new_codec;
5	// Check if the codec selected is a hardware accelerated codec	5	// Check if the codec selected is a hardware accelerated codec
6	#if IS_FFMPEG_3_2	6	#if IS_FFMPEG_3_2
7	- #if defined(__linux__)	7	-#if defined(__linux__)
8	+#if defined(__unix__)	8	+#if defined(__unix__)
9	if ( (strcmp(codec.c_str(),"h264_vaapi") == 0)) {	9	if (strstr(codec.c_str(), "_vaapi") != NULL) {
10	new_codec = avcodec_find_encoder_by_name(codec.c_str());	10	new_codec = avcodec_find_encoder_by_name(codec.c_str());
11	hw_en_on = 1;	11	hw_en_on = 1;
12	@@ -225,7 +225,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str	12	@@ -220,9 +220,9 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str
		13	hw_en_on = 0;
		14	hw_en_supported = 0;
13	}	15	}
14	#else // is FFmpeg 3 but not linux	16	- #else // is FFmpeg 3 but not linux
		17	+#else // is FFmpeg 3 but not linux
15	new_codec = avcodec_find_encoder_by_name(codec.c_str());	18	new_codec = avcodec_find_encoder_by_name(codec.c_str());
16	-#endif //__linux__	19	- #endif //__linux__
17	+#endif //__unix__	20	+#endif //__unix__
18	#else // not ffmpeg 3	21	#else // not ffmpeg 3
19	new_codec = avcodec_find_encoder_by_name(codec.c_str());	22	new_codec = avcodec_find_encoder_by_name(codec.c_str());
20	#endif //IS_FFMPEG_3_2	23	#endif //IS_FFMPEG_3_2
21	@@ -888,7 +888,7 @@ void FFmpegWriter::close_video(AVFormatContext *oc, AV	24	@@ -956,7 +956,7 @@ void FFmpegWriter::flush_encoders() {
22	AV_FREE_CONTEXT(video_codec);	25	void FFmpegWriter::close_video(AVFormatContext oc, AVStream st)
23	video_codec = NULL;	26	{
24	#if IS_FFMPEG_3_2	27	#if IS_FFMPEG_3_2
25	- // #if defined(__linux__)	28	- // #if defined(__linux__)
26	+ // #if defined(__unix__)	29	+ // #if defined(__unix__)
Lines 27-33 Link Here
27	if (hw_en_on && hw_en_supported) {	30	if (hw_en_on && hw_en_supported) {
28	if (hw_device_ctx) {	31	if (hw_device_ctx) {
29	av_buffer_unref(&hw_device_ctx);	32	av_buffer_unref(&hw_device_ctx);
30	@@ -1290,7 +1290,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	33	@@ -1351,7 +1351,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
31	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;	34	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
32	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);	35	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
33	if (adapter_num < 3 && adapter_num >=0) {	36	if (adapter_num < 3 && adapter_num >=0) {
Lines 36-42 Link Here
36	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);	39	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
37	// Maybe 127 is better because the first card would be 1?!	40	// Maybe 127 is better because the first card would be 1?!
38	adapter_ptr = adapter;	41	adapter_ptr = adapter;
39	@@ -1298,17 +1298,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	42	@@ -1359,17 +1359,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
40	adapter_ptr = NULL;	43	adapter_ptr = NULL;
41	#elif defined(__APPLE__)	44	#elif defined(__APPLE__)
42	adapter_ptr = NULL;	45	adapter_ptr = NULL;
Lines 58-61 Link Here
58	+#else	61	+#else
59	if( adapter_ptr != NULL ) {	62	if( adapter_ptr != NULL ) {
60	#endif	63	#endif
61	ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1);	64	ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "adapter", adapter_num);

Lines 33-40 Link Here

(-)multimedia/libopenshot/pkg-plist (-2 / +4 lines)
33	include/libopenshot/ImageWriter.h	33	include/libopenshot/ImageWriter.h
34	include/libopenshot/Json.h	34	include/libopenshot/Json.h
35	include/libopenshot/KeyFrame.h	35	include/libopenshot/KeyFrame.h
		36	include/libopenshot/MagickUtilities.h
36	include/libopenshot/OpenMPUtilities.h	37	include/libopenshot/OpenMPUtilities.h
37	include/libopenshot/OpenShot.h	38	include/libopenshot/OpenShot.h
		39	include/libopenshot/OpenShotVersion.h
38	include/libopenshot/PlayerBase.h	40	include/libopenshot/PlayerBase.h
39	include/libopenshot/Point.h	41	include/libopenshot/Point.h
40	include/libopenshot/Profiles.h	42	include/libopenshot/Profiles.h
Lines 45-59 Link Here
45	include/libopenshot/Qt/VideoPlaybackThread.h	47	include/libopenshot/Qt/VideoPlaybackThread.h
46	include/libopenshot/Qt/VideoRenderWidget.h	48	include/libopenshot/Qt/VideoRenderWidget.h
47	include/libopenshot/Qt/VideoRenderer.h	49	include/libopenshot/Qt/VideoRenderer.h
		50	include/libopenshot/QtHtmlReader.h
48	include/libopenshot/QtImageReader.h	51	include/libopenshot/QtImageReader.h
49	include/libopenshot/QtPlayer.h	52	include/libopenshot/QtPlayer.h
		53	include/libopenshot/QtTextReader.h
50	include/libopenshot/ReaderBase.h	54	include/libopenshot/ReaderBase.h
51	include/libopenshot/RendererBase.h	55	include/libopenshot/RendererBase.h
52	include/libopenshot/Settings.h	56	include/libopenshot/Settings.h
53	include/libopenshot/Tests.h
54	include/libopenshot/TextReader.h	57	include/libopenshot/TextReader.h
55	include/libopenshot/Timeline.h	58	include/libopenshot/Timeline.h
56	include/libopenshot/Version.h
57	include/libopenshot/WriterBase.h	59	include/libopenshot/WriterBase.h
58	include/libopenshot/ZmqLogger.h	60	include/libopenshot/ZmqLogger.h
59	include/libopenshot/effects/Bars.h	61	include/libopenshot/effects/Bars.h