Attachment #225850 for bug #256640

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




PORTNAME=	libopenshot
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.5-726
DISTVERSIONSUFFIX=	-gd9ea98eb
CATEGORIES=	multimedia
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	swig:devel/swig \
		unittest-cpp>=0:devel/unittest-cpp \
		${LOCALBASE}/include/zmq.hpp:net/cppzmq
LIB_DEPENDS=	libopenshot-audio.so:audio/libopenshot-audio \
		libjsoncpp.so:devel/jsoncpp \

USE_PYTHON=	flavors
USE_QT=		core gui network multimedia widgets qmake_build buildtools_build

CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP USE_HW_ACCEL\
		CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
		CMAKE_DISABLE_FIND_PACKAGE_Resvg\
		CMAKE_DISABLE_FIND_PACKAGE_Ruby

OPTIONS_SUB=	yes
IMAGEMAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
IMAGEMAGICK_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
#OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
OPENCV_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
OPENCV_BUILD_DEPENDS=	opencv>=4.5.2:graphics/opencv
OPENCV_RUN_DEPENDS=	opencv>=4.5.2:graphics/opencv
OPENCV_CMAKE_ON=	-DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4
OPENCV_CMAKE_BOOL=	ENABLE_OPENCV
OPENCV_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenCV\

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613703600	1	TIMESTAMP = 1623639600
2	SHA256 (OpenShot-libopenshot-v0.2.5-517-gdd2735e_GH0.tar.gz) = 9802d9cf3fbd32d899828a1c0175053953f513300fdc426606a8d10fe510a42c	2	SHA256 (OpenShot-libopenshot-v0.2.5-726-gd9ea98eb_GH0.tar.gz) = df4edd5a3e5380ca84fb6b78e696ea042b483291ae31e80a3eed0af4218fdb09
3	SIZE (OpenShot-libopenshot-v0.2.5-517-gdd2735e_GH0.tar.gz) = 22454598	3	SIZE (OpenShot-libopenshot-v0.2.5-726-gd9ea98eb_GH0.tar.gz) = 22459810




--- src/CMakeLists.txt.orig	2021-06-07 02:42:27 UTC
+++ src/CMakeLists.txt
@@ -469,6 +469,15 @@ See https://github.com/opencv/opencv/issues/19260]])
 endif()  # ENABLE_OPENCV
 add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")
 
+# EXECINFO
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	find_library(EXECINFO_LIBRARY NAMES execinfo)
+	if(NOT EXECINFO_LIBRARY)
+		message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+	endif(NOT EXECINFO_LIBRARY)
+	target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})
+endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+
 ###############  LINK LIBRARY  #################
 # Link remaining dependency libraries




--- src/CVTracker.cpp.orig	2021-02-18 07:59:16 UTC
+++ src/CVTracker.cpp
@@ -46,20 +46,20 @@ CVTracker::CVTracker(std::string processInfoJson, Proc
 
 // Set desirable tracker method
 cv::Ptr<cv::Tracker> CVTracker::selectTracker(std::string trackerType){
-    cv::Ptr<cv::Tracker> t;
+    cv::Ptr<cv::Tracker> t = nullptr;
 
-    if (trackerType == "BOOSTING")
-        t = cv::TrackerBoosting::create();
+//    if (trackerType == "BOOSTING")
+//        t = cv::TrackerBoosting::create();
     if (trackerType == "MIL")
         t = cv::TrackerMIL::create();
     if (trackerType == "KCF")
         t = cv::TrackerKCF::create();
-    if (trackerType == "TLD")
-        t = cv::TrackerTLD::create();
-    if (trackerType == "MEDIANFLOW")
-        t = cv::TrackerMedianFlow::create();
-    if (trackerType == "MOSSE")
-        t = cv::TrackerMOSSE::create();
+//    if (trackerType == "TLD")
+//        t = cv::TrackerTLD::create();
+//    if (trackerType == "MEDIANFLOW")
+//        t = cv::TrackerMedianFlow::create();
+//    if (trackerType == "MOSSE")
+//        t = cv::TrackerMOSSE::create();
     if (trackerType == "CSRT")
         t = cv::TrackerCSRT::create();
 
@@ -163,12 +163,14 @@ bool CVTracker::initTracker(cv::Mat &frame, size_t fra
 // Update the object tracker according to frame
 bool CVTracker::trackFrame(cv::Mat &frame, size_t frameId){
     // Update the tracking result
-    bool ok = tracker->update(frame, bbox);
+    cv::Rect bboxi = bbox;
+    bool ok = tracker->update(frame, bboxi);
 
     // Add frame number and box coords if tracker finds the object
     // Otherwise add only frame number
     if (ok)
     {
+        bbox = bboxi;
         float fw = frame.size().width;
         float fh = frame.size().height;
 




--- src/FFmpegReader.cpp.orig	2021-06-07 02:42:27 UTC
+++ src/FFmpegReader.cpp
@@ -138,7 +138,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;
@@ -294,7 +294,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;
@@ -357,11 +357,13 @@ void FFmpegReader::Open() {
 					}
 
 					// Check if it is there and writable




--- src/FFmpegWriter.cpp.orig	2021-06-07 02:42:27 UTC
+++ src/FFmpegWriter.cpp
@@ -169,7 +169,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
 		AVCodec *new_codec;
 		// Check if the codec selected is a hardware accelerated codec
 #if USE_HW_ACCEL
-#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;
@@ -219,7 +219,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
 		}
 #else  // unknown OS
 		new_codec = avcodec_find_encoder_by_name(codec.c_str());
-#endif //__linux__/_WIN32/__APPLE__
+#endif //__unix__/_WIN32/__APPLE__
 #else // USE_HW_ACCEL
 		new_codec = avcodec_find_encoder_by_name(codec.c_str());
 #endif // USE_HW_ACCEL
@@ -568,6 +568,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) {
@@ -576,6 +577,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
 							av_opt_set_int(c->priv_data, "forced-idr",1,0);
 						}
 						break;

 				}
 #endif  // FFmpeg 4.0+
 		} else {
@@ -1413,21 +1416,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 		adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
 		std::clog << "Encoding Device Nr: " << adapter_num << "\n";
 		if (adapter_num < 3 && adapter_num >=0) {

Return to bug 256640

Lines 1-7 Link Here

(-)multimedia/libopenshot/Makefile (-6 / +7 lines)
1	PORTNAME= libopenshot	1	PORTNAME= libopenshot
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.2.5-517	3	DISTVERSION= 0.2.5-726
4	DISTVERSIONSUFFIX= -gdd2735e	4	DISTVERSIONSUFFIX= -gd9ea98eb
5	CATEGORIES= multimedia	5	CATEGORIES= multimedia
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		7
Lines 12-18 LICENSE= LGPL3+ Link Here
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	BUILD_DEPENDS= swig:devel/swig \	14	BUILD_DEPENDS= swig:devel/swig \
15	unittest-cpp>=0:devel/unittest-cpp \
16	${LOCALBASE}/include/zmq.hpp:net/cppzmq	15	${LOCALBASE}/include/zmq.hpp:net/cppzmq
17	LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \	16	LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \
18	libjsoncpp.so:devel/jsoncpp \	17	libjsoncpp.so:devel/jsoncpp \
Lines 26-32 GH_ACCOUNT= OpenShot Link Here
26	USE_PYTHON= flavors	25	USE_PYTHON= flavors
27	USE_QT= core gui network multimedia widgets qmake_build buildtools_build	26	USE_QT= core gui network multimedia widgets qmake_build buildtools_build
28		27
29	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\	28	CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP USE_HW_ACCEL\
30	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\	29	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
31	CMAKE_DISABLE_FIND_PACKAGE_Resvg\	30	CMAKE_DISABLE_FIND_PACKAGE_Resvg\
32	CMAKE_DISABLE_FIND_PACKAGE_Ruby	31	CMAKE_DISABLE_FIND_PACKAGE_Ruby
Lines 38-45 OPTIONS_DEFAULT= IMAGEMAGICK Link Here
38	OPTIONS_SUB= yes	37	OPTIONS_SUB= yes
39	IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}	38	IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
40	IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick	39	IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
41	OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv \	40	#OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv
42	libprotobuf.so:devel/protobuf	41	OPENCV_LIB_DEPENDS= libprotobuf.so:devel/protobuf
		42	OPENCV_BUILD_DEPENDS= opencv>=4.5.2:graphics/opencv
		43	OPENCV_RUN_DEPENDS= opencv>=4.5.2:graphics/opencv
43	OPENCV_CMAKE_ON= -DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4	44	OPENCV_CMAKE_ON= -DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4
44	OPENCV_CMAKE_BOOL= ENABLE_OPENCV	45	OPENCV_CMAKE_BOOL= ENABLE_OPENCV
45	OPENCV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenCV\	46	OPENCV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenCV\

Lines 1-14 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-8 / +11 lines)
1	--- src/CMakeLists.txt.orig 2021-02-18 07:59:16 UTC	1	--- src/CMakeLists.txt.orig 2021-06-07 02:42:27 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -415,6 +415,12 @@ if(ENABLE_OPENCV)	3	@@ -469,6 +469,15 @@ See https://github.com/opencv/opencv/issues/19260]])
4	endif()	4	endif() # ENABLE_OPENCV
5	add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")	5	add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")
6		6
7	+find_library(EXECINFO_LIBRARY NAMES execinfo)	7	+# EXECINFO
8	+if(NOT EXECINFO_LIBRARY)	8	+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
9	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")	9	+ find_library(EXECINFO_LIBRARY NAMES execinfo)
10	+endif(NOT EXECINFO_LIBRARY)	10	+ if(NOT EXECINFO_LIBRARY)
11	+target_link_libraries(openshot PUBLIC ${EXECINFO_LIBRARY})	11	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")
		12	+ endif(NOT EXECINFO_LIBRARY)
		13	+ target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})
		14	+endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
12	+	15	+
13	############### LINK LIBRARY #################	16	############### LINK LIBRARY #################
14	# Link remaining dependency libraries	17	# Link remaining dependency libraries

Removed Link Here

(-)multimedia/libopenshot/files/patch-src_CVTracker.cpp (-48 lines)
1	--- src/CVTracker.cpp.orig 2021-02-18 07:59:16 UTC
2	+++ src/CVTracker.cpp
3	@@ -46,20 +46,20 @@ CVTracker::CVTracker(std::string processInfoJson, Proc
4
5	// Set desirable tracker method
6	cv::Ptr<cv::Tracker> CVTracker::selectTracker(std::string trackerType){
7	- cv::Ptr<cv::Tracker> t;
8	+ cv::Ptr<cv::Tracker> t = nullptr;
9
10	- if (trackerType == "BOOSTING")
11	- t = cv::TrackerBoosting::create();
12	+// if (trackerType == "BOOSTING")
13	+// t = cv::TrackerBoosting::create();
14	if (trackerType == "MIL")
15	t = cv::TrackerMIL::create();
16	if (trackerType == "KCF")
17	t = cv::TrackerKCF::create();
18	- if (trackerType == "TLD")
19	- t = cv::TrackerTLD::create();
20	- if (trackerType == "MEDIANFLOW")
21	- t = cv::TrackerMedianFlow::create();
22	- if (trackerType == "MOSSE")
23	- t = cv::TrackerMOSSE::create();
24	+// if (trackerType == "TLD")
25	+// t = cv::TrackerTLD::create();
26	+// if (trackerType == "MEDIANFLOW")
27	+// t = cv::TrackerMedianFlow::create();
28	+// if (trackerType == "MOSSE")
29	+// t = cv::TrackerMOSSE::create();
30	if (trackerType == "CSRT")
31	t = cv::TrackerCSRT::create();
32
33	@@ -163,12 +163,14 @@ bool CVTracker::initTracker(cv::Mat &frame, size_t fra
34	// Update the object tracker according to frame
35	bool CVTracker::trackFrame(cv::Mat &frame, size_t frameId){
36	// Update the tracking result
37	- bool ok = tracker->update(frame, bbox);
38	+ cv::Rect bboxi = bbox;
39	+ bool ok = tracker->update(frame, bboxi);
40
41	// Add frame number and box coords if tracker finds the object
42	// Otherwise add only frame number
43	if (ok)
44	{
45	+ bbox = bboxi;
46	float fw = frame.size().width;
47	float fh = frame.size().height;
48

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (-4 / +4 lines)
1	--- src/FFmpegReader.cpp.orig 2021-02-18 07:59:16 UTC	1	--- src/FFmpegReader.cpp.orig 2021-06-07 02:42:27 UTC
2	+++ src/FFmpegReader.cpp	2	+++ src/FFmpegReader.cpp
3	@@ -150,7 +150,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon	3	@@ -138,7 +138,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	@@ -306,7 +306,7 @@ void FFmpegReader::Open() {	12	@@ -294,7 +294,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	@@ -369,11 +369,13 @@ void FFmpegReader::Open() {	21	@@ -357,11 +357,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-24 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-9 / +9 lines)
1	--- src/FFmpegWriter.cpp.orig 2021-02-18 07:59:16 UTC	1	--- src/FFmpegWriter.cpp.orig 2021-06-07 02:42:27 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -181,7 +181,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std	3	@@ -169,7 +169,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 HAVE_HW_ACCEL	6	#if USE_HW_ACCEL
7	-#if defined(__linux__)	7	-#if defined(__linux__)
8	+#if defined(__unix__)	8	+#if defined(__unix__)
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	@@ -231,7 +231,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std	12	@@ -219,7 +219,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
13	}	13	}
14	#else // unknown OS	14	#else // unknown OS
15	new_codec = avcodec_find_encoder_by_name(codec.c_str());	15	new_codec = avcodec_find_encoder_by_name(codec.c_str());
16	-#endif //__linux__/_WIN32/__APPLE__	16	-#endif //__linux__/_WIN32/__APPLE__
17	+#endif //__unix__/_WIN32/__APPLE__	17	+#endif //__unix__/_WIN32/__APPLE__
18	#else // HAVE_HW_ACCEL	18	#else // USE_HW_ACCEL
19	new_codec = avcodec_find_encoder_by_name(codec.c_str());	19	new_codec = avcodec_find_encoder_by_name(codec.c_str());
20	#endif // HAVE_HW_ACCEL	20	#endif // USE_HW_ACCEL
21	@@ -580,6 +580,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s	21	@@ -568,6 +568,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
22	else {	22	else {
23	av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);	23	av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
24	}	24	}
Lines 26-32 Link Here
26	case AV_CODEC_ID_HEVC :	26	case AV_CODEC_ID_HEVC :
27	c->bit_rate = 0;	27	c->bit_rate = 0;
28	if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {	28	if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
29	@@ -588,6 +589,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s	29	@@ -576,6 +577,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
30	av_opt_set_int(c->priv_data, "forced-idr",1,0);	30	av_opt_set_int(c->priv_data, "forced-idr",1,0);
31	}	31	}
32	break;	32	break;
Lines 35-41 Link Here
35	}	35	}
36	#endif // FFmpeg 4.0+	36	#endif // FFmpeg 4.0+
37	} else {	37	} else {
38	@@ -1438,21 +1441,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	38	@@ -1413,21 +1416,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
39	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;	39	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
40	std::clog << "Encoding Device Nr: " << adapter_num << "\n";	40	std::clog << "Encoding Device Nr: " << adapter_num << "\n";
41	if (adapter_num < 3 && adapter_num >=0) {	41	if (adapter_num < 3 && adapter_num >=0) {

Lines 38-43 include/libopenshot/ImageWriter.h Link Here

(-)multimedia/libopenshot/pkg-plist (-1 / +4 lines)
38	include/libopenshot/Json.h	38	include/libopenshot/Json.h
39	include/libopenshot/KeyFrame.h	39	include/libopenshot/KeyFrame.h
40	include/libopenshot/MagickUtilities.h	40	include/libopenshot/MagickUtilities.h
		41	%%OPENCV%%include/libopenshot/OpenCVUtilities.h
41	include/libopenshot/OpenMPUtilities.h	42	include/libopenshot/OpenMPUtilities.h
42	include/libopenshot/OpenShot.h	43	include/libopenshot/OpenShot.h
43	include/libopenshot/OpenShotVersion.h	44	include/libopenshot/OpenShotVersion.h
Lines 63-68 include/libopenshot/Settings.h Link Here
63	include/libopenshot/TextReader.h	64	include/libopenshot/TextReader.h
64	include/libopenshot/Timeline.h	65	include/libopenshot/Timeline.h
65	include/libopenshot/TimelineBase.h	66	include/libopenshot/TimelineBase.h
		67	%%OPENCV%%include/libopenshot/TrackedObjectBBox.h
		68	%%OPENCV%%include/libopenshot/TrackedObjectBase.h
66	include/libopenshot/WriterBase.h	69	include/libopenshot/WriterBase.h
67	include/libopenshot/ZmqLogger.h	70	include/libopenshot/ZmqLogger.h
68	include/libopenshot/effects/Bars.h	71	include/libopenshot/effects/Bars.h
Lines 96-99 lib/libopenshot.so.19 Link Here
96	%%OPENCV%%lib/libopenshot_protobuf.so.19	99	%%OPENCV%%lib/libopenshot_protobuf.so.19
97	%%PYTHON_SITELIBDIR%%/_openshot.so	100	%%PYTHON_SITELIBDIR%%/_openshot.so
98	%%PYTHON_SITELIBDIR%%/openshot.py	101	%%PYTHON_SITELIBDIR%%/openshot.py
99	@dir include/libopenshot/protobuf_messages	102	%%NO_OPENCV%%@dir include/libopenshot/protobuf_messages