From nobody Sat Apr 15 17:00:27 2023 X-Original-To: dev-commits-ports-main@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 4PzKLz4DKxz45fp7; Sat, 15 Apr 2023 17:00:27 +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 4PzKLz3m1fz4F1j; Sat, 15 Apr 2023 17:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681578027; 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=lw6rNpouCiywKlpQG8K/JDxSuWgMl20PeekAnap2qBc=; b=pEyRCvk+YzTai8MMvE0flI00ZXHfo9IbtDGwFnmH+SOaIipg+vPatCN8VNXdvagen4IpoQ UBCIrXkyH2Z7CYLk3sj/MYjjfjC7imwY92CHfK3lOyEE13+QHFqUxu3LE9oaThXgEeoNHG VqKOXGVy4IK3KAPVnot8EJNBF699jmkGeA2ao1f/RJ3jFa8KtnhEC1wmtuehUYgyRYxrUS GkLS+HtidS9ICi3pzXYpOUwDiBxJ8WcDzG5pgK0hcsXodzmxwFInWbl8M6voO7cnwYe4Gt VX0rQyaEirYHDdcBfYJHCzNoHj1LuqfFI/jDdyvaO5WmKcaOQHXk+pxxtYV3KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681578027; 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=lw6rNpouCiywKlpQG8K/JDxSuWgMl20PeekAnap2qBc=; b=xHicjZ3DaMEaPXkGFgme5LLu9oYfKGQnosl4iAimkh6kPFR4dOmk+ckFUdP6NL0W/WMdAQ v46NEpvUUp3upd4+fyKZuiVA/HASdEcuTML9d01MemwipLtVQhFFxEcz0575u3/1wSjMg4 in2Nt74sLYcEQOy+1uLWImTX70aPYmsAU/bfT2Ef5Q4h0GtScXNFZVgOADpavvYnngkQtT XiEcJ2yNQwzaIOXnFEnSBY9itqc/IGG8S9xLpfjh4X5BePnL5t76TLOWWCDXHOnX8Qneh5 EdiLBG7wqMxozXhPp2+lBE8OmmZ88XB4qS/0CaENwhgvi1KLLOJWcBBfKi9Lkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681578027; a=rsa-sha256; cv=none; b=BjyIZk3Om+3WfKwXJxCbzaAU2hHogUYvb7yJx1XKEFpIJQNFOm8zG6IQAOc1KutCyl7Xjn wr3we1cvB5lj3uvcLioHeJWEHlaRfjo1gBYVjpTM3wcCpvQcy/ZuyaPva1hnD/RF9KmRg+ XNTEZ1m/sxyLn1xDdVC4SufB6Gj6NzYb3znk18+n+k2qtsVM9xOJUHpYGn9nXrB7gW7Rpm OdeR4Wj2gijYCoXqAPmLOdGV/m/GgEVt3U6Aorz53nBZzG/9RevUMysKTVDX9QFglusvEf mOtAPkNqxGf4qUzOxufNwM/mrsbCeYqr/DPjkVh1x+cAPHOVllHoKabj/uSs8Q== 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 4PzKLz2qdqzDqY; Sat, 15 Apr 2023 17:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FH0RjQ050365; Sat, 15 Apr 2023 17:00:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FH0RFS050364; Sat, 15 Apr 2023 17:00:27 GMT (envelope-from git) Date: Sat, 15 Apr 2023 17:00:27 GMT Message-Id: <202304151700.33FH0RFS050364@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: a003e972b45b - main - audio/libopenshot-audio: Update to 0.3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a003e972b45b275c0a6f60f411a0835b8a422cd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=a003e972b45b275c0a6f60f411a0835b8a422cd7 commit a003e972b45b275c0a6f60f411a0835b8a422cd7 Author: Tatsuki Makino AuthorDate: 2023-04-13 10:07:34 +0000 Commit: Fernando Apesteguía CommitDate: 2023-04-15 16:55:33 +0000 audio/libopenshot-audio: Update to 0.3.1 JACK option added. Enough code was bundled to use JACK, so it should be possible to output directly to jackd, although this is experimental. PR: 270760 Reported by: tatsuki_makino@hotmail.com (maintainer) --- audio/libopenshot-audio/Makefile | 8 +++- audio/libopenshot-audio/distinfo | 6 +-- audio/libopenshot-audio/files/patch-CMakeLists.txt | 53 +++++++++++++++++----- audio/libopenshot-audio/pkg-plist | 2 +- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/audio/libopenshot-audio/Makefile b/audio/libopenshot-audio/Makefile index 31a631589504..3689a13e9792 100644 --- a/audio/libopenshot-audio/Makefile +++ b/audio/libopenshot-audio/Makefile @@ -1,6 +1,6 @@ PORTNAME= libopenshot-audio DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.3.1 CATEGORIES= audio multimedia MAINTAINER= tatsuki_makino@hotmail.com @@ -21,11 +21,15 @@ USE_LDCONFIG= yes CMAKE_ON= AUTO_INSTALL_DOCS CMAKE_OFF= APPIMAGE_BUILD -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS JACK +JACK_DESC= JACK audio server support (experimental) DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_CMAKE_BOOL= ENABLE_AUDIO_DOCS DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q} DOCS_PORTDOCS= * +JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_USES= pkgconfig +JACK_CMAKE_BOOL= ENABLE_JACK .include diff --git a/audio/libopenshot-audio/distinfo b/audio/libopenshot-audio/distinfo index d179bbb4efe3..831fd7b87646 100644 --- a/audio/libopenshot-audio/distinfo +++ b/audio/libopenshot-audio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670814000 -SHA256 (OpenShot-libopenshot-audio-v0.3.0_GH0.tar.gz) = 007ba6ee812a58506341dd66055dba575b3907e5274a0e7416f99c2fbb80021c -SIZE (OpenShot-libopenshot-audio-v0.3.0_GH0.tar.gz) = 1772242 +TIMESTAMP = 1681095600 +SHA256 (OpenShot-libopenshot-audio-v0.3.1_GH0.tar.gz) = acaad852d6d72fee28e015caf328fc8ebf89453ca97e3071372e12cb9c309898 +SIZE (OpenShot-libopenshot-audio-v0.3.1_GH0.tar.gz) = 1772376 diff --git a/audio/libopenshot-audio/files/patch-CMakeLists.txt b/audio/libopenshot-audio/files/patch-CMakeLists.txt index 328d65c1ae0d..77d703632177 100644 --- a/audio/libopenshot-audio/files/patch-CMakeLists.txt +++ b/audio/libopenshot-audio/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2022-12-01 22:02:54 UTC +--- CMakeLists.txt.orig 2023-03-21 22:56:18 UTC +++ CMakeLists.txt @@ -184,6 +184,12 @@ set_target_properties(openshot-audio PROPERTIES EXPORT_NAME Audio # Exports as OpenShot::Audio target @@ -34,7 +34,7 @@ else() # For EXPORTED Config set(NEED_ALSA FALSE) -@@ -274,10 +281,22 @@ endif() +@@ -274,10 +281,51 @@ endif() # ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1 find_package(ZLIB REQUIRED) @@ -42,16 +42,45 @@ +target_link_libraries(openshot-audio PRIVATE ZLIB::ZLIB) +# EXECINFO, SYSINFO -+find_library(EXECINFO_LIBRARY NAMES execinfo) -+if(NOT EXECINFO_LIBRARY) -+ message(FATAL_ERROR "${EXECINFO_LIBRARY}") -+endif(NOT EXECINFO_LIBRARY) -+target_link_libraries(openshot-audio PRIVATE ${EXECINFO_LIBRARY}) -+find_library(SYSINFO_LIBRARY NAMES sysinfo) -+if(NOT SYSINFO_LIBRARY) -+ message(FATAL_ERROR "${SYSINFO_LIBRARY}") -+endif(NOT SYSINFO_LIBRARY) -+target_link_libraries(openshot-audio PRIVATE ${SYSINFO_LIBRARY}) ++include(CheckFunctionExists) ++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-audio PRIVATE ${EXECINFO_LIBRARY}) ++endif(NOT FUNCTION_BACKTRACE_FOUND) ++unset(FUNCTION_BACKTRACE_FOUND) ++check_function_exists("sysinfo" FUNCTION_SYSINFO_FOUND) ++if(NOT FUNCTION_SYSINFO_FOUND) ++ find_library(SYSINFO_LIBRARY NAMES sysinfo) ++ if(NOT SYSINFO_LIBRARY) ++ message(FATAL_ERROR "${SYSINFO_LIBRARY}") ++ endif(NOT SYSINFO_LIBRARY) ++ target_link_libraries(openshot-audio PRIVATE ${SYSINFO_LIBRARY}) ++endif(NOT FUNCTION_SYSINFO_FOUND) ++unset(FUNCTION_SYSINFO_FOUND) ++ ++# JACK ++if(ENABLE_JACK) ++ find_package(PkgConfig QUIET) ++ if(NOT PKG_CONFIG_FOUND) ++ message(FATAL_ERROR "PKG_CONFIG_FOUND: ${PKG_CONFIG_FOUND}") ++ endif(NOT PKG_CONFIG_FOUND) ++ pkg_check_modules(JACK REQUIRED jack) ++ if(NOT JACK_FOUND) ++ message(FATAL_ERROR "JACK_FOUND: ${JACK_FOUND}") ++ endif(NOT JACK_FOUND) ++ if(NOT TARGET JACK::JACK) ++ add_library(JACK::JACK INTERFACE IMPORTED) ++ set_target_properties(JACK::JACK PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES ${JACK_INCLUDE_DIRS} ++ INTERFACE_LINK_LIBRARIES ${JACK_LINK_LIBRARIES}) ++ endif(NOT TARGET JACK::JACK) ++ target_link_libraries(openshot-audio PRIVATE JACK::JACK) ++ target_compile_definitions(openshot-audio PRIVATE JUCE_JACK=1) ++endif(ENABLE_JACK) + # Link with dynamic loader for platform -target_link_libraries(openshot-audio PUBLIC ${CMAKE_DL_LIBS}) diff --git a/audio/libopenshot-audio/pkg-plist b/audio/libopenshot-audio/pkg-plist index d424776909d5..4f6d197196c9 100644 --- a/audio/libopenshot-audio/pkg-plist +++ b/audio/libopenshot-audio/pkg-plist @@ -363,7 +363,7 @@ lib/cmake/OpenShotAudio/OpenShotAudioConfigVersion.cmake lib/cmake/OpenShotAudio/OpenShotAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenShotAudio/OpenShotAudioTargets.cmake lib/libopenshot-audio.so -lib/libopenshot-audio.so.0.3.0 +lib/libopenshot-audio.so.0.3.1 lib/libopenshot-audio.so.9 share/man/man1/openshot-audio-demo.1.gz @dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce