diff options
Diffstat (limited to 'audio/cardinal/files')
3 files changed, 46 insertions, 20 deletions
diff --git a/audio/cardinal/files/patch-dpf_Makefile.base.mk b/audio/cardinal/files/patch-dpf_Makefile.base.mk deleted file mode 100644 index b8394c0e0b20..000000000000 --- a/audio/cardinal/files/patch-dpf_Makefile.base.mk +++ /dev/null @@ -1,14 +0,0 @@ - -- workaround for https://github.com/DISTRHO/Cardinal/issues/641 - ---- dpf/Makefile.base.mk.orig 2024-04-08 16:00:03 UTC -+++ dpf/Makefile.base.mk -@@ -373,7 +373,7 @@ endif - # --------------------------------------------------------------------------------------------------------------------- - # Check for optional libraries - --HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true) -+HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo $(WITH_LIBLO)) - - ifneq ($(SKIP_NATIVE_AUDIO_FALLBACK),true) - ifneq ($(SKIP_RTAUDIO_FALLBACK),true) diff --git a/audio/cardinal/files/patch-plugins_MindMeldModular_src_MixMaster_AuxExpander.cpp b/audio/cardinal/files/patch-plugins_MindMeldModular_src_MixMaster_AuxExpander.cpp new file mode 100644 index 000000000000..05247b99561d --- /dev/null +++ b/audio/cardinal/files/patch-plugins_MindMeldModular_src_MixMaster_AuxExpander.cpp @@ -0,0 +1,40 @@ +- fix build error: +- /usr/include/c++/v1/__type_traits/promote.h:32:3: error: static assertion failed due to requirement 'is_arithmetic<rack::simd::Vector<float, 4>>::value' +- static_assert((is_arithmetic<_Args>::value && ...)); +- ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- /usr/include/c++/v1/complex:1110:47: note: in instantiation of template class 'std::__promote<rack::simd::Vector<float, 4>, int>' requested here +- inline _LIBCPP_HIDE_FROM_ABI complex<typename __promote<_Tp, _Up>::type> pow(const complex<_Tp>& __x, const _Up& __y) { +- ^ +- MindMeldModular/src/MixMaster/AuxExpander.cpp:612:19: note: while substituting deduced template arguments into function template 'pow' [with _Tp = rack::simd::Vector<float, 4>, _Up = int, $2 = (no value)] +- globalSends = simd::pow<simd::float_4>(globalSends, GlobalConst::globalAuxSendScalingExponent); +- ^ + +--- plugins/MindMeldModular/src/MixMaster/AuxExpander.cpp.orig 2025-06-22 11:38:40 UTC ++++ plugins/MindMeldModular/src/MixMaster/AuxExpander.cpp +@@ -609,7 +609,7 @@ struct AuxExpander : Module { + globalSends = clamp(globalSends, 0.0f, maxAGGlobSendFader); + globalSendsWithCV = globalSends;// can put here since unused when cv disconnected + } +- globalSends = simd::pow<simd::float_4>(globalSends, GlobalConst::globalAuxSendScalingExponent); ++ globalSends = simd::pow(globalSends, GlobalConst::globalAuxSendScalingExponent); + + // Indiv mute sends (20 or 10 instances) + for (int gi = 0; gi < (N_TRK + N_GRP); gi++) { +@@ -648,7 +648,7 @@ struct AuxExpander : Module { + } + trackSendVcaGains[trk][auxi] = val; + } +- trackSendVcaGains[trk] = simd::pow<simd::float_4>(trackSendVcaGains[trk], GlobalConst::individualAuxSendScalingExponent); ++ trackSendVcaGains[trk] = simd::pow(trackSendVcaGains[trk], (float)GlobalConst::individualAuxSendScalingExponent); + trackSendVcaGains[trk] *= globalSends * simd::float_4(sendMuteSlewers[trk >> 2].out[trk & 0x3]); + } + // vca the aux send knobs with the track's sound +@@ -677,7 +677,7 @@ struct AuxExpander : Module { + groupSendVcaGains[grp][auxi] = 0.0f; + } + } +- groupSendVcaGains[grp] = simd::pow<simd::float_4>(groupSendVcaGains[grp], GlobalConst::individualAuxSendScalingExponent); ++ groupSendVcaGains[grp] = simd::pow(groupSendVcaGains[grp], (float)GlobalConst::individualAuxSendScalingExponent); + groupSendVcaGains[grp] *= globalSends * simd::float_4(sendMuteSlewers[N_TRK >> 2].out[grp]); + } + // vca the aux send knobs with the group's sound diff --git a/audio/cardinal/files/patch-src_Rack_src_system.cpp b/audio/cardinal/files/patch-src_Rack_src_system.cpp index 26cc3b7a8a38..64f2ccf4b856 100644 --- a/audio/cardinal/files/patch-src_Rack_src_system.cpp +++ b/audio/cardinal/files/patch-src_Rack_src_system.cpp @@ -1,8 +1,8 @@ - CLOCK_MONOTONIC_RAW is not available on FreeBSD ---- src/Rack/src/system.cpp.orig 2022-02-06 00:32:17 UTC +--- src/Rack/src/system.cpp.orig 2025-06-22 11:39:38 UTC +++ src/Rack/src/system.cpp -@@ -742,7 +742,11 @@ static void initTime() { +@@ -770,7 +770,11 @@ static void initTime() { #endif #if defined ARCH_LIN struct timespec ts; @@ -14,9 +14,9 @@ startTime = int64_t(ts.tv_sec) * 1000000000LL + ts.tv_nsec; #endif #if defined ARCH_MAC -@@ -763,7 +767,11 @@ double getTime() { - #endif - #if defined ARCH_LIN +@@ -790,7 +794,11 @@ double getTime() { + return (counter.QuadPart - startCounter) * counterTime; + #elif defined ARCH_LIN struct timespec ts; +#ifdef __FreeBSD__ + clock_gettime(CLOCK_MONOTONIC_PRECISE, &ts); @@ -25,4 +25,4 @@ +#endif int64_t time = int64_t(ts.tv_sec) * 1000000000LL + ts.tv_nsec; return (time - startTime) / 1e9; - #endif + #elif defined ARCH_MAC |