From 95bd2bdcf0ff0d55dd54eb68df4c2770a5357e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Thu, 29 Aug 2024 14:57:23 -0400 Subject: [PATCH] Update Mephisto to commit 1201a260ef439873d6e2382c15b39ebc42c812e9 --- pkgs/mephisto/default.nix | 6 +++--- pkgs/mephisto/disable-ui.patch | 18 +++++++++++++----- pkgs/mephisto/static.patch | 2 +- pkgs/mephisto/sync.patch | 28 ++++++++++++++-------------- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/mephisto/default.nix b/pkgs/mephisto/default.nix index fedf008..4bf5099 100644 --- a/pkgs/mephisto/default.nix +++ b/pkgs/mephisto/default.nix @@ -6,7 +6,7 @@ # (at your option) any later version. { pkgs }: let - version = "0.18.2"; + version = "2024-08-28"; faust = pkgs.callPackage ../faust { }; llvm = pkgs.callPackage ../llvm { }; in @@ -17,8 +17,8 @@ pkgs.stdenv.mkDerivation { domain = "open-music-kontrollers.ch"; owner = "~hp"; repo = "mephisto.lv2"; - rev = version; - hash = "sha256-ab6OGt1XVgynKNdszzdXwJ/jVKJSzgSmAv6j1U3/va0="; + rev = "1201a260ef439873d6e2382c15b39ebc42c812e9"; + hash = "sha256-ad3nlWHvS8cqxFhgENLs+tFTWbVLTSqHtrJwVPlILVg="; }; patches = [ ./disable-ui.patch diff --git a/pkgs/mephisto/disable-ui.patch b/pkgs/mephisto/disable-ui.patch index 985e379..ba1d593 100644 --- a/pkgs/mephisto/disable-ui.patch +++ b/pkgs/mephisto/disable-ui.patch @@ -67,9 +67,9 @@ +# install : true, +# install_dir : inst_dir) - bank_filter_through_dsp = join_paths( - meson.current_source_dir(), 'dsp', 'bank-filter_through.dsp') -@@ -152,12 +152,12 @@ dsp_ttl = configure_file( + bank_filter_through_1x1_dsp = join_paths( + meson.current_source_dir(), 'dsp', 'bank-filter_through-1x1.dsp') +@@ -170,12 +170,12 @@ dsp_ttl = configure_file( install : true, install_dir : inst_dir) @@ -88,7 +88,6 @@ pset_ttl = configure_file( input : join_paths('ttl', 'presets.ttl.in'), - --- a/ttl/manifest.ttl.in +++ b/ttl/manifest.ttl.in @@ -14,7 +14,7 @@ mephisto:audio_1x1 @@ -154,7 +153,16 @@ lv2:binary ; rdfs:seeAlso . -@@ -77,15 +77,15 @@ mephisto:cv_8x8 +@@ -77,7 +77,7 @@ mephisto:cv_8x8 + a lv2:Plugin ; + lv2:minorVersion @MINOR_VERSION@ ; + lv2:microVersion @MICRO_VERSION@ ; +- ui:ui mephisto:ui ; ++ #ui:ui mephisto:ui ; + lv2:binary ; + rdfs:seeAlso . + +@@ -86,15 +86,15 @@ mephisto:combo_44x44 a lv2:Plugin ; lv2:minorVersion @MINOR_VERSION@ ; lv2:microVersion @MICRO_VERSION@ ; diff --git a/pkgs/mephisto/static.patch b/pkgs/mephisto/static.patch index 6b263c0..637e004 100644 --- a/pkgs/mephisto/static.patch +++ b/pkgs/mephisto/static.patch @@ -11,7 +11,7 @@ --- a/src/mephisto.c +++ b/src/mephisto.c -@@ -2254,7 +2254,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2269,7 +2269,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, goto fail; } diff --git a/pkgs/mephisto/sync.patch b/pkgs/mephisto/sync.patch index 784e3d0..8eaba9a 100644 --- a/pkgs/mephisto/sync.patch +++ b/pkgs/mephisto/sync.patch @@ -12,7 +12,7 @@ --- a/src/mephisto.c +++ b/src/mephisto.c -@@ -285,27 +285,27 @@ _voice_next(voice_t *voice) +@@ -287,27 +287,27 @@ _voice_next(voice_t *voice) _voice_not_end((DSP), (VOICE)); \ (VOICE) = _voice_next((VOICE))) @@ -57,7 +57,7 @@ } } -@@ -513,7 +513,7 @@ _refresh_attributes(plughandle_t *handle, uint32_t idx) +@@ -515,7 +515,7 @@ _refresh_attributes(plughandle_t *handle, uint32_t idx) int32_t type = CNTRL_NONE; char label [LABEL_SIZE] = ""; @@ -66,7 +66,7 @@ if(!dsp) { -@@ -728,28 +728,28 @@ _play(plughandle_t *handle, int64_t from, int64_t to) +@@ -730,28 +730,28 @@ _play(plughandle_t *handle, int64_t from, int64_t to) continue; } @@ -117,7 +117,7 @@ VOICE_FOREACH(dsp, voice) { -@@ -770,27 +770,27 @@ _play(plughandle_t *handle, int64_t from, int64_t to) +@@ -772,27 +772,27 @@ _play(plughandle_t *handle, int64_t from, int64_t to) { for(uint32_t i = 0; i < nsamples; i++) { @@ -160,7 +160,7 @@ } static void -@@ -1655,7 +1655,7 @@ run(LV2_Handle instance, uint32_t nsamples) +@@ -1661,7 +1661,7 @@ run(LV2_Handle instance, uint32_t nsamples) for(unsigned i = 0; i < NCONTROLS; i++) { @@ -169,7 +169,7 @@ if(!dsp) { -@@ -2197,8 +2197,8 @@ _ui_init(dsp_t *dsp) +@@ -2212,8 +2212,8 @@ _ui_init(dsp_t *dsp) } static int @@ -180,7 +180,7 @@ { #define ARGC 5 char err [4096]; -@@ -2215,7 +2215,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2230,7 +2230,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, .error = NULL }; @@ -189,7 +189,7 @@ } dsp->handle = handle; -@@ -2228,14 +2228,14 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2243,14 +2243,14 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, { if(handle->log) { @@ -206,7 +206,7 @@ } goto fail; -@@ -2247,7 +2247,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2262,7 +2262,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, { if(handle->log) { @@ -215,7 +215,7 @@ } deleteCDSPFactory(dsp->factory); -@@ -2263,7 +2263,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2278,7 +2278,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, { if(handle->log) { @@ -224,7 +224,7 @@ } deleteCDSPFactory(dsp->factory); -@@ -2286,7 +2286,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2301,7 +2301,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, { if(handle->log) { @@ -233,7 +233,7 @@ } break; -@@ -2304,7 +2304,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2319,7 +2319,7 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, { if(handle->log) { @@ -242,7 +242,7 @@ } deleteCDSPFactory(dsp->factory); -@@ -2313,9 +2313,9 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, +@@ -2328,9 +2328,9 @@ _dsp_init(plughandle_t *handle, dsp_t *dsp, const char *code, if(handle->log) { @@ -255,7 +255,7 @@ } pthread_mutex_unlock(&lock); -@@ -2414,7 +2414,7 @@ _work(LV2_Handle instance, +@@ -2429,7 +2429,7 @@ _work(LV2_Handle instance, while( (code= varchunk_read_request(handle->to_worker, &size)) ) { dsp_t *dsp = calloc(1, sizeof(dsp_t));