[PATCH 1/6] mousepad: upgrade 0.5.3 -> 0.5.4

[PATCH 1/6] mousepad: upgrade 0.5.3 -> 0.5.4

[Andreas Müller]

Release notes for 0.5.4
=======================
- New Features:
  - Add --line/-l and --column/-c number (#107, !83)
  - Port to GtkSourceView 4 (#55, #80, !10)

- Bug Fixes:
  - Delay request to scroll to cursor for the correct active view
  - Monitor hardlinks with glib 2.56.2 (#110, !82)
  - Transfer encoding from remote to primary instance (#109)
  - Prevent a crash when no language is found
  - Make window require attention when opening new tabs (#106, #93, !81)
  - Fix BOM array (!80)
  - Correctly initialize toolbar style combo box (#103)
  - Allow checking parent sources when looking up schema (#101)
  - Fix missing parameter to "select-all" signal (!79)

- Translation Updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../mousepad/{mousepad_0.5.3.bb => mousepad_0.5.4.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/mousepad/{mousepad_0.5.3.bb => mousepad_0.5.4.bb} (67%)

diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.5.3.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb
similarity index 67%
rename from meta-xfce/recipes-apps/mousepad/mousepad_0.5.3.bb
rename to meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb
index 1fba67914..7a2f12b1e 100644
--- a/meta-xfce/recipes-apps/mousepad/mousepad_0.5.3.bb
+++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb
@@ -3,11 +3,11 @@ SECTION = "x11/application"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native"
+DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native"
 
 inherit xfce-app gsettings mime-xdg
 
-SRC_URI[sha256sum] = "e7208bb9e96a1525d3358a64f9cdd165005078e84e81984a953a2a03491fcaa8"
+SRC_URI[sha256sum] = "d90f492e5d0cba5f5b3b0c1eb7fd7c1701aef57e3fa244d2c457e7f9b0a42aa1"
 
 FILES_${PN} += " \
     ${datadir}/glib-2.0/schemas \
-- 
2.26.2

[PATCH] networkmanager-openvpn: Fix packageing

[Andreas Müller]

Recent upgrade introduced:
| ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue: networkmanager-openvpn: Files/directories were installed but not shipped in any package:
|  /usr/share/metainfo
|  /usr/share/metainfo/network-manager-openvpn.metainfo.xml

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../networkmanager/networkmanager-openvpn_1.8.14.bb              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
index a1a61bed1..1f76d8ab5 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
@@ -38,6 +38,7 @@ USERADD_PARAM_${PN} = "--system nm-openvpn"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
+    ${datadir}/metainfo \
     ${libdir}/NetworkManager/*.so \
     ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
 "
-- 
2.26.2

[PATCH 2/6] xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4

[Andreas Müller]

Release notes for 1.1.4
=======================
- Add help button to properties dialog
- Drop subtitle from settings dialog
- Fix labels alignment for very small panels
- Fix compilation warnings
- automake: INCLUDES -> AM_CPPFLAGS
- autoconf: Some updates
- Remove unnecessary boxes
- Remove GSourceFunc casts
- Add new README.md, update AM_INIT_AUTOMAKE
- Add basic GitLab pipeline
- Update URLs from goodies.xfce.org to docs.xfce.org (Bug #16154)
- Translation Updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...4-battery-plugin_1.1.3.bb => xfce4-battery-plugin_1.1.4.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/battery/{xfce4-battery-plugin_1.1.3.bb => xfce4-battery-plugin_1.1.4.bb} (66%)

diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb
rename to meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb
index ecbdc265e..9e65cf688 100644
--- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb
+++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb
@@ -5,5 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "9f82c7e77de0a417716d68d33367973b"
-SRC_URI[sha256sum] = "12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3"
+SRC_URI[sha256sum] = "107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222"
-- 
2.26.2

[PATCH 3/6] gigolo: upgrade 0.5.1 -> 0.5.2

[Andreas Müller]

Release notes for 0.5.2
=======================
A bugfix and translation update, a new icon, various cleanups.. thanks
to all contributors !

======
- Update TODO
- Refresh Glade file, drop unused tab labels (fixes #13)
- move the logic setting GtkSpin port value to setup_for_type() (#11)
- Use new icon in window titlebar
- Fix compilation warnings
- autoconf: Some updates
- Only show an error dialog if the host field is visible/required
- Remove capitalization from icon name
- Update GenericName (#2)
- Fix comment style.
- Remove GSourceFunc casts
- Update Makefile.am
- Add gigolo.ui to POTFILES.in (Issue #6)
- Added new icons following new style and reverse DNS format.
- Add new README.md and update AM_INIT_AUTOMAKE
- Add basic GitLab pipeline
- Bug #16717: Move from exo-csource to xdt-csource
- Translation Updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-apps/gigolo/{gigolo_0.5.1.bb => gigolo_0.5.2.bb}   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/gigolo/{gigolo_0.5.1.bb => gigolo_0.5.2.bb} (67%)

diff --git a/meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb
similarity index 67%
rename from meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb
rename to meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb
index 1233fe069..517f1f4c5 100644
--- a/meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb
+++ b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb
@@ -7,5 +7,4 @@ DEPENDS = "gtk+3 intltool-native xfce4-dev-tools-native"
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "94e89ad3fabba7167760004b64062f4a"
-SRC_URI[sha256sum] = "ca87badb5871e4844579704704ea9e5ede444f710a3b264c12b60b2a0e48e14e"
+SRC_URI[sha256sum] = "e34a1aa0755f9f6c234c7d24b23a6cecd6ef50741d79da3bb6f698a2281dbbc3"
-- 
2.26.2

[PATCH 4/6] thunar: upgrade 4.16.4 -> 4.16.6

[Andreas Müller]

4.16.6
======
- Reload current directory before selecting new files (Issue #524)
- tree-view: Hide menu-item "properties" for unmounted devices
- Removed 'the root folder has no parent' dialog box
- Revamp documentation to modernize/uniformize accross components
- Remove watches on shortcuts (Issue #513) (Issue #47)
- Translation Updates:
  Finnish, Occitan

4.16.5
======
- Revert "Bookmarks no longer need an existing file (Issue #47)"

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-xfce/thunar/{thunar_4.16.4.bb => thunar_4.16.6.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.4.bb => thunar_4.16.6.bb} (89%)

diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.4.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/thunar/thunar_4.16.4.bb
rename to meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
index e5fd5ffd3..128043d19 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.4.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
@@ -8,7 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[sha256sum] = "d51a2018c1ba7dcc420e7a84d85cc17a58f26fb1c80ee4c15e689a49f10425f9"
+SRC_URI[sha256sum] = "cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
-- 
2.26.2

[PATCH 5/6] fluidsynth: upgrade 2.1.7 -> 2.2.0

[Andreas Müller]

The only fallout by API/ABI changes in my world build was meta-games/scummvm.
Fix was sent [1]

fluidsynth 2.2.0
This release breaks ABI compatibility! Refer to the API docs for details.
A C++98 compliant compiler is now required to build fluidsynth (mailing list thread)

New features

    Support loading SoundFonts >2GiB on Windows (#629)
    Major overhaul of the sequencer and its event queue (#604)
        Overlapping notes can be handled (#637)
        Performance improvement, since the event queue no longer blocks the rendering thread
        Time scale is not limited to 1000 anymore and can therefore be used for tempo changes
    The following audio drivers have gained multi-channel support
        DSound (#667, thanks to @jjceresa)
        WaveOut (#667, thanks to @jjceresa)
    The WinMIDI driver supports multiple devices (#677, thanks to @jjceresa)
    Handle GS DT1 SysEx messages for setting whether a channel is used for rhythm part (#708, thanks to @chirs241097)
    Support use of UTF-8 filenames under Windows (#718, thanks to @getraid-gg)
    Improved support for overriding tempo of the MIDI player (#711, #713, thanks to @jjceresa)
    Handle settings-related commands in user command file before initializing other objects (#739)
    SoundFont loading has been parallelized (#746, #812, requires openMP)
    The Oboe driver has gained a lower latency and other updates (#740, #741, #747)
    WASAPI driver has been added (#754, thanks to @chirs241097)

General

    Fix race condition in fluid_player_callback (#783, thanks to @arcln)
    Improvements to LADSPA subsystem (#795, thanks to @mawe42)

[1] https://github.com/cazfi/meta-games/pull/58

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../fluidsynth/fluidsynth.inc                 |  6 ++---
 ...te_float-Allow-zero-pointer-for-left.patch | 26 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index 74a2683ac..63ba54c34 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
-SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x"
-SRCREV = "e2d67ea77237046b703d537aec90620c22f7f629"
+SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
+SRCREV = "8413c35aca641567baf13e9b16e9839019ebf99d"
 S = "${WORKDIR}/git"
-PV = "2.1.7"
+PV = "2.2.0"
 
 inherit cmake pkgconfig lib_package
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
index 94daa951c..f7debc5ad 100644
--- 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
@@ -17,15 +17,15 @@ Upstream-Status: Submitted [1]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++++++++---------------
+ 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 0df620d3..379f8216 100644
+index 1eb5d737..6c876efa 100644
 --- a/src/synth/fluid_synth.c
 +++ b/src/synth/fluid_synth.c
-@@ -3306,10 +3306,10 @@ fluid_synth_program_reset(fluid_synth_t *synth)
-  * Synthesize a block of floating point audio to separate audio buffers (multichannel rendering). First effect channel used by reverb, second for chorus.
+@@ -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)
@@ -38,8 +38,8 @@ index 0df620d3..379f8216 100644
 + * @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
   *
-  * @note Should only be called from synthesis thread.
-@@ -3386,15 +3386,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+  * 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
@@ -71,7 +71,7 @@ index 0df620d3..379f8216 100644
              }
  
  #endif //WITH_FLOAT
-@@ -3404,12 +3416,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -3737,12 +3749,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
          {
  #ifdef WITH_FLOAT
  
@@ -86,7 +86,7 @@ index 0df620d3..379f8216 100644
              {
                  FLUID_MEMCPY(fx_right[i], &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
              }
-@@ -3417,7 +3429,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -3750,7 +3762,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
  #else //WITH_FLOAT
              int j;
  
@@ -95,7 +95,7 @@ index 0df620d3..379f8216 100644
              {
                  for(j = 0; j < num; j++)
                  {
-@@ -3425,7 +3437,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -3758,7 +3770,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
                  }
              }
  
@@ -104,7 +104,7 @@ index 0df620d3..379f8216 100644
              {
                  for(j = 0; j < num; j++)
                  {
-@@ -3456,15 +3468,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -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
@@ -140,7 +140,7 @@ index 0df620d3..379f8216 100644
              }
  
  #endif //WITH_FLOAT
-@@ -3474,12 +3501,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -3807,12 +3834,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
          {
  #ifdef WITH_FLOAT
  
@@ -155,7 +155,7 @@ index 0df620d3..379f8216 100644
              {
                  FLUID_MEMCPY(fx_right[i] + count, &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
              }
-@@ -3487,7 +3514,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -3820,7 +3847,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
  #else //WITH_FLOAT
              int j;
  
@@ -164,7 +164,7 @@ index 0df620d3..379f8216 100644
              {
                  for(j = 0; j < num; j++)
                  {
-@@ -3495,7 +3522,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
+@@ -3828,7 +3855,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
                  }
              }
  
-- 
2.26.2

[PATCH 6/6] poppler: upgrade 21.03.0 -> 21.04.0

[Andreas Müller]

Release 21.04.0
core:
 * Hide symbols by default
 * TextSelectionDumper: fix word order for RTL text
 * Fix rendering of text in some files. Issue #1052
 * Implement rendering of Masks of Image subtype. Issue #1058
 * Forms: fix unclicking standalone form buttons. Issue #1034

glib:
 * Expose more fields from MediaRendition in PopplerMedia
 * Use stock glib macro to define boxed type
 * Remove incorrecly used volatile from enum type registration code

qt5:
 * Fix crash in files with malformed signatures
 * Fix memory leak when QImage constructor "fails"

qt6:
 * Fix crash in files with malformed signatures
 * Fix memory leak when QImage constructor "fails"

utils:
 * pdfsig: New paragraph for "-sign" in manpage
 * pdfimages: Do not assert in "too big images". Issue #1061

build system:
 * Require cmake >= 3.10
 * Require Qt 5 >= 5.9
 * Require glib >= 2.56
 * Require gtk 3 >= 3.22
 * Require gdk-pixbuf >= 2.36

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../poppler/{poppler_21.03.0.bb => poppler_21.04.0.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/poppler/{poppler_21.03.0.bb => poppler_21.04.0.bb} (96%)

diff --git a/meta-oe/recipes-support/poppler/poppler_21.03.0.bb b/meta-oe/recipes-support/poppler/poppler_21.04.0.bb
similarity index 96%
rename from meta-oe/recipes-support/poppler/poppler_21.03.0.bb
rename to meta-oe/recipes-support/poppler/poppler_21.04.0.bb
index 52aa17021..de5f38036 100644
--- a/meta-oe/recipes-support/poppler/poppler_21.03.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_21.04.0.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
            file://0001-Do-not-overwrite-all-our-build-flags.patch \
            file://basename-include.patch \
            "
-SRC_URI[sha256sum] = "fd51ead4aac1d2f4684fa6e7b0ec06f0233ed21667e720a4e817e4455dd63d27"
+SRC_URI[sha256sum] = "5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c"
 
 DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
 
-- 
2.26.2

Re: [oe] [PATCH] networkmanager-openvpn: Fix packageing

[Khem Raj]

On Wed, Apr 7, 2021 at 3:18 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> Recent upgrade introduced:
> | ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue: networkmanager-openvpn: Files/directories were installed but not shipped in any package:
> |  /usr/share/metainfo
> |  /usr/share/metainfo/network-manager-openvpn.metainfo.xml
>

I wonder why my world build missed this. Is there any setting you are
use where this is triggered.

> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../networkmanager/networkmanager-openvpn_1.8.14.bb              | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
> index a1a61bed1..1f76d8ab5 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
> @@ -38,6 +38,7 @@ USERADD_PARAM_${PN} = "--system nm-openvpn"
>
>  FILES_${PN} += " \
>      ${datadir}/dbus-1 \
> +    ${datadir}/metainfo \
>      ${libdir}/NetworkManager/*.so \
>      ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
>  "
> --
> 2.26.2
>
>
> 
>

Re: [oe] [PATCH] networkmanager-openvpn: Fix packageing

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]

isn't this one already in master?
https://git.openembedded.org/meta-openembedded/commit/?id=a23fa069d0a60cf348dcc6399f7990de59105c21

On Thu, Apr 8, 2021 at 12:26 AM Khem Raj <raj.khem@gmail.com> wrote:

> On Wed, Apr 7, 2021 at 3:18 PM Andreas Müller <schnitzeltony@gmail.com>
> wrote:
> >
> > Recent upgrade introduced:
> > | ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue:
> networkmanager-openvpn: Files/directories were installed but not shipped in
> any package:
> > |  /usr/share/metainfo
> > |  /usr/share/metainfo/network-manager-openvpn.metainfo.xml
> >
>
> I wonder why my world build missed this. Is there any setting you are
> use where this is triggered.
>
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> >  .../networkmanager/networkmanager-openvpn_1.8.14.bb              | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/meta-networking/recipes-connectivity/networkmanager/
> networkmanager-openvpn_1.8.14.bb
> b/meta-networking/recipes-connectivity/networkmanager/
> networkmanager-openvpn_1.8.14.bb
> > index a1a61bed1..1f76d8ab5 100644
> > --- a/meta-networking/recipes-connectivity/networkmanager/
> networkmanager-openvpn_1.8.14.bb
> > +++ b/meta-networking/recipes-connectivity/networkmanager/
> networkmanager-openvpn_1.8.14.bb
> > @@ -38,6 +38,7 @@ USERADD_PARAM_${PN} = "--system nm-openvpn"
> >
> >  FILES_${PN} += " \
> >      ${datadir}/dbus-1 \
> > +    ${datadir}/metainfo \
> >      ${libdir}/NetworkManager/*.so \
> >      ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
> >  "
> > --
> > 2.26.2
> >
> >
> >
> >
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 2896 bytes --]

Re: [oe] [PATCH] networkmanager-openvpn: Fix packageing

[Khem Raj]

yes infact, Thanks Marttin, I was looking at wrong local tree myself
:) and wondering.

On Wed, Apr 7, 2021 at 3:32 PM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> isn't this one already in master?
> https://git.openembedded.org/meta-openembedded/commit/?id=a23fa069d0a60cf348dcc6399f7990de59105c21
>
> On Thu, Apr 8, 2021 at 12:26 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Wed, Apr 7, 2021 at 3:18 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>> >
>> > Recent upgrade introduced:
>> > | ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue: networkmanager-openvpn: Files/directories were installed but not shipped in any package:
>> > |  /usr/share/metainfo
>> > |  /usr/share/metainfo/network-manager-openvpn.metainfo.xml
>> >
>>
>> I wonder why my world build missed this. Is there any setting you are
>> use where this is triggered.
>>
>> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>> > ---
>> >  .../networkmanager/networkmanager-openvpn_1.8.14.bb              | 1 +
>> >  1 file changed, 1 insertion(+)
>> >
>> > diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
>> > index a1a61bed1..1f76d8ab5 100644
>> > --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
>> > +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
>> > @@ -38,6 +38,7 @@ USERADD_PARAM_${PN} = "--system nm-openvpn"
>> >
>> >  FILES_${PN} += " \
>> >      ${datadir}/dbus-1 \
>> > +    ${datadir}/metainfo \
>> >      ${libdir}/NetworkManager/*.so \
>> >      ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
>> >  "
>> > --
>> > 2.26.2
>> >
>> >
>> >
>> >
>>
>> 
>>

Re: [oe] [PATCH] networkmanager-openvpn: Fix packageing

[Andreas Müller]

On Thu, Apr 8, 2021 at 12:26 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Wed, Apr 7, 2021 at 3:18 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > Recent upgrade introduced:
> > | ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue: networkmanager-openvpn: Files/directories were installed but not shipped in any package:
> > |  /usr/share/metainfo
> > |  /usr/share/metainfo/network-manager-openvpn.metainfo.xml
> >
>
> I wonder why my world build missed this. Is there any setting you are
> use where this is triggered.
I wondered either :) My guess was: I am not on the very very latest
master of oe-core - maybe ${datadir}/metainfo was added to
bitbake.conf meanwhile

So before checking I decided to send this just in case openvpn-1.8.14
becomes a candidate on elder branches: it is prepared to merge back.

Andreas

Re: [oe] [PATCH] networkmanager-openvpn: Fix packageing

[Khem Raj]

yeah, it would be good, if you rebased your series on latest master or
master-next and resend it to avoid any rebasing mishaps.

On Wed, Apr 7, 2021 at 3:46 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Apr 8, 2021 at 12:26 AM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > On Wed, Apr 7, 2021 at 3:18 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > >
> > > Recent upgrade introduced:
> > > | ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue: networkmanager-openvpn: Files/directories were installed but not shipped in any package:
> > > |  /usr/share/metainfo
> > > |  /usr/share/metainfo/network-manager-openvpn.metainfo.xml
> > >
> >
> > I wonder why my world build missed this. Is there any setting you are
> > use where this is triggered.
> I wondered either :) My guess was: I am not on the very very latest
> master of oe-core - maybe ${datadir}/metainfo was added to
> bitbake.conf meanwhile
>
> So before checking I decided to send this just in case openvpn-1.8.14
> becomes a candidate on elder branches: it is prepared to merge back.
>
> Andreas

Re: [oe] [PATCH 5/6] fluidsynth: upgrade 2.1.7 -> 2.2.0

[Andreas Müller]

On Thu, Apr 8, 2021 at 12:18 AM Andreas Müller via
lists.openembedded.org
<schnitzeltony=gmail.com@lists.openembedded.org> wrote:
>
> The only fallout by API/ABI changes in my world build was meta-games/scummvm.
> Fix was sent [1]
>
> fluidsynth 2.2.0
> This release breaks ABI compatibility! Refer to the API docs for details.
> A C++98 compliant compiler is now required to build fluidsynth (mailing list thread)
>
> New features
>
>     Support loading SoundFonts >2GiB on Windows (#629)
>     Major overhaul of the sequencer and its event queue (#604)
>         Overlapping notes can be handled (#637)
>         Performance improvement, since the event queue no longer blocks the rendering thread
>         Time scale is not limited to 1000 anymore and can therefore be used for tempo changes
>     The following audio drivers have gained multi-channel support
>         DSound (#667, thanks to @jjceresa)
>         WaveOut (#667, thanks to @jjceresa)
>     The WinMIDI driver supports multiple devices (#677, thanks to @jjceresa)
>     Handle GS DT1 SysEx messages for setting whether a channel is used for rhythm part (#708, thanks to @chirs241097)
>     Support use of UTF-8 filenames under Windows (#718, thanks to @getraid-gg)
>     Improved support for overriding tempo of the MIDI player (#711, #713, thanks to @jjceresa)
>     Handle settings-related commands in user command file before initializing other objects (#739)
>     SoundFont loading has been parallelized (#746, #812, requires openMP)
>     The Oboe driver has gained a lower latency and other updates (#740, #741, #747)
>     WASAPI driver has been added (#754, thanks to @chirs241097)
>
> General
>
>     Fix race condition in fluid_player_callback (#783, thanks to @arcln)
>     Improvements to LADSPA subsystem (#795, thanks to @mawe42)
>
> [1] https://github.com/cazfi/meta-games/pull/58
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../fluidsynth/fluidsynth.inc                 |  6 ++---
>  ...te_float-Allow-zero-pointer-for-left.patch | 26 +++++++++----------
>  2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
> index 74a2683ac..63ba54c34 100644
> --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
> +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
> @@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
>  LICENSE = "LGPL-2.1"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
>
> -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x"
> -SRCREV = "e2d67ea77237046b703d537aec90620c22f7f629"
> +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
> +SRCREV = "8413c35aca641567baf13e9b16e9839019ebf99d"
>  S = "${WORKDIR}/git"
> -PV = "2.1.7"
> +PV = "2.2.0"
>
>  inherit cmake pkgconfig lib_package
> 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
> index 94daa951c..f7debc5ad 100644
> --- 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
> @@ -17,15 +17,15 @@ Upstream-Status: Submitted [1]
>
>  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>  ---
> - src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++++++++---------------
> + 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 0df620d3..379f8216 100644
> +index 1eb5d737..6c876efa 100644
>  --- a/src/synth/fluid_synth.c
>  +++ b/src/synth/fluid_synth.c
> -@@ -3306,10 +3306,10 @@ fluid_synth_program_reset(fluid_synth_t *synth)
> -  * Synthesize a block of floating point audio to separate audio buffers (multichannel rendering). First effect channel used by reverb, second for chorus.
> +@@ -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)
> @@ -38,8 +38,8 @@ index 0df620d3..379f8216 100644
>  + * @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
>    *
> -  * @note Should only be called from synthesis thread.
> -@@ -3386,15 +3386,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +  * 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
> @@ -71,7 +71,7 @@ index 0df620d3..379f8216 100644
>               }
>
>   #endif //WITH_FLOAT
> -@@ -3404,12 +3416,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -3737,12 +3749,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
>           {
>   #ifdef WITH_FLOAT
>
> @@ -86,7 +86,7 @@ index 0df620d3..379f8216 100644
>               {
>                   FLUID_MEMCPY(fx_right[i], &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
>               }
> -@@ -3417,7 +3429,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -3750,7 +3762,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
>   #else //WITH_FLOAT
>               int j;
>
> @@ -95,7 +95,7 @@ index 0df620d3..379f8216 100644
>               {
>                   for(j = 0; j < num; j++)
>                   {
> -@@ -3425,7 +3437,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -3758,7 +3770,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
>                   }
>               }
>
> @@ -104,7 +104,7 @@ index 0df620d3..379f8216 100644
>               {
>                   for(j = 0; j < num; j++)
>                   {
> -@@ -3456,15 +3468,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -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
> @@ -140,7 +140,7 @@ index 0df620d3..379f8216 100644
>               }
>
>   #endif //WITH_FLOAT
> -@@ -3474,12 +3501,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -3807,12 +3834,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
>           {
>   #ifdef WITH_FLOAT
>
> @@ -155,7 +155,7 @@ index 0df620d3..379f8216 100644
>               {
>                   FLUID_MEMCPY(fx_right[i] + count, &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
>               }
> -@@ -3487,7 +3514,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -3820,7 +3847,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
>   #else //WITH_FLOAT
>               int j;
>
> @@ -164,7 +164,7 @@ index 0df620d3..379f8216 100644
>               {
>                   for(j = 0; j < num; j++)
>                   {
> -@@ -3495,7 +3522,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> +@@ -3828,7 +3855,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
>                   }
>               }
>
> --
> 2.26.2
>
Sorry & thanks for rebasing Khem - was about to send V2

Andreas

Re: [oe] [PATCH 5/6] fluidsynth: upgrade 2.1.7 -> 2.2.0

[Khem Raj]

there is patching error on musl


ERROR: fluidsynth-2.2.0-r0 do_patch: Fuzz detected:

Applying patch 0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch
patching file src/synth/fluid_synth.c
Hunk #1 succeeded at 3628 with fuzz 1 (offset 322 lines).
Hunk #2 succeeded at 3719 (offset 333 lines).
Hunk #3 succeeded at 3749 (offset 333 lines).
Hunk #4 succeeded at 3762 (offset 333 lines).
Hunk #5 succeeded at 3770 (offset 333 lines).
Hunk #6 succeeded at 3801 (offset 333 lines).
Hunk #7 succeeded at 3834 (offset 333 lines).
Hunk #8 succeeded at 3847 (offset 333 lines).
Hunk #9 succeeded at 3855 (offset 333 lines).

fluidsynth-2.2.0: Patch log indicates that patches do not apply
cleanly. [patch-fuzz]


On Thu, Apr 8, 2021 at 12:17 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Apr 8, 2021 at 12:18 AM Andreas Müller via
> lists.openembedded.org
> <schnitzeltony=gmail.com@lists.openembedded.org> wrote:
> >
> > The only fallout by API/ABI changes in my world build was meta-games/scummvm.
> > Fix was sent [1]
> >
> > fluidsynth 2.2.0
> > This release breaks ABI compatibility! Refer to the API docs for details.
> > A C++98 compliant compiler is now required to build fluidsynth (mailing list thread)
> >
> > New features
> >
> >     Support loading SoundFonts >2GiB on Windows (#629)
> >     Major overhaul of the sequencer and its event queue (#604)
> >         Overlapping notes can be handled (#637)
> >         Performance improvement, since the event queue no longer blocks the rendering thread
> >         Time scale is not limited to 1000 anymore and can therefore be used for tempo changes
> >     The following audio drivers have gained multi-channel support
> >         DSound (#667, thanks to @jjceresa)
> >         WaveOut (#667, thanks to @jjceresa)
> >     The WinMIDI driver supports multiple devices (#677, thanks to @jjceresa)
> >     Handle GS DT1 SysEx messages for setting whether a channel is used for rhythm part (#708, thanks to @chirs241097)
> >     Support use of UTF-8 filenames under Windows (#718, thanks to @getraid-gg)
> >     Improved support for overriding tempo of the MIDI player (#711, #713, thanks to @jjceresa)
> >     Handle settings-related commands in user command file before initializing other objects (#739)
> >     SoundFont loading has been parallelized (#746, #812, requires openMP)
> >     The Oboe driver has gained a lower latency and other updates (#740, #741, #747)
> >     WASAPI driver has been added (#754, thanks to @chirs241097)
> >
> > General
> >
> >     Fix race condition in fluid_player_callback (#783, thanks to @arcln)
> >     Improvements to LADSPA subsystem (#795, thanks to @mawe42)
> >
> > [1] https://github.com/cazfi/meta-games/pull/58
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> >  .../fluidsynth/fluidsynth.inc                 |  6 ++---
> >  ...te_float-Allow-zero-pointer-for-left.patch | 26 +++++++++----------
> >  2 files changed, 16 insertions(+), 16 deletions(-)
> >
> > diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
> > index 74a2683ac..63ba54c34 100644
> > --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
> > +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
> > @@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
> >  LICENSE = "LGPL-2.1"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
> >
> > -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x"
> > -SRCREV = "e2d67ea77237046b703d537aec90620c22f7f629"
> > +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
> > +SRCREV = "8413c35aca641567baf13e9b16e9839019ebf99d"
> >  S = "${WORKDIR}/git"
> > -PV = "2.1.7"
> > +PV = "2.2.0"
> >
> >  inherit cmake pkgconfig lib_package
> > 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
> > index 94daa951c..f7debc5ad 100644
> > --- 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
> > @@ -17,15 +17,15 @@ Upstream-Status: Submitted [1]
> >
> >  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> >  ---
> > - src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++++++++---------------
> > + 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 0df620d3..379f8216 100644
> > +index 1eb5d737..6c876efa 100644
> >  --- a/src/synth/fluid_synth.c
> >  +++ b/src/synth/fluid_synth.c
> > -@@ -3306,10 +3306,10 @@ fluid_synth_program_reset(fluid_synth_t *synth)
> > -  * Synthesize a block of floating point audio to separate audio buffers (multichannel rendering). First effect channel used by reverb, second for chorus.
> > +@@ -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)
> > @@ -38,8 +38,8 @@ index 0df620d3..379f8216 100644
> >  + * @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
> >    *
> > -  * @note Should only be called from synthesis thread.
> > -@@ -3386,15 +3386,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +  * 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
> > @@ -71,7 +71,7 @@ index 0df620d3..379f8216 100644
> >               }
> >
> >   #endif //WITH_FLOAT
> > -@@ -3404,12 +3416,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -3737,12 +3749,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> >           {
> >   #ifdef WITH_FLOAT
> >
> > @@ -86,7 +86,7 @@ index 0df620d3..379f8216 100644
> >               {
> >                   FLUID_MEMCPY(fx_right[i], &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
> >               }
> > -@@ -3417,7 +3429,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -3750,7 +3762,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> >   #else //WITH_FLOAT
> >               int j;
> >
> > @@ -95,7 +95,7 @@ index 0df620d3..379f8216 100644
> >               {
> >                   for(j = 0; j < num; j++)
> >                   {
> > -@@ -3425,7 +3437,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -3758,7 +3770,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> >                   }
> >               }
> >
> > @@ -104,7 +104,7 @@ index 0df620d3..379f8216 100644
> >               {
> >                   for(j = 0; j < num; j++)
> >                   {
> > -@@ -3456,15 +3468,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -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
> > @@ -140,7 +140,7 @@ index 0df620d3..379f8216 100644
> >               }
> >
> >   #endif //WITH_FLOAT
> > -@@ -3474,12 +3501,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -3807,12 +3834,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> >           {
> >   #ifdef WITH_FLOAT
> >
> > @@ -155,7 +155,7 @@ index 0df620d3..379f8216 100644
> >               {
> >                   FLUID_MEMCPY(fx_right[i] + count, &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
> >               }
> > -@@ -3487,7 +3514,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -3820,7 +3847,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> >   #else //WITH_FLOAT
> >               int j;
> >
> > @@ -164,7 +164,7 @@ index 0df620d3..379f8216 100644
> >               {
> >                   for(j = 0; j < num; j++)
> >                   {
> > -@@ -3495,7 +3522,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> > +@@ -3828,7 +3855,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
> >                   }
> >               }
> >
> > --
> > 2.26.2
> >
> Sorry & thanks for rebasing Khem - was about to send V2
>
> Andreas
>
> 
>