Attachment #210270 for bug #242930

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





PORTNAME=	libopenshot
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.3-595
DISTVERSIONSUFFIX=	-ga1158ee
CATEGORIES=	multimedia

MAINTAINER=	tatsuki_makino@hotmail.com

		${LOCALBASE}/include/zmq.hpp:net/cppzmq
LIB_DEPENDS=	libopenshot-audio.so:audio/libopenshot-audio \
		libjsoncpp.so:devel/jsoncpp \
		libomp.so:devel/openmp \
		libzmq.so:net/libzmq4

USES=		cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5

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
CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
OPTIONS_DEFAULT=	FFMPEG
OPTIONS_RADIO=	IMAGEMAGICK
OPTIONS_RADIO_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
OPTIONS_SINGLE=	LIBAVCODEC
OPTIONS_SINGLE_LIBAVCODEC=	FFMPEG LIBAV
FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
IMAGEMAGICK6_DESC=	with ImageMagick6
IMAGEMAGICK6_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
IMAGEMAGICK6_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO
IMAGEMAGICK7_DESC=	with ImageMagick7
IMAGEMAGICK7_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
IMAGEMAGICK7_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO
LIBAV_LIB_DEPENDS=	libavformat.so:multimedia/libav

.if !exists(/usr/lib/libomp.so)
LIB_DEPENDS+=	libomp.so:devel/openmp
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1573527600	1	TIMESTAMP = 1577502000
2	SHA256 (OpenShot-libopenshot-v0.2.3-490-gc271352_GH0.tar.gz) = f996b0f36311306e51eabebdc1dc11ee82986c3a98a0d631b9cfbba64b908965	2	SHA256 (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = b924dea93cfe4cf067ea1beba76ad1c57a385531b92d221de5e4da35111213e7
3	SIZE (OpenShot-libopenshot-v0.2.3-490-gc271352_GH0.tar.gz) = 10290775	3	SIZE (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = 10290486




--- src/CMakeLists.txt.orig	2019-12-19 13:04:31 UTC
+++ src/CMakeLists.txt
@@ -358,6 +358,11 @@ if (TARGET cppzmq)
 endif()
 
 

+endif(NOT EXECINFO_LIBRARY)
+
 ###############  LINK LIBRARY  #################
 # Link remaining dependency libraries
 target_link_libraries(openshot PUBLIC
@@ -396,9 +401,11 @@ target_compile_definitions(openshot-example PRIVATE
 
 # Link test executable to the new library
 target_link_libraries(openshot-example openshot)

 
 ############### PLAYER EXECUTABLE ################
 # Create test executable
@@ -406,6 +413,7 @@ add_executable(openshot-player Qt/demo/main.cpp)
 
 # Link test executable to the new library
 target_link_libraries(openshot-player openshot)

Lines 1-4 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (-1 / +1 lines)
1	--- src/FFmpegReader.cpp.orig 2019-11-04 12:14:04 UTC	1	--- src/FFmpegReader.cpp.orig 2019-12-19 13:04:31 UTC
2	+++ src/FFmpegReader.cpp	2	+++ src/FFmpegReader.cpp
3	@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon	3	@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
4		4




--- src/FFmpegWriter.cpp.orig	2019-12-19 13:04:31 UTC
+++ src/FFmpegWriter.cpp
@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
 		AVCodec *new_codec;
 		// Check if the codec selected is a hardware accelerated codec
 #if IS_FFMPEG_3_2

 		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, std
 			hw_en_on = 0;
 			hw_en_supported = 0;
 		}

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




[
{
  type: install
  message: <<EOM
If OpenMP causes a problem, define the environment variable OMP_THREAD_LIMIT, set it to 1, and then run the program.
It loses performance, but increases stability.

An example
env OMP_THREAD_LIMIT=1 openshot-qt
EOM
}
]

Return to bug 242930

Lines 2-9 Link Here

(-)multimedia/libopenshot/Makefile (-4 / +15 lines)
2		2
3	PORTNAME= libopenshot	3	PORTNAME= libopenshot
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.2.3-490	5	DISTVERSION= 0.2.3-595
6	DISTVERSIONSUFFIX= -gc271352	6	DISTVERSIONSUFFIX= -ga1158ee
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8		8
9	MAINTAINER= tatsuki_makino@hotmail.com	9	MAINTAINER= tatsuki_makino@hotmail.com
Lines 17-23 Link Here
17	${LOCALBASE}/include/zmq.hpp:net/cppzmq	17	${LOCALBASE}/include/zmq.hpp:net/cppzmq
18	LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \	18	LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \
19	libjsoncpp.so:devel/jsoncpp \	19	libjsoncpp.so:devel/jsoncpp \
20	libomp.so:devel/openmp \
21	libzmq.so:net/libzmq4	20	libzmq.so:net/libzmq4
22		21
23	USES= cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5	22	USES= cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5
Lines 30-42 Link Here
30	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\	29	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
31	DISABLE_TESTS\	30	DISABLE_TESTS\
32	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\	31	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
33	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick\
34	CMAKE_DISABLE_FIND_PACKAGE_RESVG\	32	CMAKE_DISABLE_FIND_PACKAGE_RESVG\
35	CMAKE_DISABLE_FIND_PACKAGE_Ruby	33	CMAKE_DISABLE_FIND_PACKAGE_Ruby
		34	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
36	OPTIONS_DEFAULT= FFMPEG	35	OPTIONS_DEFAULT= FFMPEG
		36	OPTIONS_RADIO= IMAGEMAGICK
		37	OPTIONS_RADIO_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7
37	OPTIONS_SINGLE= LIBAVCODEC	38	OPTIONS_SINGLE= LIBAVCODEC
38	OPTIONS_SINGLE_LIBAVCODEC= FFMPEG LIBAV	39	OPTIONS_SINGLE_LIBAVCODEC= FFMPEG LIBAV
39	FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg	40	FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg
		41	IMAGEMAGICK6_DESC= with ImageMagick6
		42	IMAGEMAGICK6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6
		43	IMAGEMAGICK6_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO
		44	IMAGEMAGICK7_DESC= with ImageMagick7
		45	IMAGEMAGICK7_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7
		46	IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO
40	LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav	47	LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav
41		48
		49	.if !exists(/usr/lib/libomp.so)
		50	LIB_DEPENDS+= libomp.so:devel/openmp
		51	.endif
		52
42	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-6 / +6 lines)
1	--- src/CMakeLists.txt.orig 2019-11-04 12:14:04 UTC	1	--- src/CMakeLists.txt.orig 2019-12-19 13:04:31 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -340,6 +340,11 @@ if (TARGET cppzmq)	3	@@ -358,6 +358,11 @@ if (TARGET cppzmq)
4	endif()	4	endif()
5		5
6		6
Lines 10-18 Link Here
10	+endif(NOT EXECINFO_LIBRARY)	10	+endif(NOT EXECINFO_LIBRARY)
11	+	11	+
12	############### LINK LIBRARY #################	12	############### LINK LIBRARY #################
13	SET ( REQUIRED_LIBRARIES	13	# Link remaining dependency libraries
14	${LIBOPENSHOT_AUDIO_LIBRARIES}	14	target_link_libraries(openshot PUBLIC
15	@@ -386,9 +391,11 @@ target_compile_definitions(openshot-example PRIVATE	15	@@ -396,9 +401,11 @@ target_compile_definitions(openshot-example PRIVATE
16		16
17	# Link test executable to the new library	17	# Link test executable to the new library
18	target_link_libraries(openshot-example openshot)	18	target_link_libraries(openshot-example openshot)
Lines 24-30 Link Here
24		24
25	############### PLAYER EXECUTABLE ################	25	############### PLAYER EXECUTABLE ################
26	# Create test executable	26	# Create test executable
27	@@ -396,6 +403,7 @@ add_executable(openshot-player Qt/demo/main.cpp)	27	@@ -406,6 +413,7 @@ add_executable(openshot-player Qt/demo/main.cpp)
28		28
29	# Link test executable to the new library	29	# Link test executable to the new library
30	target_link_libraries(openshot-player openshot)	30	target_link_libraries(openshot-player openshot)

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-5 / +5 lines)
1	--- src/FFmpegWriter.cpp.orig 2019-11-04 12:14:04 UTC	1	--- src/FFmpegWriter.cpp.orig 2019-12-19 13:04:31 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str	3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
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
Lines 9-15 Link Here
9	if (strstr(codec.c_str(), "_vaapi") != NULL) {	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	@@ -220,9 +220,9 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str	12	@@ -220,9 +220,9 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
13	hw_en_on = 0;	13	hw_en_on = 0;
14	hw_en_supported = 0;	14	hw_en_supported = 0;
15	}	15	}
Lines 30-36 Link Here
30	if (hw_en_on && hw_en_supported) {	30	if (hw_en_on && hw_en_supported) {
31	if (hw_device_ctx) {	31	if (hw_device_ctx) {
32	av_buffer_unref(&hw_device_ctx);	32	av_buffer_unref(&hw_device_ctx);
33	@@ -1351,7 +1351,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	33	@@ -1352,7 +1352,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
34	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;	34	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
35	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);	35	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
36	if (adapter_num < 3 && adapter_num >=0) {	36	if (adapter_num < 3 && adapter_num >=0) {
Lines 39-45 Link Here
39	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);	39	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
40	// Maybe 127 is better because the first card would be 1?!	40	// Maybe 127 is better because the first card would be 1?!
41	adapter_ptr = adapter;	41	adapter_ptr = adapter;
42	@@ -1359,17 +1359,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	42	@@ -1360,17 +1360,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
43	adapter_ptr = NULL;	43	adapter_ptr = NULL;
44	#elif defined(__APPLE__)	44	#elif defined(__APPLE__)
45	adapter_ptr = NULL;	45	adapter_ptr = NULL;

Line 0 Link Here

(-)multimedia/libopenshot/pkg-message (+12 lines)
	1	[
	2	{
	3	type: install
	4	message: <<EOM
	5	If OpenMP causes a problem, define the environment variable OMP_THREAD_LIMIT, set it to 1, and then run the program.
	6	It loses performance, but increases stability.
	7
	8	An example
	9	env OMP_THREAD_LIMIT=1 openshot-qt
	10	EOM
	11	}
	12	]