Attachment #212176 for bug #244622

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





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


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_RESVG\
		CMAKE_DISABLE_FIND_PACKAGE_Ruby
CMAKE_OFF=	ENABLE_COVERAGE\
		ENABLE_DOCS\
		ENABLE_TESTS
CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
OPTIONS_DEFAULT=	FFMPEG
OPTIONS_RADIO=	IMAGEMAGICK

IMAGEMAGICK7_DESC=	with ImageMagick7
IMAGEMAGICK7_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
IMAGEMAGICK7_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO
LIBAV_DESC=		${FFMPEG_DESC:S/FFmpeg/Libav/}
LIBAV_LIB_DEPENDS=	libavformat.so:multimedia/libav

.if !exists(/usr/lib/libomp.so)

Lines 1-3 Link Here

(-)multimedia/libopenshot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1581390000	1	TIMESTAMP = 1583463600
2	SHA256 (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 5858d87556858c54de75144a40eee0f7e5e52d66d8968b7f15e36d6c1dc3242d	2	SHA256 (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 15c17c3d8af02db5b94e18d295766d20ad59e24d041a25082a45e5d741731a98
3	SIZE (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 10296027	3	SIZE (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 10295823

Lines 1-6 Link Here

(-)multimedia/libopenshot/files/patch-src_CMakeLists.txt (-2 / +2 lines)
1	--- src/CMakeLists.txt.orig 2020-02-10 17:52:00 UTC	1	--- src/CMakeLists.txt.orig 2020-03-03 09:00:23 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -364,7 +364,13 @@ if (TARGET RESVG::resvg)	3	@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg)
4	set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")	4	set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")
5	endif()	5	endif()
6		6




--- src/FFmpegWriter.cpp.orig	2020-03-03 09:00:23 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 HAVE_HW_ACCEL
-#if defined(__linux__)
+#if defined(__unix__)
 		if (strstr(codec.c_str(), "_vaapi") != NULL) {

 			hw_en_supported = 0;
 		}
-	#else  // is FFmpeg 3 but not linux
+#else  // is FFmpeg 3 but not unix
 		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 // HAVE_HW_ACCEL
@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 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);
@@ -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;
@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
 				adapter_ptr = NULL;
 #elif defined(__APPLE__)
 				adapter_ptr = NULL;

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.4	76	lib/libopenshot.so.0.2.5
77	lib/libopenshot.so.18	77	lib/libopenshot.so.19
78	%%PYTHON_SITELIBDIR%%/_openshot.so	78	%%PYTHON_SITELIBDIR%%/_openshot.so
79	%%PYTHON_SITELIBDIR%%/openshot.py	79	%%PYTHON_SITELIBDIR%%/openshot.py

Return to bug 244622

Lines 2-9 Link Here

(-)multimedia/libopenshot/Makefile (-4 / +6 lines)
2		2
3	PORTNAME= libopenshot	3	PORTNAME= libopenshot
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.2.4-29	5	DISTVERSION= 0.2.5-4
6	DISTVERSIONSUFFIX= -g9bb5d93	6	DISTVERSIONSUFFIX= -gf1e5c9c
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		9
Lines 28-38 Link Here
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\
31	DISABLE_TESTS\
32	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\	31	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
33	CMAKE_DISABLE_FIND_PACKAGE_RESVG\	32	CMAKE_DISABLE_FIND_PACKAGE_RESVG\
34	CMAKE_DISABLE_FIND_PACKAGE_Ruby	33	CMAKE_DISABLE_FIND_PACKAGE_Ruby
35	CMAKE_OFF= ENABLE_COVERAGE	34	CMAKE_OFF= ENABLE_COVERAGE\
		35	ENABLE_DOCS\
		36	ENABLE_TESTS
36	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON	37	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
37	OPTIONS_DEFAULT= FFMPEG	38	OPTIONS_DEFAULT= FFMPEG
38	OPTIONS_RADIO= IMAGEMAGICK	39	OPTIONS_RADIO= IMAGEMAGICK
Lines 46-51 Link Here
46	IMAGEMAGICK7_DESC= with ImageMagick7	47	IMAGEMAGICK7_DESC= with ImageMagick7
47	IMAGEMAGICK7_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7	48	IMAGEMAGICK7_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7
48	IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO	49	IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO
		50	LIBAV_DESC= ${FFMPEG_DESC:S/FFmpeg/Libav/}
49	LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav	51	LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav
50		52
51	.if !exists(/usr/lib/libomp.so)	53	.if !exists(/usr/lib/libomp.so)

Lines 1-9 Link Here

(-)multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (-15 / +6 lines)
1	--- src/FFmpegWriter.cpp.orig 2019-12-19 13:04:31 UTC	1	--- src/FFmpegWriter.cpp.orig 2020-03-03 09:00:23 UTC
2	+++ src/FFmpegWriter.cpp	2	+++ src/FFmpegWriter.cpp
3	@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std	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 HAVE_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) {
Lines 14-36 Link Here
14	hw_en_supported = 0;	14	hw_en_supported = 0;
15	}	15	}
16	- #else // is FFmpeg 3 but not linux	16	- #else // is FFmpeg 3 but not linux
17	+#else // is FFmpeg 3 but not linux	17	+#else // is FFmpeg 3 but not unix
18	new_codec = avcodec_find_encoder_by_name(codec.c_str());	18	new_codec = avcodec_find_encoder_by_name(codec.c_str());
19	- #endif //__linux__	19	- #endif //__linux__
20	+#endif //__unix__	20	+#endif //__unix__
21	#else // not ffmpeg 3	21	#else // not ffmpeg 3
22	new_codec = avcodec_find_encoder_by_name(codec.c_str());	22	new_codec = avcodec_find_encoder_by_name(codec.c_str());
23	#endif //IS_FFMPEG_3_2	23	#endif // HAVE_HW_ACCEL
24	@@ -956,7 +956,7 @@ void FFmpegWriter::flush_encoders() {	24	@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
25	void FFmpegWriter::close_video(AVFormatContext oc, AVStream st)
26	{
27	#if IS_FFMPEG_3_2
28	- // #if defined(__linux__)
29	+ // #if defined(__unix__)
30	if (hw_en_on && hw_en_supported) {
31	if (hw_device_ctx) {
32	av_buffer_unref(&hw_device_ctx);
33	@@ -1352,7 +1352,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
34	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;	25	adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
35	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);	26	fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num);
36	if (adapter_num < 3 && adapter_num >=0) {	27	if (adapter_num < 3 && adapter_num >=0) {
Lines 39-45 Link Here
39	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);	30	snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
40	// Maybe 127 is better because the first card would be 1?!	31	// Maybe 127 is better because the first card would be 1?!
41	adapter_ptr = adapter;	32	adapter_ptr = adapter;
42	@@ -1360,17 +1360,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS	33	@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
43	adapter_ptr = NULL;	34	adapter_ptr = NULL;
44	#elif defined(__APPLE__)	35	#elif defined(__APPLE__)
45	adapter_ptr = NULL;	36	adapter_ptr = NULL;