Attachment #227546 for bug #258161

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




PORTNAME=	libopenshot
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.6
DISTVERSIONSUFFIX=	-gd9ea98eb
PORTREVISION=	1
CATEGORIES=	multimedia
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


OPTIONS_DEFAULT=	IMAGEMAGICK
OPTIONS_SUB=	yes
IMAGEMAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
IMAGEMAGICK_CMAKE_BOOL=	ENABLE_MAGICK
IMAGEMAGICK_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
			libprotobuf.so:devel/protobuf
OPENCV_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
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 = 1623639600	1	TIMESTAMP = 1629968400
2	SHA256 (OpenShot-libopenshot-v0.2.5-726-gd9ea98eb_GH0.tar.gz) = df4edd5a3e5380ca84fb6b78e696ea042b483291ae31e80a3eed0af4218fdb09	2	SHA256 (OpenShot-libopenshot-v0.2.6_GH0.tar.gz) = 3e6f60c86748ea814a9c0c48e5a59c5b04a5876a43b763258d0dd3f6ae84fde8
3	SIZE (OpenShot-libopenshot-v0.2.5-726-gd9ea98eb_GH0.tar.gz) = 22459810	3	SIZE (OpenShot-libopenshot-v0.2.6_GH0.tar.gz) = 22472140

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-2 / +2 lines)
1	--- src/CMakeLists.txt.orig 2021-06-07 02:42:27 UTC	1	--- src/CMakeLists.txt.orig 2021-08-19 20:40:39 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -469,6 +469,15 @@ See https://github.com/opencv/opencv/issues/19260]])	3	@@ -494,6 +494,15 @@ See https://github.com/opencv/opencv/issues/19260]])
4	endif() # ENABLE_OPENCV	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




--- src/FFmpegReader.cpp.orig	2021-08-19 20:40:39 UTC
+++ src/FFmpegReader.cpp
@@ -139,7 +139,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;
@@ -295,7 +295,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;
@@ -358,11 +358,13 @@ void FFmpegReader::Open() {
 					}
 
 					// Check if it is there and writable

Lines 1-4 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-2 / +2 lines)
1	--- src/FFmpegWriter.cpp.orig 2021-06-07 02:42:27 UTC	1	--- src/FFmpegWriter.cpp.orig 2021-08-19 20:40:39 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -169,7 +169,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;
Lines 35-41 Link Here
35	}	35	}
36	#endif // FFmpeg 4.0+	36	#endif // FFmpeg 4.0+
37	} else {	37	} else {
38	@@ -1413,21 +1416,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	38	@@ -1400,21 +1403,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) {




include/libopenshot/Json.h
include/libopenshot/KeyFrame.h
include/libopenshot/MagickUtilities.h
include/libopenshot/OpenCVUtilities.h
include/libopenshot/OpenMPUtilities.h
include/libopenshot/OpenShot.h
include/libopenshot/OpenShotVersion.h

include/libopenshot/TextReader.h
include/libopenshot/Timeline.h
include/libopenshot/TimelineBase.h
include/libopenshot/TrackedObjectBBox.h
include/libopenshot/TrackedObjectBase.h
include/libopenshot/WriterBase.h
include/libopenshot/ZmqLogger.h
include/libopenshot/audio_effects/Compressor.h
include/libopenshot/audio_effects/Delay.h
include/libopenshot/audio_effects/Distortion.h
include/libopenshot/audio_effects/Echo.h
include/libopenshot/audio_effects/Expander.h
include/libopenshot/audio_effects/Noise.h
include/libopenshot/audio_effects/ParametricEQ.h
include/libopenshot/audio_effects/Robotization.h
include/libopenshot/audio_effects/STFT.h
include/libopenshot/audio_effects/Whisperization.h
include/libopenshot/effects/Bars.h
include/libopenshot/effects/Blur.h
include/libopenshot/effects/Brightness.h

include/libopenshot/sort_filter/Hungarian.h
include/libopenshot/sort_filter/KalmanTracker.h
lib/libopenshot.so
lib/libopenshot.so.0.2.6
lib/libopenshot.so.20
%%OPENCV%%lib/libopenshot_protobuf.so
%%OPENCV%%lib/libopenshot_protobuf.so.0.2.6
%%OPENCV%%lib/libopenshot_protobuf.so.20
%%PYTHON_SITELIBDIR%%/_openshot.so
%%PYTHON_SITELIBDIR%%/openshot.py
%%NO_OPENCV%%@dir include/libopenshot/protobuf_messages

Return to bug 258161

Lines 1-8 Link Here

(-)multimedia/libopenshot/Makefile (-7 / +4 lines)
1	PORTNAME= libopenshot	1	PORTNAME= libopenshot
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.2.5-726	3	DISTVERSION= 0.2.6
4	DISTVERSIONSUFFIX= -gd9ea98eb
5	PORTREVISION= 1
6	CATEGORIES= multimedia	4	CATEGORIES= multimedia
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		6
Lines 37-47 OPTIONS_DEFINE= IMAGEMAGICK OPENCV Link Here
37	OPTIONS_DEFAULT= IMAGEMAGICK	35	OPTIONS_DEFAULT= IMAGEMAGICK
38	OPTIONS_SUB= yes	36	OPTIONS_SUB= yes
39	IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}	37	IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
		38	IMAGEMAGICK_CMAKE_BOOL= ENABLE_MAGICK
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	OPENCV_BUILD_DEPENDS= opencv>=4.5.2:graphics/opencv	41	libprotobuf.so:devel/protobuf
43	OPENCV_LIB_DEPENDS= libprotobuf.so:devel/protobuf
44	OPENCV_RUN_DEPENDS= opencv>=4.5.2:graphics/opencv
45	OPENCV_CMAKE_ON= -DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4	42	OPENCV_CMAKE_ON= -DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4
46	OPENCV_CMAKE_BOOL= ENABLE_OPENCV	43	OPENCV_CMAKE_BOOL= ENABLE_OPENCV
47	OPENCV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenCV\	44	OPENCV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenCV\

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (-4 / +4 lines)
1	--- src/FFmpegReader.cpp.orig 2021-06-07 02:42:27 UTC	1	--- src/FFmpegReader.cpp.orig 2021-08-19 20:40:39 UTC
2	+++ src/FFmpegReader.cpp	2	+++ src/FFmpegReader.cpp
3	@@ -138,7 +138,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon	3	@@ -139,7 +139,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	@@ -294,7 +294,7 @@ void FFmpegReader::Open() {	12	@@ -295,7 +295,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	@@ -357,11 +357,13 @@ void FFmpegReader::Open() {	21	@@ -358,11 +358,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 38-44 include/libopenshot/ImageWriter.h Link Here

(-)multimedia/libopenshot/pkg-plist (-7 / +17 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/OpenCVUtilities.h
42	include/libopenshot/OpenMPUtilities.h	42	include/libopenshot/OpenMPUtilities.h
43	include/libopenshot/OpenShot.h	43	include/libopenshot/OpenShot.h
44	include/libopenshot/OpenShotVersion.h	44	include/libopenshot/OpenShotVersion.h
Lines 64-73 include/libopenshot/Settings.h Link Here
64	include/libopenshot/TextReader.h	64	include/libopenshot/TextReader.h
65	include/libopenshot/Timeline.h	65	include/libopenshot/Timeline.h
66	include/libopenshot/TimelineBase.h	66	include/libopenshot/TimelineBase.h
67	%%OPENCV%%include/libopenshot/TrackedObjectBBox.h	67	include/libopenshot/TrackedObjectBBox.h
68	%%OPENCV%%include/libopenshot/TrackedObjectBase.h	68	include/libopenshot/TrackedObjectBase.h
69	include/libopenshot/WriterBase.h	69	include/libopenshot/WriterBase.h
70	include/libopenshot/ZmqLogger.h	70	include/libopenshot/ZmqLogger.h
		71	include/libopenshot/audio_effects/Compressor.h
		72	include/libopenshot/audio_effects/Delay.h
		73	include/libopenshot/audio_effects/Distortion.h
		74	include/libopenshot/audio_effects/Echo.h
		75	include/libopenshot/audio_effects/Expander.h
		76	include/libopenshot/audio_effects/Noise.h
		77	include/libopenshot/audio_effects/ParametricEQ.h
		78	include/libopenshot/audio_effects/Robotization.h
		79	include/libopenshot/audio_effects/STFT.h
		80	include/libopenshot/audio_effects/Whisperization.h
71	include/libopenshot/effects/Bars.h	81	include/libopenshot/effects/Bars.h
72	include/libopenshot/effects/Blur.h	82	include/libopenshot/effects/Blur.h
73	include/libopenshot/effects/Brightness.h	83	include/libopenshot/effects/Brightness.h
Lines 92-102 include/libopenshot/effects/Wave.h Link Here
92	include/libopenshot/sort_filter/Hungarian.h	102	include/libopenshot/sort_filter/Hungarian.h
93	include/libopenshot/sort_filter/KalmanTracker.h	103	include/libopenshot/sort_filter/KalmanTracker.h
94	lib/libopenshot.so	104	lib/libopenshot.so
95	lib/libopenshot.so.0.2.5	105	lib/libopenshot.so.0.2.6
96	lib/libopenshot.so.19	106	lib/libopenshot.so.20
97	%%OPENCV%%lib/libopenshot_protobuf.so	107	%%OPENCV%%lib/libopenshot_protobuf.so
98	%%OPENCV%%lib/libopenshot_protobuf.so.0.2.5	108	%%OPENCV%%lib/libopenshot_protobuf.so.0.2.6
99	%%OPENCV%%lib/libopenshot_protobuf.so.19	109	%%OPENCV%%lib/libopenshot_protobuf.so.20
100	%%PYTHON_SITELIBDIR%%/_openshot.so	110	%%PYTHON_SITELIBDIR%%/_openshot.so
101	%%PYTHON_SITELIBDIR%%/openshot.py	111	%%PYTHON_SITELIBDIR%%/openshot.py
102	%%NO_OPENCV%%@dir include/libopenshot/protobuf_messages	112	%%NO_OPENCV%%@dir include/libopenshot/protobuf_messages