Attachment #249110 for bug #277648

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




PORTNAME=	libopenshot
DISTVERSIONPREFIX=	v
DISTVERSION=	0.3.2
PORTREVISION=	3
CATEGORIES=	multimedia
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


		libzmq.so:net/libzmq4

USES=		cmake pkgconfig python:build qt:5
USE_CXXSTD=	c++17
USE_GITHUB=	yes
GH_ACCOUNT=	OpenShot
USE_LDCONFIG=	yes

		CMAKE_DISABLE_FIND_PACKAGE_Catch2
CMAKE_OFF=	ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\
		APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS
DEBUG_FLAGS?=	-g
DEBUG_FLAGS+=	-D_DEBUG -DJUCE_FORCE_DEBUG=1

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

Lines 1-20 Link Here

(-)b/multimedia/libopenshot/files/patch-src_CMakeLists.txt (-8 / +14 lines)
1	--- src/CMakeLists.txt.orig 2023-03-27 18:48:43 UTC	1	--- src/CMakeLists.txt.orig 2023-04-19 22:01:02 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -516,6 +516,18 @@ See https://github.com/opencv/opencv/issues/19260]])	3	@@ -516,6 +516,24 @@ 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
7	+# EXECINFO	7	+# EXECINFO
8	+include(CheckFunctionExists)	8	+include(CheckFunctionExists)
9	+check_function_exists("backtrace" FUNCTION_BACKTRACE_FOUND)	9	+include(CheckLibraryExists)
		10	+check_function_exists(backtrace FUNCTION_BACKTRACE_FOUND)
10	+if(NOT FUNCTION_BACKTRACE_FOUND)	11	+if(NOT FUNCTION_BACKTRACE_FOUND)
11	+ find_library(EXECINFO_LIBRARY NAMES execinfo)	12	+ find_library(EXECINFO_LIBRARY NAMES execinfo)
12	+ if(NOT EXECINFO_LIBRARY)	13	+ if(EXECINFO_LIBRARY)
13	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")	14	+ unset(FUNCTION_BACKTRACE_FOUND CACHE)
14	+ endif(NOT EXECINFO_LIBRARY)	15	+ check_library_exists(${EXECINFO_LIBRARY} backtrace "" FUNCTION_BACKTRACE_FOUND)
15	+ target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})	16	+ endif(EXECINFO_LIBRARY)
		17	+endif(NOT FUNCTION_BACKTRACE_FOUND)
		18	+if(NOT FUNCTION_BACKTRACE_FOUND)
		19	+ message(FATAL_ERROR "backtrace - ${FUNCTION_BACKTRACE_FOUND}")
16	+endif(NOT FUNCTION_BACKTRACE_FOUND)	20	+endif(NOT FUNCTION_BACKTRACE_FOUND)
17	+unset(FUNCTION_BACKTRACE_FOUND)	21	+if(EXECINFO_LIBRARY)
		22	+ target_link_libraries(openshot PRIVATE ${EXECINFO_LIBRARY})
		23	+endif(EXECINFO_LIBRARY)
18	+	24	+
19	############### LINK LIBRARY #################	25	############### LINK LIBRARY #################
20	# Link remaining dependency libraries	26	# Link remaining dependency libraries




--- 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

Return to bug 277648

Lines 1-7 Link Here

(-)b/multimedia/libopenshot/Makefile (-6 / +9 lines)
1	PORTNAME= libopenshot	1	PORTNAME= libopenshot
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.2	3	DISTVERSION= 0.3.2
4	PORTREVISION= 2	4	PORTREVISION= 3
5	CATEGORIES= multimedia	5	CATEGORIES= multimedia
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		7
Lines 23-28 LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ Link Here
23	libzmq.so:net/libzmq4	23	libzmq.so:net/libzmq4
24		24
25	USES= cmake pkgconfig python:build qt:5	25	USES= cmake pkgconfig python:build qt:5
		26	USE_CXXSTD= c++17
26	USE_GITHUB= yes	27	USE_GITHUB= yes
27	GH_ACCOUNT= OpenShot	28	GH_ACCOUNT= OpenShot
28	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
Lines 33-49 CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\ Link Here
33	CMAKE_DISABLE_FIND_PACKAGE_Catch2	34	CMAKE_DISABLE_FIND_PACKAGE_Catch2
34	CMAKE_OFF= ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\	35	CMAKE_OFF= ENABLE_PARALLEL_CTEST VERBOSE_TESTS ENABLE_COVERAGE\
35	APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS	36	APPIMAGE_BUILD BUILD_TESTING ENABLE_TESTS
36	USE_CXXSTD= c++17	37	DEBUG_FLAGS?= -g
		38	DEBUG_FLAGS+= -D_DEBUG -DJUCE_FORCE_DEBUG=1
37		39
38	OPTIONS_DEFINE= DOCS IMAGEMAGICK OPENCV RESVG RUBY	40	OPTIONS_DEFINE= DOCS DOXYGEN IMAGEMAGICK OPENCV RESVG RUBY
39	OPTIONS_DEFAULT= IMAGEMAGICK OPENCV	41	OPTIONS_DEFAULT= IMAGEMAGICK OPENCV
40	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
41	RESVG_DESC?= SVG vector graphics support via resvg	43	RESVG_DESC?= SVG vector graphics support via resvg
42	DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
43	DOCS_CMAKE_BOOL= ENABLE_LIB_DOCS
44	DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen
45	DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q}	44	DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q}
46	DOCS_PORTDOCS= *	45	DOCS_PORTDOCS= *
		46	DOXYGEN_IMPLIES= DOCS
		47	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
		48	DOXYGEN_CMAKE_BOOL= ENABLE_LIB_DOCS
		49	DOXYGEN_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen
47	IMAGEMAGICK_USES= magick	50	IMAGEMAGICK_USES= magick
48	IMAGEMAGICK_CMAKE_BOOL= ENABLE_MAGICK	51	IMAGEMAGICK_CMAKE_BOOL= ENABLE_MAGICK
49	IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick	52	IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick

Added Link Here

(-)b/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp (-1 / +22 lines)
0	-	1	--- src/Qt/AudioPlaybackThread.cpp.orig 2023-04-19 22:01:02 UTC
		2	+++ src/Qt/AudioPlaybackThread.cpp
		3	@@ -102,8 +102,17 @@ namespace openshot
		4
		5	// Settings for audio device playback
		6	AudioDeviceManager::AudioDeviceSetup deviceSetup = AudioDeviceManager::AudioDeviceSetup();
		7	- deviceSetup.inputChannels = 0;
		8	- deviceSetup.outputChannels = channels;
		9	+ deviceSetup.outputDeviceName = attempt_device.name;
		10	+ deviceSetup.inputDeviceName = "";
		11	+ //deviceSetup.inputChannels = 0;
		12	+ deviceSetup.inputChannels.clear();
		13	+ deviceSetup.useDefaultInputChannels = false;
		14	+ //deviceSetup.outputChannels = channels;
		15	+ deviceSetup.outputChannels.clear();
		16	+ for (int i = 0; i < channels; ++i) {
		17	+ deviceSetup.outputChannels.setBit(i);
		18	+ }
		19	+ deviceSetup.useDefaultOutputChannels = false;
		20
		21	// Loop through common sample rates, starting with the user's requested rate
		22	// Not all sample rates are supported by audio devices, for example, many VMs