diff --git a/multimedia/ossia-score/Makefile b/multimedia/ossia-score/Makefile index 81baf3bfb762..6122b2f93932 100644 --- a/multimedia/ossia-score/Makefile +++ b/multimedia/ossia-score/Makefile @@ -1,66 +1,69 @@ PORTNAME= ossia-score # uses -mcx16 -DISTVERSION= 3.3.2 -PORTREVISION= 3 +DISTVERSION= 3.4.1 CATEGORIES= multimedia MASTER_SITES= https://github.com/ossia/score/releases/download/v${DISTVERSION}/ DISTFILES= ossia.score-${DISTVERSION}-src${EXTRACT_SUFX} MAINTAINER= yuri@FreeBSD.org COMMENT= Interactive sequencer for the intermedia arts WWW= https://ossia.io/ \ https://github.com/ossia/score LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= compilation fails, see https://github.com/ossia/score/issues/1608 BUILD_DEPENDS= rapidfuzz-cpp>0:devel/rapidfuzz-cpp \ rapidjson>0:devel/rapidjson \ vulkan-headers>0:graphics/vulkan-headers +#BUILD_DEPENDS+= concurrentqueue>0:devel/concurrentqueue # broken, see https://github.com/ossia/score/issues/1720 LIB_DEPENDS= libasound.so:audio/alsa-lib \ libavcodec.so:multimedia/ffmpeg \ libboost_system.so:devel/boost-libs \ + libfaust.so:audio/faust \ libfftw3.so:math/fftw3 \ libfmt.so:devel/libfmt \ libjack.so:audio/jack \ libhdf5.so:science/hdf5 \ liblilv-0.so:audio/lilv \ libportaudio.so:audio/portaudio \ libre2.so:devel/re2 \ libsamplerate.so:audio/libsamplerate \ libsnappy.so:archivers/snappy \ libsndfile.so:audio/libsndfile \ libspdlog.so:devel/spdlog \ libsuil-0.so:audio/suil \ libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd -USES= cmake gl llvm:19 pkgconfig qt:6 tar:xz +USES= cmake gl localbase:ldflags llvm:19 pkgconfig qt:6 sdl tar:xz USE_GL= gl opengl USE_QT= base declarative scxml serialport shadertools svg websockets +USE_SDL= sdl2 CMAKE_ON= SCORE_USE_SYSTEM_LIBRARIES \ BUILD_SHARED_LIBS CMAKE_ARGS= -DSCORE_DISABLED_PLUGINS="score-plugin-pd;score-plugin-vst3" \ -DCMAKE_CXX_FLAGS="-fexperimental-library" \ -DCMAKE_UNITY_BUILD=1 +#CMAKE_ARGS+= -DCMAKE_MODULE_PATH=${LLVM_PREFIX}/lib/cmake/clang # JIT plugin fails to build, see https://github.com/ossia/score/issues/1721 CXXFLAGS+= -fexperimental-library # to fix libossia/src/ossia/detail/jthread.hpp:10:8: error: Rebuild with -fexperimental-library, clang 18 ships headers which are incompatible with this file but hides half of them behind that flag .include .if ${ARCH} == "amd64" || ${ARCH} == "i386" PLIST_FILES= lib/libkfr_dft_avx.a \ lib/libkfr_dft_avx2.a \ lib/libkfr_dft_avx512.a \ lib/libkfr_dft_sse2.a \ lib/libkfr_dft_sse41.a \ lib/libkfr_dsp_avx.a \ lib/libkfr_dsp_avx2.a \ lib/libkfr_dsp_avx512.a \ lib/libkfr_dsp_sse2.a \ lib/libkfr_dsp_sse41.a .endif .include diff --git a/multimedia/ossia-score/distinfo b/multimedia/ossia-score/distinfo index f4e0b8fa7a69..02731ea18d7e 100644 --- a/multimedia/ossia-score/distinfo +++ b/multimedia/ossia-score/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1731913354 -SHA256 (ossia.score-3.3.2-src.tar.xz) = 716db9cd86e6f197c006f1e724a370e2b1f582e56603c01a60d3a60e1aa213c0 -SIZE (ossia.score-3.3.2-src.tar.xz) = 61600828 -SHA256 (a4d848c959b54eba5612ecfdf87d1d5fc74020ab.patch) = 53c64380f438fae6540f03c3028be9943f1c8ac3fd50bd6bacd783acf8e3988c -SIZE (a4d848c959b54eba5612ecfdf87d1d5fc74020ab.patch) = 1036 +TIMESTAMP = 1739874760 +SHA256 (ossia.score-3.4.1-src.tar.xz) = 2c7098df01f91dc1c917b9662304004c1d95143b7860a8bb1c2951b818b08f72 +SIZE (ossia.score-3.4.1-src.tar.xz) = 66768304 diff --git a/multimedia/ossia-score/files/patch-68d68e105a969b1829b50e4a6b39edaa6077db57 b/multimedia/ossia-score/files/patch-68d68e105a969b1829b50e4a6b39edaa6077db57 new file mode 100644 index 000000000000..fdf3abea87e5 --- /dev/null +++ b/multimedia/ossia-score/files/patch-68d68e105a969b1829b50e4a6b39edaa6077db57 @@ -0,0 +1,69 @@ +- backport the commit: https://github.com/ossia/score-addon-led/commit/68d68e105a969b1829b50e4a6b39edaa6077db57 +- that fixes https://github.com/ossia/score/issues/1684 + +From 68d68e105a969b1829b50e4a6b39edaa6077db57 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= + +Date: Sun, 19 Jan 2025 11:36:41 -0500 +Subject: [PATCH] led: fix build on bsd + +--- + CMakeLists.txt | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff src/addons/score-addon-led/CMakeLists.txt src/addons/score-addon-led/CMakeLists.txt +index e9e3abd..e3d8bac 100644 +--- src/addons/score-addon-led/CMakeLists.txt ++++ src/addons/score-addon-led/CMakeLists.txt +@@ -1,11 +1,11 @@ + cmake_minimum_required(VERSION 3.13 FATAL_ERROR) + + # Only Linux allows raw SPI access so far +-find_path(LINUX_HEADERS_INCLUDE_DIR linux/types.h) ++find_path(LINUX_HEADERS_INCLUDE_DIR linux/spi/spidev.h) + if(NOT LINUX_HEADERS_INCLUDE_DIR) + return() + endif() +-if(APPLE OR EMSCRIPTEN OR WIN32) ++if(APPLE OR EMSCRIPTEN OR WIN32 OR BSD) + return() + endif() + if(NOT TARGET score_lib_base) +@@ -39,20 +39,20 @@ target_link_libraries(score_addon_led PUBLIC score_plugin_engine) + setup_score_plugin(score_addon_led) + + +-avnd_score_plugin_init( +- BASE_TARGET score_addon_ledfx +-) +- +-avnd_score_plugin_add( +- BASE_TARGET score_addon_ledfx +- SOURCES +- LedProcesses/LedFX.hpp +- TARGET ledfx +- MAIN_CLASS LedFX +- NAMESPACE Led +-) +-avnd_score_plugin_finalize( +- BASE_TARGET score_addon_ledfx +- PLUGIN_VERSION 1 +- PLUGIN_UUID "706e49b7-6e22-4a4d-9f91-3c2a7563c072" +-) ++# avnd_score_plugin_init( ++# BASE_TARGET score_addon_ledfx ++# ) ++# ++# avnd_score_plugin_add( ++# BASE_TARGET score_addon_ledfx ++# SOURCES ++# LedProcesses/LedFX.hpp ++# TARGET ledfx ++# MAIN_CLASS LedFX ++# NAMESPACE Led ++# ) ++# avnd_score_plugin_finalize( ++# BASE_TARGET score_addon_ledfx ++# PLUGIN_VERSION 1 ++# PLUGIN_UUID "706e49b7-6e22-4a4d-9f91-3c2a7563c072" ++# ) diff --git a/multimedia/ossia-score/files/patch-src_plugins_score-plugin-faust_CMakeLists.txt b/multimedia/ossia-score/files/patch-src_plugins_score-plugin-faust_CMakeLists.txt new file mode 100644 index 000000000000..91b5510ee077 --- /dev/null +++ b/multimedia/ossia-score/files/patch-src_plugins_score-plugin-faust_CMakeLists.txt @@ -0,0 +1,25 @@ +- workaround for https://github.com/ossia/score/issues/1732 + +--- src/plugins/score-plugin-faust/CMakeLists.txt.orig 2025-02-21 05:43:32 UTC ++++ src/plugins/score-plugin-faust/CMakeLists.txt +@@ -62,20 +62,6 @@ setup_score_plugin(${PROJECT_NAME}) + + setup_score_plugin(${PROJECT_NAME}) + +-message("Downloading Faust libs...") +- +-ExternalProject_Add( +- faustlibs +- PREFIX "" +- GIT_REPOSITORY https://github.com/grame-cncm/faustlibraries +- GIT_TAG 730eff6dc336973553829235e0b31b24c47a2f69 +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) +- +-add_dependencies(${PROJECT_NAME} faustlibs) +- + if(WIN32) + target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32) + endif() diff --git a/multimedia/ossia-score/pkg-message b/multimedia/ossia-score/pkg-message index 69fbe07984f2..3712fc2c71c5 100644 --- a/multimedia/ossia-score/pkg-message +++ b/multimedia/ossia-score/pkg-message @@ -1,19 +1,19 @@ [ { type: install message: <