Attachment #211577 for bug #244063

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





PORTNAME=	libopenshot
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.4
DISTVERSIONSUFFIX=	-29-g9bb5d93
DISTVERSIONSUFFIX=	-ga1158ee
CATEGORIES=	multimedia
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	tatsuki_makino@hotmail.com
COMMENT=	OpenShot Video Library

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

CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\

		CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
		CMAKE_DISABLE_FIND_PACKAGE_RESVG\
		CMAKE_DISABLE_FIND_PACKAGE_Ruby
CMAKE_OFF=	ENABLE_COVERAGE
CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
OPTIONS_DEFAULT=	FFMPEG
OPTIONS_RADIO=	IMAGEMAGICK

LIBAV_LIB_DEPENDS=	libavformat.so:multimedia/libav

.if !exists(/usr/lib/libomp.so)
IGNORE=		openmp of base system is required
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577502000	1	TIMESTAMP = 1581390000
2	SHA256 (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = b924dea93cfe4cf067ea1beba76ad1c57a385531b92d221de5e4da35111213e7	2	SHA256 (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 5858d87556858c54de75144a40eee0f7e5e52d66d8968b7f15e36d6c1dc3242d
3	SIZE (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = 10290486	3	SIZE (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 10296027




--- src/CMakeLists.txt.orig	2020-02-10 17:52:00 UTC
+++ src/CMakeLists.txt
@@ -364,7 +364,13 @@ if (TARGET RESVG::resvg)
   set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")
 endif()
 
 
+find_library(EXECINFO_LIBRARY NAMES execinfo)
+if(NOT EXECINFO_LIBRARY)
+	message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+endif(NOT EXECINFO_LIBRARY)
 ###############  LINK LIBRARY  #################
+target_link_libraries(openshot PUBLIC ${EXECINFO_LIBRARY})
+
 ###############  LINK LIBRARY  #################
 # Link remaining dependency libraries
 target_link_libraries(openshot PUBLIC
 	${LIBOPENSHOT_AUDIO_LIBRARIES}
 
 # 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
@@ -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)
+target_link_libraries(openshot-player ${EXECINFO_LIBRARY})
 
 ############### TEST BLACKMAGIC CAPTURE APP ################
 IF (BLACKMAGIC_FOUND)

Lines 1-4 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (-3 / +3 lines)
1	--- src/FFmpegReader.cpp.orig 2019-12-19 13:04:31 UTC	1	--- src/FFmpegReader.cpp.orig 2020-02-10 17:52:00 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
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	@@ -315,7 +315,7 @@ void FFmpegReader::Open() {	12	@@ -318,7 +318,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	@@ -378,11 +378,13 @@ void FFmpegReader::Open() {	21	@@ -381,11 +381,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 73-79 Link Here

(-)multimedia/libopenshot/pkg-plist (-2 / +2 lines)
73	include/libopenshot/effects/Shift.h	73	include/libopenshot/effects/Shift.h
74	include/libopenshot/effects/Wave.h	74	include/libopenshot/effects/Wave.h
75	lib/libopenshot.so	75	lib/libopenshot.so
76	lib/libopenshot.so.0.2.3	76	lib/libopenshot.so.0.2.4
77	lib/libopenshot.so.17	77	lib/libopenshot.so.18
78	%%PYTHON_SITELIBDIR%%/_openshot.so	78	%%PYTHON_SITELIBDIR%%/_openshot.so
79	%%PYTHON_SITELIBDIR%%/openshot.py	79	%%PYTHON_SITELIBDIR%%/openshot.py

Return to bug 244063

Lines 2-11 Link Here

(-)multimedia/libopenshot/Makefile (-5 / +6 lines)
2		2
3	PORTNAME= libopenshot	3	PORTNAME= libopenshot
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.2.3-595	5	DISTVERSION= 0.2.4
6	PORTREVISION= 1	6	DISTVERSIONSUFFIX= -29-g9bb5d93
7	DISTVERSIONSUFFIX= -ga1158ee
8	CATEGORIES= multimedia	7	CATEGORIES= multimedia
		8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		9
10	MAINTAINER= tatsuki_makino@hotmail.com	10	MAINTAINER= tatsuki_makino@hotmail.com
11	COMMENT= OpenShot Video Library	11	COMMENT= OpenShot Video Library
Lines 24-30 Link Here
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	USE_GITHUB= yes	25	USE_GITHUB= yes
26	GH_ACCOUNT= OpenShot	26	GH_ACCOUNT= OpenShot
27	USE_PYTHON= noflavors	27	USE_PYTHON= flavors
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 DISABLE_BUNDLED_JSONCPP\	30	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
Lines 32-37 Link Here
32	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\	32	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
33	CMAKE_DISABLE_FIND_PACKAGE_RESVG\	33	CMAKE_DISABLE_FIND_PACKAGE_RESVG\
34	CMAKE_DISABLE_FIND_PACKAGE_Ruby	34	CMAKE_DISABLE_FIND_PACKAGE_Ruby
		35	CMAKE_OFF= ENABLE_COVERAGE
35	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON	36	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
36	OPTIONS_DEFAULT= FFMPEG	37	OPTIONS_DEFAULT= FFMPEG
37	OPTIONS_RADIO= IMAGEMAGICK	38	OPTIONS_RADIO= IMAGEMAGICK
Lines 48-54 Link Here
48	LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav	49	LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav
49		50
50	.if !exists(/usr/lib/libomp.so)	51	.if !exists(/usr/lib/libomp.so)
51	LIB_DEPENDS+= libomp.so:devel/openmp	52	IGNORE= openmp of base system is required
52	.endif	53	.endif
53		54
54	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-34 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-24 / +6 lines)
1	--- src/CMakeLists.txt.orig 2019-12-19 13:04:31 UTC	1	--- src/CMakeLists.txt.orig 2020-02-10 17:52:00 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -358,6 +358,11 @@ if (TARGET cppzmq)	3	@@ -364,7 +364,13 @@ if (TARGET RESVG::resvg)
		4	set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")
4	endif()	5	endif()
5		6
6
7	+find_library(EXECINFO_LIBRARY NAMES execinfo)	7	+find_library(EXECINFO_LIBRARY NAMES execinfo)
8	+if(NOT EXECINFO_LIBRARY)	8	+if(NOT EXECINFO_LIBRARY)
9	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")	9	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")
10	+endif(NOT EXECINFO_LIBRARY)	10	+endif(NOT EXECINFO_LIBRARY)
		11	############### LINK LIBRARY #################
		12	+target_link_libraries(openshot PUBLIC ${EXECINFO_LIBRARY})
11	+	13	+
12	############### LINK LIBRARY #################
13	# Link remaining dependency libraries	14	# Link remaining dependency libraries
14	target_link_libraries(openshot PUBLIC	15	target_link_libraries(openshot PUBLIC
15	@@ -396,9 +401,11 @@ target_compile_definitions(openshot-example PRIVATE	16	${LIBOPENSHOT_AUDIO_LIBRARIES}
16
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	@@ -406,6 +413,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)