Attachment 211577 Details for Bug 244063 – patch for multimedia/libopenshot

[patch] patch for multimedia/libopenshot

patch-py37-libopenshot-0.2.4.diff (text/plain), 5.35 KB, created by Tatsuki Makino on 2020-02-12 02:26:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2020-02-12 02:26:21 UTC

Size: 5.35 KB

patch

obsolete

>Index: multimedia/libopenshot/Makefile
>===================================================================
>--- multimedia/libopenshot/Makefile	(revision 522975)
>+++ multimedia/libopenshot/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> 
> PORTNAME=	libopenshot
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.2.3-595
>-PORTREVISION=	1
>-DISTVERSIONSUFFIX=	-ga1158ee
>+DISTVERSION=	0.2.4
>+DISTVERSIONSUFFIX=	-29-g9bb5d93
> CATEGORIES=	multimedia
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	tatsuki_makino@hotmail.com
> COMMENT=	OpenShot Video Library
>@@ -24,7 +24,7 @@
> USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	OpenShot
>-USE_PYTHON=	noflavors
>+USE_PYTHON=	flavors
> USE_QT=		core gui network multimedia widgets qmake_build buildtools_build
> 
> CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
>@@ -32,6 +32,7 @@
> 		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
>@@ -48,7 +49,7 @@
> LIBAV_LIB_DEPENDS=	libavformat.so:multimedia/libav
> 
> .if !exists(/usr/lib/libomp.so)
>-LIB_DEPENDS+=	libomp.so:devel/openmp
>+IGNORE=		openmp of base system is required
> .endif
> 
> .include <bsd.port.mk>
>Index: multimedia/libopenshot/distinfo
>===================================================================
>--- multimedia/libopenshot/distinfo	(revision 522975)
>+++ multimedia/libopenshot/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1577502000
>-SHA256 (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = b924dea93cfe4cf067ea1beba76ad1c57a385531b92d221de5e4da35111213e7
>-SIZE (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = 10290486
>+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
>Index: multimedia/libopenshot/files/patch-src_CMakeLists.txt
>===================================================================
>--- multimedia/libopenshot/files/patch-src_CMakeLists.txt	(revision 522975)
>+++ multimedia/libopenshot/files/patch-src_CMakeLists.txt	(working copy)
>@@ -1,34 +1,16 @@
>---- src/CMakeLists.txt.orig	2019-12-19 13:04:31 UTC
>+--- src/CMakeLists.txt.orig	2020-02-10 17:52:00 UTC
> +++ src/CMakeLists.txt
>-@@ -358,6 +358,11 @@ if (TARGET cppzmq)
>+@@ -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
>-@@ -396,9 +401,11 @@ target_compile_definitions(openshot-example PRIVATE
>- 
>- # 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)
>+ 	${LIBOPENSHOT_AUDIO_LIBRARIES}
>Index: multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
>===================================================================
>--- multimedia/libopenshot/files/patch-src_FFmpegReader.cpp	(revision 522975)
>+++ multimedia/libopenshot/files/patch-src_FFmpegReader.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/FFmpegReader.cpp.orig	2019-12-19 13:04:31 UTC
>+--- src/FFmpegReader.cpp.orig	2020-02-10 17:52:00 UTC
> +++ src/FFmpegReader.cpp
> @@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
>  
>@@ -9,7 +9,7 @@
>  			// Linux pix formats
>  			case AV_PIX_FMT_VAAPI:
>  				hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI;
>-@@ -315,7 +315,7 @@ void FFmpegReader::Open() {
>+@@ -318,7 +318,7 @@ void FFmpegReader::Open() {
>  					pCodecCtx->get_format = get_hw_dec_format;
>  
>  					if (adapter_num < 3 && adapter_num >=0) {
>@@ -18,7 +18,7 @@
>  						snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128);
>  						adapter_ptr = adapter;
>  						i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER;
>-@@ -378,11 +378,13 @@ void FFmpegReader::Open() {
>+@@ -381,11 +381,13 @@ void FFmpegReader::Open() {
>  					}
>  
>  					// Check if it is there and writable
>Index: multimedia/libopenshot/pkg-plist
>===================================================================
>--- multimedia/libopenshot/pkg-plist	(revision 522975)
>+++ 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.3
>-lib/libopenshot.so.17
>+lib/libopenshot.so.0.2.4
>+lib/libopenshot.so.18
> %%PYTHON_SITELIBDIR%%/_openshot.so
> %%PYTHON_SITELIBDIR%%/openshot.py

Flags:

tatsuki_makino: maintainer-approval+

Actions: View | Diff

Attachments on bug 244063: 211577 | 211580