git: a003e972b45b - main - audio/libopenshot-audio: Update to 0.3.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Apr 2023 17:00:27 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a003e972b45b275c0a6f60f411a0835b8a422cd7
commit a003e972b45b275c0a6f60f411a0835b8a422cd7
Author: Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2023-04-13 10:07:34 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
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 <bsd.port.mk>
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