Attachment 212176 Details for Bug 244622 – patch for multimedia/libopenshot

[patch] patch for multimedia/libopenshot

patch-py37-libopenshot-0.2.5.4.diff (text/plain), 5.10 KB, created by Tatsuki Makino on 2020-03-06 05:39:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2020-03-06 05:39:36 UTC

Size: 5.10 KB

patch

obsolete

>Index: multimedia/libopenshot/Makefile
>===================================================================
>--- multimedia/libopenshot/Makefile	(revision 526335)
>+++ multimedia/libopenshot/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> 
> PORTNAME=	libopenshot
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.2.4-29
>-DISTVERSIONSUFFIX=	-g9bb5d93
>+DISTVERSION=	0.2.5-4
>+DISTVERSIONSUFFIX=	-gf1e5c9c
> CATEGORIES=	multimedia
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -28,11 +28,12 @@
> 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
>+CMAKE_OFF=	ENABLE_COVERAGE\
>+		ENABLE_DOCS\
>+		ENABLE_TESTS
> CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON
> OPTIONS_DEFAULT=	FFMPEG
> OPTIONS_RADIO=	IMAGEMAGICK
>@@ -46,6 +47,7 @@
> 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)
>Index: multimedia/libopenshot/distinfo
>===================================================================
>--- multimedia/libopenshot/distinfo	(revision 526335)
>+++ multimedia/libopenshot/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1581390000
>-SHA256 (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 5858d87556858c54de75144a40eee0f7e5e52d66d8968b7f15e36d6c1dc3242d
>-SIZE (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 10296027
>+TIMESTAMP = 1583463600
>+SHA256 (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 15c17c3d8af02db5b94e18d295766d20ad59e24d041a25082a45e5d741731a98
>+SIZE (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 10295823
>Index: multimedia/libopenshot/files/patch-src_CMakeLists.txt
>===================================================================
>--- multimedia/libopenshot/files/patch-src_CMakeLists.txt	(revision 526335)
>+++ multimedia/libopenshot/files/patch-src_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- src/CMakeLists.txt.orig	2020-02-10 17:52:00 UTC
>+--- src/CMakeLists.txt.orig	2020-03-03 09:00:23 UTC
> +++ src/CMakeLists.txt
>-@@ -364,7 +364,13 @@ if (TARGET RESVG::resvg)
>+@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg)
>    set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1")
>  endif()
>  
>Index: multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
>===================================================================
>--- multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp	(revision 526335)
>+++ multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp	(working copy)
>@@ -1,9 +1,9 @@
>---- src/FFmpegWriter.cpp.orig	2019-12-19 13:04:31 UTC
>+--- 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 IS_FFMPEG_3_2
>+ #if HAVE_HW_ACCEL
> -#if defined(__linux__)
> +#if defined(__unix__)
>  		if (strstr(codec.c_str(), "_vaapi") != NULL) {
>@@ -14,23 +14,14 @@
>  			hw_en_supported = 0;
>  		}
> -	#else  // is FFmpeg 3 but not linux
>-+#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 //IS_FFMPEG_3_2
>-@@ -956,7 +956,7 @@ void FFmpegWriter::flush_encoders() {
>- 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
>+ #endif // HAVE_HW_ACCEL
>+@@ -1367,7 +1367,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) {
>@@ -39,7 +30,7 @@
>  				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
>+@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
>  				adapter_ptr = NULL;
>  #elif defined(__APPLE__)
>  				adapter_ptr = NULL;
>Index: multimedia/libopenshot/pkg-plist
>===================================================================
>--- multimedia/libopenshot/pkg-plist	(revision 526335)
>+++ multimedia/libopenshot/pkg-plist	(working copy)
>@@ -73,7 +73,7 @@
> include/libopenshot/effects/Shift.h
> include/libopenshot/effects/Wave.h
> lib/libopenshot.so
>-lib/libopenshot.so.0.2.4
>-lib/libopenshot.so.18
>+lib/libopenshot.so.0.2.5
>+lib/libopenshot.so.19
> %%PYTHON_SITELIBDIR%%/_openshot.so
> %%PYTHON_SITELIBDIR%%/openshot.py

Flags:

tatsuki_makino: maintainer-approval+

Actions: View | Diff

Attachments on bug 244622: 212176