Attachment 249110 Details for Bug 277648 – patch for multimedia/libopenshot

[patch] patch for multimedia/libopenshot

0001-multimedia-libopenshot-Fix-OPTIONS-and-audio-output-.patch (text/plain), 5.14 KB, created by Tatsuki Makino on 2024-03-12 05:44:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2024-03-12 05:44:32 UTC

Size: 5.14 KB

patch

obsolete

>From 193b3ec82a7c385e9a0307baea78308c3589d588 Mon Sep 17 00:00:00 2001
>From: Tatsuki Makino <tatsuki_makino@hotmail.com>
>Date: Mon, 11 Mar 2024 12:00:00 +0000
>Subject: multimedia/libopenshot: fix OPTIONS and audio output device selection
>
>---
> multimedia/libopenshot/Makefile               | 15 ++++++++-----
> .../files/patch-src_CMakeLists.txt            | 22 ++++++++++++-------
> .../patch-src_Qt_AudioPlaybackThread.cpp      | 22 +++++++++++++++++++
> 3 files changed, 45 insertions(+), 14 deletions(-)
> create mode 100644 multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp
>
>diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
>index 0319826dc5d..c6231ad7b80 100644
>--- a/multimedia/libopenshot/Makefile
>+++ b/multimedia/libopenshot/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	libopenshot
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.3.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	multimedia
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -23,6 +23,7 @@ LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
> 		libzmq.so:net/libzmq4
> 
> USES=		cmake pkgconfig python:build qt:5
>+USE_CXXSTD=	c++17
> USE_GITHUB=	yes
> GH_ACCOUNT=	OpenShot
> USE_LDCONFIG=	yes
>@@ -33,17 +34,19 @@ CMAKE_ON=	USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
> 		CMAKE_DISABLE_FIND_PACKAGE_Catch2
> CMAKE_OFF=	ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\
> 		APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS
>-USE_CXXSTD=	c++17
>+DEBUG_FLAGS?=	-g
>+DEBUG_FLAGS+=	-D_DEBUG -DJUCE_FORCE_DEBUG=1
> 
>-OPTIONS_DEFINE=	DOCS IMAGEMAGICK OPENCV RESVG RUBY
>+OPTIONS_DEFINE=	DOCS DOXYGEN IMAGEMAGICK OPENCV RESVG RUBY
> OPTIONS_DEFAULT=	IMAGEMAGICK OPENCV
> OPTIONS_SUB=	yes
> RESVG_DESC?=	SVG vector graphics support via resvg
>-DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
>-DOCS_CMAKE_BOOL=	ENABLE_LIB_DOCS
>-DOCS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
> DOCS_CMAKE_ON=	-DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q}
> DOCS_PORTDOCS=	*
>+DOXYGEN_IMPLIES=	DOCS
>+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
>+DOXYGEN_CMAKE_BOOL=	ENABLE_LIB_DOCS
>+DOXYGEN_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
> IMAGEMAGICK_USES=	magick
> IMAGEMAGICK_CMAKE_BOOL=	ENABLE_MAGICK
> IMAGEMAGICK_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
>diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt
>index c94d5a8ab37..6a36a3c95e2 100644
>--- a/multimedia/libopenshot/files/patch-src_CMakeLists.txt
>+++ b/multimedia/libopenshot/files/patch-src_CMakeLists.txt
>@@ -1,20 +1,26 @@
>---- src/CMakeLists.txt.orig	2023-03-27 18:48:43 UTC
>+--- src/CMakeLists.txt.orig	2023-04-19 22:01:02 UTC
> +++ src/CMakeLists.txt
>-@@ -516,6 +516,18 @@ See https://github.com/opencv/opencv/issues/19260]])
>+@@ -516,6 +516,24 @@ See https://github.com/opencv/opencv/issues/19260]])
>  endif()  # ENABLE_OPENCV
>  add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")
>  
> +# EXECINFO
> +include(CheckFunctionExists)
>-+check_function_exists("backtrace" FUNCTION_BACKTRACE_FOUND)
>++include(CheckLibraryExists)
>++check_function_exists(backtrace FUNCTION_BACKTRACE_FOUND)
> +if(NOT FUNCTION_BACKTRACE_FOUND)
> +	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})
>++	if(EXECINFO_LIBRARY)
>++		unset(FUNCTION_BACKTRACE_FOUND CACHE)
>++		check_library_exists(${EXECINFO_LIBRARY} backtrace "" FUNCTION_BACKTRACE_FOUND)
>++	endif(EXECINFO_LIBRARY)
>++endif(NOT FUNCTION_BACKTRACE_FOUND)
>++if(NOT FUNCTION_BACKTRACE_FOUND)
>++	message(FATAL_ERROR "backtrace - ${FUNCTION_BACKTRACE_FOUND}")
> +endif(NOT FUNCTION_BACKTRACE_FOUND)
>-+unset(FUNCTION_BACKTRACE_FOUND)
>++if(EXECINFO_LIBRARY)
>++	target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})
>++endif(EXECINFO_LIBRARY)
> +
>  ###############  LINK LIBRARY  #################
>  # Link remaining dependency libraries
>diff --git a/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp b/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp
>new file mode 100644
>index 00000000000..11530ddc36d
>--- /dev/null
>+++ b/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp
>@@ -0,0 +1,22 @@
>+--- src/Qt/AudioPlaybackThread.cpp.orig	2023-04-19 22:01:02 UTC
>++++ src/Qt/AudioPlaybackThread.cpp
>+@@ -102,8 +102,17 @@ namespace openshot
>+ 
>+ 				// Settings for audio device playback
>+ 				AudioDeviceManager::AudioDeviceSetup deviceSetup = AudioDeviceManager::AudioDeviceSetup();
>+-				deviceSetup.inputChannels = 0;
>+-				deviceSetup.outputChannels = channels;
>++				deviceSetup.outputDeviceName = attempt_device.name;
>++				deviceSetup.inputDeviceName = "";
>++				//deviceSetup.inputChannels = 0;
>++				deviceSetup.inputChannels.clear();
>++				deviceSetup.useDefaultInputChannels = false;
>++				//deviceSetup.outputChannels = channels;
>++				deviceSetup.outputChannels.clear();
>++				for (int i = 0; i < channels; ++i) {
>++					deviceSetup.outputChannels.setBit(i);
>++				}
>++				deviceSetup.useDefaultOutputChannels = false;
>+ 
>+ 				// Loop through common sample rates, starting with the user's requested rate
>+ 				// Not all sample rates are supported by audio devices, for example, many VMs
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 277648: 249110