From nobody Mon May 6 15:06:01 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VY4VL2W70z5KPcV; Mon, 06 May 2024 15:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VY4VL0phFz4Tjp; Mon, 6 May 2024 15:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715007962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ok5hMlJVPaXnKUCxIWfFoxhRfgIfXmA/ifex1RAa0l8=; b=y0pUaGA15cYsacKyATyfe+DkRK6is0jiBtdKgfL1qcbSEOMR91q58OE63S7ZnMk0i2Uvq9 Bgz8Dgs/4IF7SA0Ghxop1DhKRSW/DHTWBlP4PxhfXCzQfjJjtcTMCEyADcJOPVyRXK3n6v OOjrciu3X12hQsT0QorXZAi/Zs5QTvFVkf+38um0qT7czlBJJm7Lfps9ck6ku0kndqJ4WO 6Q78BElVuKcfSgD05G6Xca7P6SVuy5pKc/svJnyOiHpnic6evr3OGqCJIgP+waJLXK083h +kXeh/7yGMVbKJU04DYzQBusbTgDJsdPXXzqbK2my6t6Zvfcw1/s698hoAMS6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715007962; a=rsa-sha256; cv=none; b=GZ4D/bm7Qgjbf7NYO/v0Z9MAom9wYWuymWkp+E/oZSsumMDbjH/vhkxbNOhnBPCtUeqRBw wc/wLVQWLxzvksOLl/Dg5U8eANWYRu/o6eg3opBNx4oYSJW7DPUQsLF5qfztiH5RKT4VEs LDD7yWOk6jKpGcIMQwRDMCrml2zlEZdXdsYG93hdMD4KU8P4BTA2uCr73TnRKBDCddyODh +uBe801gYpenQ8LC4f2/yAMFGHrYTfAjl+SjNOKPyAhyM8VO3dwlhROeeKbx5UNSI6rHpC Rpe7Sodc7Bas2vK69XZ0sUhcryqjJHA7+xAfe3z2VMkz7oSVq0VmNzi8fAbAEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715007962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ok5hMlJVPaXnKUCxIWfFoxhRfgIfXmA/ifex1RAa0l8=; b=ZIyiWHo4yGefxOjEPhedCrlqjVCxV4gyuOv0M9ZPYmxq5b8dbckNfbI2avtbMPjhLgynT7 FtPk54PHAOzOJ81hIFiHN3rtfMVYmFCwQleVe+LHDoJC07dBP5G9Uaec5eicT1zHRfkx3m gi5iLmX5Mkiyt6p1sgOnWlJswGpZk/lJ6LqXEzQ9UiPLLmGo8rDBaDHmvUWwPpGuEaSJMO EAI1lH3vC6Jf+mU/Dj0kRUi3rRbfB6ASf06dGdDi6PI2z/E1JqUs0Lv+UWqWpEoB+O/Fyi cUMYpayxmtiUw9u0xDlte1s2KYsklwctWRWdmfyOEOh4v+Ey3+5IEtZ/EKB//A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VY4VL0PvPz11gt; Mon, 6 May 2024 15:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 446F61xP004468; Mon, 6 May 2024 15:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 446F618I004464; Mon, 6 May 2024 15:06:01 GMT (envelope-from git) Date: Mon, 6 May 2024 15:06:01 GMT Message-Id: <202405061506.446F618I004464@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 985f2bd893ba - main - multimedia/{,lib}openshot: fix OPTIONS and audio output device selection List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 985f2bd893ba7faacf425f999796bdc1db9bbfa5 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=985f2bd893ba7faacf425f999796bdc1db9bbfa5 commit 985f2bd893ba7faacf425f999796bdc1db9bbfa5 Author: Tatsuki Makino AuthorDate: 2024-05-06 15:00:48 +0000 Commit: Vladimir Druzenko CommitDate: 2024-05-06 15:05:33 +0000 multimedia/{,lib}openshot: fix OPTIONS and audio output device selection Documents that require doxygen have been separated into DOXYGEN option. It is off by default. This should fix an issue where no matter what we choose, we could only output audio to the default sink. In particular, it is a fix that has become necessary to make JACK work well. Fixed stage-qa error - link with libpython. PR: 277648 --- multimedia/libopenshot/Makefile | 30 ++++++++++++---------- .../libopenshot/files/patch-src_CMakeLists.txt | 20 ++++++++++----- .../files/patch-src_Qt_AudioPlaybackThread.cpp | 22 ++++++++++++++++ multimedia/openshot/Makefile | 2 +- 4 files changed, 53 insertions(+), 21 deletions(-) diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index b84716ffa877..509f2996dfaa 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -1,7 +1,7 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,9 +20,11 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libbabl-0.1.so:x11/babl \ libjsoncpp.so:devel/jsoncpp \ libopenshot-audio.so:audio/libopenshot-audio \ + libpython${PYTHON_VER}${PYTHON_ABIVER}.so:lang/python${PYTHON_SUFFIX} \ 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 +35,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= * +OPTIONS_SUB= yes +RESVG_DESC?= SVG vector graphics support via resvg +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 @@ -54,10 +58,10 @@ OPENCV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenCV\ CMAKE_DISABLE_FIND_PACKAGE_Protobuf OPENCV_CMAKE_ON= -DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4 RESVG_LIB_DEPENDS= libresvg.so:graphics/resvg-capi -RESVG_USE_OFF= QT=svg +RESVG_USE_OFF= QT=svg RESVG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Resvg -RESVG_CMAKE_ON= -DRESVGDIR:STRING=${LOCALBASE:Q} -RUBY_USES= ruby:build +RESVG_CMAKE_ON= -DRESVGDIR:STRING=${LOCALBASE:Q} +RUBY_USES= ruby:build RUBY_CMAKE_BOOL= ENABLE_RUBY RUBY_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Ruby diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt index c94d5a8ab374..4ad80fbc34a8 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 -@@ -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 000000000000..11530ddc36d1 --- /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 diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile index 1bacbe08bc16..92a47356fdbc 100644 --- a/multimedia/openshot/Makefile +++ b/multimedia/openshot/Makefile @@ -1,7 +1,7 @@ PORTNAME= openshot DISTVERSIONPREFIX= v DISTVERSION= 3.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= tatsuki_makino@hotmail.com