git: aaf434e37267 - main - multimedia/ossia-score: update 3.3.2 → 3.4.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Feb 2025 07:04:38 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aaf434e37267b6acb1ea2081f68688de066cdd6f
commit aaf434e37267b6acb1ea2081f68688de066cdd6f
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-02-21 06:57:15 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-02-21 07:04:34 +0000
multimedia/ossia-score: update 3.3.2 → 3.4.1
---
multimedia/ossia-score/Makefile | 9 ++-
multimedia/ossia-score/distinfo | 8 +--
.../patch-68d68e105a969b1829b50e4a6b39edaa6077db57 | 69 ++++++++++++++++++++++
...h-src_plugins_score-plugin-faust_CMakeLists.txt | 25 ++++++++
multimedia/ossia-score/pkg-message | 2 +-
multimedia/ossia-score/pkg-plist | 44 --------------
6 files changed, 104 insertions(+), 53 deletions(-)
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,6 +1,5 @@
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}
@@ -18,9 +17,11 @@ 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 \
@@ -36,15 +37,17 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
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
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?=
+ <jeanmichael.celerier@gmail.com>
+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
@@ -9,7 +9,7 @@ backend using one of these environment variables:
- SCORE_AUDIO_BACKEND=pipewire
- SCORE_AUDIO_BACKEND=dummy
-On startup ossie-score will ask you if you would like to
+On startup ossia-score will ask you if you would like to
download the user library. You might want to answer Yes.
The user library contains presets, sound files, etc.
It is downloaded into ~/Documents/ossia/score/packages
diff --git a/multimedia/ossia-score/pkg-plist b/multimedia/ossia-score/pkg-plist
index 96f6f7d6ed7e..36a54c2083dd 100644
--- a/multimedia/ossia-score/pkg-plist
+++ b/multimedia/ossia-score/pkg-plist
@@ -1,46 +1,5 @@
bin/ossia-score
bin/ossia-score-vstpuppet
-include/async_mqtt5.hpp
-include/async_mqtt5/detail/any_authenticator.hpp
-include/async_mqtt5/detail/async_mutex.hpp
-include/async_mqtt5/detail/async_traits.hpp
-include/async_mqtt5/detail/cancellable_handler.hpp
-include/async_mqtt5/detail/channel_traits.hpp
-include/async_mqtt5/detail/control_packet.hpp
-include/async_mqtt5/detail/internal_types.hpp
-include/async_mqtt5/detail/rebind_executor.hpp
-include/async_mqtt5/detail/spinlock.hpp
-include/async_mqtt5/detail/topic_validation.hpp
-include/async_mqtt5/detail/utf8_mqtt.hpp
-include/async_mqtt5/error.hpp
-include/async_mqtt5/impl/assemble_op.hpp
-include/async_mqtt5/impl/async_sender.hpp
-include/async_mqtt5/impl/autoconnect_stream.hpp
-include/async_mqtt5/impl/client_service.hpp
-include/async_mqtt5/impl/codecs/base_decoders.hpp
-include/async_mqtt5/impl/codecs/base_encoders.hpp
-include/async_mqtt5/impl/codecs/message_decoders.hpp
-include/async_mqtt5/impl/codecs/message_encoders.hpp
-include/async_mqtt5/impl/codecs/traits.hpp
-include/async_mqtt5/impl/connect_op.hpp
-include/async_mqtt5/impl/disconnect_op.hpp
-include/async_mqtt5/impl/endpoints.hpp
-include/async_mqtt5/impl/ping_op.hpp
-include/async_mqtt5/impl/publish_rec_op.hpp
-include/async_mqtt5/impl/publish_send_op.hpp
-include/async_mqtt5/impl/re_auth_op.hpp
-include/async_mqtt5/impl/read_message_op.hpp
-include/async_mqtt5/impl/read_op.hpp
-include/async_mqtt5/impl/reconnect_op.hpp
-include/async_mqtt5/impl/replies.hpp
-include/async_mqtt5/impl/sentry_op.hpp
-include/async_mqtt5/impl/subscribe_op.hpp
-include/async_mqtt5/impl/unsubscribe_op.hpp
-include/async_mqtt5/impl/write_op.hpp
-include/async_mqtt5/mqtt_client.hpp
-include/async_mqtt5/property_types.hpp
-include/async_mqtt5/reason_codes.hpp
-include/async_mqtt5/types.hpp
include/highfive/H5Attribute.hpp
include/highfive/H5DataSet.hpp
include/highfive/H5DataSpace.hpp
@@ -270,6 +229,3 @@ lib/cmake/libartnet/artnet-exports-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libartnet/artnet-exports.cmake
lib/libartnet.a
lib/libkfr_io.a
-share/async-mqtt5/async-mqtt5Config.cmake
-share/async-mqtt5/async-mqtt5ConfigVersion.cmake
-share/async-mqtt5/async-mqtt5Targets.cmake