diff mbox series

[meta-multimedia] fluidsynth: update 2.4.5 -> 2.4.8

Message ID 20251031054006.1901920-1-f_l_k@t-online.de
State New
Headers show
Series [meta-multimedia] fluidsynth: update 2.4.5 -> 2.4.8 | expand

Commit Message

Markus Volk Oct. 31, 2025, 5:39 a.m. UTC 
- Remove 0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch
  It doesn't apply anymore and following the according pull request the
  issue seems to be fixed
---
 ...te_float-Allow-zero-pointer-for-left.patch | 178 ------------------
 ...luidsynth_2.4.5.bb => fluidsynth_2.4.8.bb} |   3 +-
 2 files changed, 1 insertion(+), 180 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch
 rename meta-multimedia/recipes-multimedia/fluidsynth/{fluidsynth_2.4.5.bb => fluidsynth_2.4.8.bb} (93%)
diff mbox series

Patch

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch
deleted file mode 100644
index f7debc5ad4..0000000000
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch
+++ /dev/null
@@ -1,178 +0,0 @@ 
-From 300977537b6056bdbbba9df9100fa6e891ca1f44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 17 Dec 2018 14:08:45 +0100
-Subject: [PATCH 2/2] fluid_synth_nwrite_float: Allow zero pointer for
- left/right and zero pointer in arrays
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With this modification a client can define exactly what it wants to get into
-buffers to avoid useless copying of data. On weak machines this leads to measurable
-performance wins.
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/FluidSynth/fluidsynth/pull/490
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++-------------
- 1 file changed, 48 insertions(+), 21 deletions(-)
-
-diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
-index 1eb5d737..6c876efa 100644
---- a/src/synth/fluid_synth.c
-+++ b/src/synth/fluid_synth.c
-@@ -3628,10 +3628,10 @@ fluid_synth_program_reset(fluid_synth_t *synth)
-  *
-  * @param synth FluidSynth instance
-  * @param len Count of audio frames to synthesize
-- * @param left Array of float buffers to store left channel of planar audio (as many as \c synth.audio-channels buffers, each of \c len in size)
-- * @param right Array of float buffers to store right channel of planar audio (size: dito)
-- * @param fx_left Since 1.1.7: If not \c NULL, array of float buffers to store left effect channels (as many as \c synth.effects-channels buffers, each of \c len in size)
-- * @param fx_right Since 1.1.7: If not \c NULL, array of float buffers to store right effect channels (size: dito)
-+ * @param left Array of float buffers to store left channel of planar audio (as many as \c synth.audio-channels buffers, each of \c len in size). Since 2.0.3: NULL allowed / NULL allowed for array entry
-+ * @param right Array of float buffers to store right channel of planar audio (size: dito). Since 2.0.3: NULL allowed / NULL allowed for array entry
-+ * @param fx_left Since 1.1.7: If not \c NULL, array of float buffers to store left effect channels (as many as \c synth.effects-channels buffers, each of \c len in size). Since 2.0.3: NULL allowed for array entry
-+ * @param fx_right Since 1.1.7: If not \c NULL, array of float buffers to store right effect channels (size: dito). Since 2.0.3: NULL allowed for array entry
-  * @return #FLUID_OK on success, #FLUID_FAILED otherwise
-  *
-  * First effect channel used by reverb, second for chorus.
-@@ -3719,15 +3719,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
-         for(i = 0; i < synth->audio_channels; i++)
-         {
- #ifdef WITH_FLOAT
--            FLUID_MEMCPY(left[i], &left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
--            FLUID_MEMCPY(right[i], &right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
-+            if(left != NULL && left[i] != NULL)
-+            {
-+                FLUID_MEMCPY(left[i], &left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
-+            }
-+            if(right != NULL && right[i] != NULL)
-+            {
-+                FLUID_MEMCPY(right[i], &right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
-+            }
- #else //WITH_FLOAT
-             int j;
- 
-             for(j = 0; j < num; j++)
-             {
--                left[i][j] = (float) left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
--                right[i][j] = (float) right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
-+                if(left != NULL && left[i] != NULL)
-+                {
-+                    left[i][j] = (float) left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
-+                }
-+                if(right != NULL && right[i] != NULL)
-+                {
-+                    right[i][j] = (float) right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j + synth->cur];
-+                }
-             }
- 
- #endif //WITH_FLOAT
-@@ -3737,12 +3749,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
-         {
- #ifdef WITH_FLOAT
- 
--            if(fx_left != NULL)
-+            if(fx_left != NULL && fx_left[i] != NULL)
-             {
-                 FLUID_MEMCPY(fx_left[i], &fx_left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
-             }
- 
--            if(fx_right != NULL)
-+            if(fx_right != NULL && fx_right[i] != NULL)
-             {
-                 FLUID_MEMCPY(fx_right[i], &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
-             }
-@@ -3750,7 +3762,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
- #else //WITH_FLOAT
-             int j;
- 
--            if(fx_left != NULL)
-+            if(fx_left != NULL && fx_left[i] != NULL)
-             {
-                 for(j = 0; j < num; j++)
-                 {
-@@ -3758,7 +3770,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
-                 }
-             }
- 
--            if(fx_right != NULL)
-+            if(fx_right != NULL && fx_right[i] != NULL)
-             {
-                 for(j = 0; j < num; j++)
-                 {
-@@ -3789,15 +3801,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
-         for(i = 0; i < synth->audio_channels; i++)
-         {
- #ifdef WITH_FLOAT
--            FLUID_MEMCPY(left[i] + count, &left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
--            FLUID_MEMCPY(right[i] + count, &right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
-+            if(left != NULL && left[i] != NULL)
-+            {
-+                FLUID_MEMCPY(left[i] + count, &left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
-+            }
-+            if(right != NULL && right[i] != NULL)
-+            {
-+                FLUID_MEMCPY(right[i] + count, &right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
-+            }
- #else //WITH_FLOAT
-             int j;
- 
--            for(j = 0; j < num; j++)
-+            if(left != NULL && left[i] != NULL)
-+            {
-+                for(j = 0; j < num; j++)
-+                {
-+                    left[i][j + count] = (float) left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
-+                }
-+            }
-+            if(right != NULL && right[i] != NULL)
-             {
--                left[i][j + count] = (float) left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
--                right[i][j + count] = (float) right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
-+                for(j = 0; j < num; j++)
-+                {
-+                    right[i][j + count] = (float) right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + j];
-+                }
-             }
- 
- #endif //WITH_FLOAT
-@@ -3807,12 +3834,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
-         {
- #ifdef WITH_FLOAT
- 
--            if(fx_left != NULL)
-+            if(fx_left != NULL && fx_left[i] != NULL)
-             {
-                 FLUID_MEMCPY(fx_left[i] + count, &fx_left_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
-             }
- 
--            if(fx_right != NULL)
-+            if(fx_right != NULL && fx_right[i] != NULL)
-             {
-                 FLUID_MEMCPY(fx_right[i] + count, &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
-             }
-@@ -3820,7 +3847,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
- #else //WITH_FLOAT
-             int j;
- 
--            if(fx_left != NULL)
-+            if(fx_left != NULL && fx_left[i] != NULL)
-             {
-                 for(j = 0; j < num; j++)
-                 {
-@@ -3828,7 +3855,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
-                 }
-             }
- 
--            if(fx_right != NULL)
-+            if(fx_right != NULL && fx_right[i] != NULL)
-             {
-                 for(j = 0; j < num; j++)
-                 {
--- 
-2.14.5
-
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.5.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.8.bb
similarity index 93%
rename from meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.5.bb
rename to meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.8.bb
index b8396209c5..9d76546641 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.5.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.8.bb
@@ -8,10 +8,9 @@  DEPENDS = "glib-2.0"
 
 SRC_URI = " \
     git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https \
-    file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \
     file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \
 "
-SRCREV = "9f2edaa3cbd456997cb420fb68b6f960faaafd12"
+SRCREV = "70a10b365c707c73bd340e28970601d52d425d8c"
 
 
 inherit cmake pkgconfig lib_package