Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] [WIP] fluidsynth: update to 2.0.6
@ 2019-09-12  8:37 voidlinux-github
  2019-09-12 11:09 ` voidlinux-github
                   ` (31 more replies)
  0 siblings, 32 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-12  8:37 UTC (permalink / raw)
  To: ml

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

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 9864 bytes --]

From 65b5fc36cf1e445a8a55e2da9f79ed598ca33f6f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 12 Sep 2019 18:32:05 +1000
Subject: [PATCH] fluidsynth: update to 2.0.6

---
 common/shlibs                      |  2 +-
 etc/defaults.conf                  |  2 +-
 etc/repos-remote-x86_64.conf       |  4 ++--
 etc/repos-remote.conf              | 12 ++++++------
 srcpkgs/Carla/template             |  2 +-
 srcpkgs/SLADE/template             |  2 +-
 srcpkgs/audacious-plugins/template |  2 +-
 srcpkgs/calf/template              |  2 +-
 srcpkgs/csound/template            |  2 +-
 srcpkgs/fluidsynth/template        |  8 ++++----
 srcpkgs/gst-plugins-bad1/template  |  2 +-
 srcpkgs/lmms/template              |  2 +-
 srcpkgs/prboom-plus/template       |  2 +-
 srcpkgs/qsynth/template            |  2 +-
 srcpkgs/residualvm/template        |  2 +-
 srcpkgs/scummvm/template           |  2 +-
 srcpkgs/tuxguitar/template         |  2 +-
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 75693119f70..c6f6606edec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,7 +969,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/etc/defaults.conf b/etc/defaults.conf
index 8e74759ad7b..d44d7ccff0f 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -17,7 +17,7 @@
 # [OPTIONAL]
 # Enable optional arguments to xbps-install for the host system.
 # Currently used in the binary-bootstrap bootstrap-update targets.
-XBPS_INSTALL_ARGS="--repository=https://alpha.de.repo.voidlinux.org/current --repository=https://alpha.de.repo.voidlinux.org/current/musl --repository=https://alpha.de.repo.voidlinux.org/current/aarch64"
+XBPS_INSTALL_ARGS="--repository=https://alpha.de.repo.voidlinux.org/voidlinux/current --repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/musl --repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/aarch64"
 
 # [OPTIONAL]
 # Native Compilation/Preprocessor flags for C and C++. Additional settings
diff --git a/etc/repos-remote-x86_64.conf b/etc/repos-remote-x86_64.conf
index fcc7b822f0f..6056ed0207a 100644
--- a/etc/repos-remote-x86_64.conf
+++ b/etc/repos-remote-x86_64.conf
@@ -1,3 +1,3 @@
 # Remote repositories
-repository=https://alpha.de.repo.voidlinux.org/current/multilib
-repository=https://alpha.de.repo.voidlinux.org/current/multilib/nonfree
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/multilib
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/multilib/nonfree
diff --git a/etc/repos-remote.conf b/etc/repos-remote.conf
index ec534bab0e7..7874e77deb0 100644
--- a/etc/repos-remote.conf
+++ b/etc/repos-remote.conf
@@ -1,13 +1,13 @@
 # Remote repositories
-repository=https://alpha.de.repo.voidlinux.org/current/musl
-repository=https://alpha.de.repo.voidlinux.org/current/musl/nonfree
-repository=https://alpha.de.repo.voidlinux.org/current
-repository=https://alpha.de.repo.voidlinux.org/current/nonfree
-repository=https://alpha.de.repo.voidlinux.org/current/aarch64
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/musl
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/musl/nonfree
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/nonfree
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/aarch64
 
 # Additional mirrors
 #
 # http://mirror.clarkson.edu/voidlinux/current/		US
 # http://www.gtlib.gatech.edu/pub/VoidLinux/current/	US
 # https://lug.utdallas.edu/mirror/void/			US
-# http://mirror.aarnet.edu.au/pub/voidlinux/current/	AU
+# http://alpha.de.repo.voidlinux.org/voidlinux/current/	AU
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index d3ce292f6d6..cccfad2981b 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.6
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..335d113114e 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"
diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b0f8833e286..516b3cead7b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..89c45527c35 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.0.6
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..726d7b85a77 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.0
-revision=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index e4fa1c03b1e..45a21b0b9a6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel
diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b607e283983..1cbb1b26438 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..316ba58b709 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
 hostmakedepends="pkg-config nasm"
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 27ba7a7b28a..5df6328b455 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
@ 2019-09-12 11:09 ` voidlinux-github
  2019-09-12 20:30 ` voidlinux-github
                   ` (30 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-12 11:09 UTC (permalink / raw)
  To: ml

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-530777425

Comment:
@fosslinux Check upstream for a patch, tuxguitar-r1800 should have this resolved https://sourceforge.net/p/tuxguitar/code/1800/. The normal proceeding is to take the patch and backport it. And as a general recommendation, FreeBSD ports are quite fast at updating and have quite a lot of packages, so chances are always high to find patches there if needed.

Also pls split this PR into one commit per package (1 fluidsynth: update commit, and then a revbump commit per package that was revbumbped)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
  2019-09-12 11:09 ` voidlinux-github
@ 2019-09-12 20:30 ` voidlinux-github
  2019-09-13  7:15 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (29 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-12 20:30 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-530993557

Comment:
Ok thank you. I manually adjusted the etc and accidentally committed those changes! I'll do as you said.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (2 preceding siblings ...)
  2019-09-13  7:15 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-13  7:15 ` voidlinux-github
  2019-09-13  7:16 ` voidlinux-github
                   ` (27 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-13  7:15 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 16252 bytes --]

From 36d3a1c0b25ab99f959dc077977fbba96a66ec96 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:41:17 +1000
Subject: [PATCH 01/14] fluidsynth: update to 2.0.6

---
 srcpkgs/fluidsynth/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..89c45527c35 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.0.6
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 2139eb226921451953c48aa42fa58e46a4d8d895 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:42:51 +1000
Subject: [PATCH 02/14] fix

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 75693119f70..c6f6606edec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,7 +969,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1

From faeb5c504aeaba418fa3860b907a1297119d6b76 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:21 +1000
Subject: [PATCH 03/14] Carla: rebuild against fluidsynth-2.0.6

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From bd9e70a8ade722985b6e0d88240d19fb1721c551 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:30 +1000
Subject: [PATCH 04/14] SLADE: rebuild against fluidsynth-2.0.6

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index d3ce292f6d6..cccfad2981b 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.6
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel

From 875786c4507d568db5099e277d2c8fe8138bd334 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:40 +1000
Subject: [PATCH 05/14] audacious-plugins: rebuild against fluidsynth-2.0.6

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..335d113114e 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel

From e07bd5723b768ac9b04a2b9a13d38dbc86446b8e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:49 +1000
Subject: [PATCH 06/14] calf: rebuild against fluidsynth-2.0.6

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 404a62f11a667f6290b7384adaeb5b83f7655fce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:25 +1000
Subject: [PATCH 07/14] csound: rebuild against fluidsynth-2.0.6

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b0f8833e286..516b3cead7b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From 0922ba044183a930d65967a16b28f9dbbcc6c9f5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:35 +1000
Subject: [PATCH 08/14] gst-plugins-bad1: rebuild against fluidsynth-2.0.6

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..726d7b85a77 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.0
-revision=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 086874ab5efca72bf9dafacad5fb6b23e3232943 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:46 +1000
Subject: [PATCH 09/14] lmms: rebuild against fluidsynth-2.0.6

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index e4fa1c03b1e..45a21b0b9a6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From e5b2af09be0a6b977ca8c9cf59b76cb1cfcfedff Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:16 +1000
Subject: [PATCH 10/14] prboom-plus: rebuild against fluidsynth-2.0.6

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 525a68921645d1d43eafe22b526774b9fa64a8fb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:26 +1000
Subject: [PATCH 11/14] qsynth: rebuild against fluidsynth-2.0.6

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b607e283983..1cbb1b26438 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"

From 43f1cd3c97cb949093e12ed037ed9fead3864962 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:38 +1000
Subject: [PATCH 12/14] residualvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 47df832e81844ce5da3351f3b5f7c86d8323466f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:57 +1000
Subject: [PATCH 13/14] scummvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..316ba58b709 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
 hostmakedepends="pkg-config nasm"

From 00e6ac7631c78eb4703c51b10d6811be3124def7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 17:15:30 +1000
Subject: [PATCH 14/14] tuxguitar: rebuild and patch for fluidsynth-2.0.6

---
 srcpkgs/tuxguitar/patches/fluidsynth.patch | 123 +++++++++++++++++++++
 srcpkgs/tuxguitar/template                 |   2 +-
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tuxguitar/patches/fluidsynth.patch

diff --git a/srcpkgs/tuxguitar/patches/fluidsynth.patch b/srcpkgs/tuxguitar/patches/fluidsynth.patch
new file mode 100644
index 00000000000..f435ccd99c1
--- /dev/null
+++ b/srcpkgs/tuxguitar/patches/fluidsynth.patch
@@ -0,0 +1,123 @@
+Index: TuxGuitar-fluidsynth/jni/GNUmakefile
+===================================================================
+--- TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1800)
+@@ -1,5 +1,5 @@
+ RM?=rm -f
+-CFLAGS?=-I$(shell gcj -print-file-name=include/) -fPIC
++CFLAGS?=-I../../build-scripts/native-modules/common-include -fPIC
+ LDFLAGS?=
+ LDLIBS?=-lfluidsynth
+ LDPATH?=-L/usr/lib
+Index: TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+===================================================================
+--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1800)
+@@ -4,6 +4,9 @@
+ #include <fluidsynth.h>
+ #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h"
+ 
++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro)) 
++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) 
++
+ typedef struct{
+ 	fluid_settings_t* settings;
+ 	fluid_synth_t* synth;
+@@ -217,7 +220,7 @@
+ 			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum(handle->settings,(char *)jkey, &value );
++			fluid_settings_getnum(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
+@@ -236,7 +239,7 @@
+ 			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint(handle->settings,(char *)jkey, &value );
++			fluid_settings_getint(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+@@ -256,7 +259,8 @@
+ 			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
++			fluid_settings_dupstr(handle->settings, (char *)jkey, &value);
++			
+ 			jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -273,11 +277,16 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
+ 		if (mid != 0){
++			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+-			
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getnum_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getnum_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+-			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
++			(*env)->CallVoidMethod( env, ref , mid , (jdouble) value );
+ 		}
+ 	}
+ }
+@@ -290,9 +299,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
+ 		if (mid != 0){
++			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+ 			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getint_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getint_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+ 		}
+@@ -307,8 +321,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
+ 		if (mid != 0){
++			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
++#else
++			value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++#endif
+ 			jstring jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -331,7 +351,7 @@
+ 			double maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum );
+@@ -354,7 +374,7 @@
+ 			int maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum );
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 27ba7a7b28a..5df6328b455 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
  2019-09-12 11:09 ` voidlinux-github
  2019-09-12 20:30 ` voidlinux-github
@ 2019-09-13  7:15 ` " voidlinux-github
  2019-09-13  7:15 ` voidlinux-github
                   ` (28 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-13  7:15 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 16252 bytes --]

From 36d3a1c0b25ab99f959dc077977fbba96a66ec96 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:41:17 +1000
Subject: [PATCH 01/14] fluidsynth: update to 2.0.6

---
 srcpkgs/fluidsynth/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..89c45527c35 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.0.6
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 2139eb226921451953c48aa42fa58e46a4d8d895 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:42:51 +1000
Subject: [PATCH 02/14] fix

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 75693119f70..c6f6606edec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,7 +969,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1

From faeb5c504aeaba418fa3860b907a1297119d6b76 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:21 +1000
Subject: [PATCH 03/14] Carla: rebuild against fluidsynth-2.0.6

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From bd9e70a8ade722985b6e0d88240d19fb1721c551 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:30 +1000
Subject: [PATCH 04/14] SLADE: rebuild against fluidsynth-2.0.6

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index d3ce292f6d6..cccfad2981b 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.6
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel

From 875786c4507d568db5099e277d2c8fe8138bd334 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:40 +1000
Subject: [PATCH 05/14] audacious-plugins: rebuild against fluidsynth-2.0.6

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..335d113114e 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel

From e07bd5723b768ac9b04a2b9a13d38dbc86446b8e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:49 +1000
Subject: [PATCH 06/14] calf: rebuild against fluidsynth-2.0.6

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 404a62f11a667f6290b7384adaeb5b83f7655fce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:25 +1000
Subject: [PATCH 07/14] csound: rebuild against fluidsynth-2.0.6

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b0f8833e286..516b3cead7b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From 0922ba044183a930d65967a16b28f9dbbcc6c9f5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:35 +1000
Subject: [PATCH 08/14] gst-plugins-bad1: rebuild against fluidsynth-2.0.6

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..726d7b85a77 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.0
-revision=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 086874ab5efca72bf9dafacad5fb6b23e3232943 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:46 +1000
Subject: [PATCH 09/14] lmms: rebuild against fluidsynth-2.0.6

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index e4fa1c03b1e..45a21b0b9a6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From e5b2af09be0a6b977ca8c9cf59b76cb1cfcfedff Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:16 +1000
Subject: [PATCH 10/14] prboom-plus: rebuild against fluidsynth-2.0.6

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 525a68921645d1d43eafe22b526774b9fa64a8fb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:26 +1000
Subject: [PATCH 11/14] qsynth: rebuild against fluidsynth-2.0.6

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b607e283983..1cbb1b26438 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"

From 43f1cd3c97cb949093e12ed037ed9fead3864962 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:38 +1000
Subject: [PATCH 12/14] residualvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 47df832e81844ce5da3351f3b5f7c86d8323466f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:57 +1000
Subject: [PATCH 13/14] scummvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..316ba58b709 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
 hostmakedepends="pkg-config nasm"

From 00e6ac7631c78eb4703c51b10d6811be3124def7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 17:15:30 +1000
Subject: [PATCH 14/14] tuxguitar: rebuild and patch for fluidsynth-2.0.6

---
 srcpkgs/tuxguitar/patches/fluidsynth.patch | 123 +++++++++++++++++++++
 srcpkgs/tuxguitar/template                 |   2 +-
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tuxguitar/patches/fluidsynth.patch

diff --git a/srcpkgs/tuxguitar/patches/fluidsynth.patch b/srcpkgs/tuxguitar/patches/fluidsynth.patch
new file mode 100644
index 00000000000..f435ccd99c1
--- /dev/null
+++ b/srcpkgs/tuxguitar/patches/fluidsynth.patch
@@ -0,0 +1,123 @@
+Index: TuxGuitar-fluidsynth/jni/GNUmakefile
+===================================================================
+--- TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1800)
+@@ -1,5 +1,5 @@
+ RM?=rm -f
+-CFLAGS?=-I$(shell gcj -print-file-name=include/) -fPIC
++CFLAGS?=-I../../build-scripts/native-modules/common-include -fPIC
+ LDFLAGS?=
+ LDLIBS?=-lfluidsynth
+ LDPATH?=-L/usr/lib
+Index: TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+===================================================================
+--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1800)
+@@ -4,6 +4,9 @@
+ #include <fluidsynth.h>
+ #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h"
+ 
++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro)) 
++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) 
++
+ typedef struct{
+ 	fluid_settings_t* settings;
+ 	fluid_synth_t* synth;
+@@ -217,7 +220,7 @@
+ 			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum(handle->settings,(char *)jkey, &value );
++			fluid_settings_getnum(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
+@@ -236,7 +239,7 @@
+ 			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint(handle->settings,(char *)jkey, &value );
++			fluid_settings_getint(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+@@ -256,7 +259,8 @@
+ 			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
++			fluid_settings_dupstr(handle->settings, (char *)jkey, &value);
++			
+ 			jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -273,11 +277,16 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
+ 		if (mid != 0){
++			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+-			
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getnum_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getnum_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+-			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
++			(*env)->CallVoidMethod( env, ref , mid , (jdouble) value );
+ 		}
+ 	}
+ }
+@@ -290,9 +299,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
+ 		if (mid != 0){
++			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+ 			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getint_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getint_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+ 		}
+@@ -307,8 +321,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
+ 		if (mid != 0){
++			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
++#else
++			value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++#endif
+ 			jstring jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -331,7 +351,7 @@
+ 			double maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum );
+@@ -354,7 +374,7 @@
+ 			int maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum );
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 27ba7a7b28a..5df6328b455 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (4 preceding siblings ...)
  2019-09-13  7:16 ` voidlinux-github
@ 2019-09-13  7:16 ` voidlinux-github
  2019-09-13  7:17 ` voidlinux-github
                   ` (25 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-13  7:16 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 16035 bytes --]

From c0ef446149399f83bae23a88975fb333a5eeb93d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:41:17 +1000
Subject: [PATCH 01/13] fluidsynth: update to 2.0.6

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 75693119f70..c6f6606edec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,7 +969,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..89c45527c35 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.0.6
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 42751d4b84e17dd036fc5b94ea36543072c77bd8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:21 +1000
Subject: [PATCH 02/13] Carla: rebuild against fluidsynth-2.0.6

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From ea80f95f9eba980fc4cdca9d5a38f15c21bcd5c6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:30 +1000
Subject: [PATCH 03/13] SLADE: rebuild against fluidsynth-2.0.6

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index d3ce292f6d6..cccfad2981b 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.6
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel

From 14b5fd067927b6f70615c4f3d58824c17616a4c6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:40 +1000
Subject: [PATCH 04/13] audacious-plugins: rebuild against fluidsynth-2.0.6

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..335d113114e 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel

From fab28a97b27ca3b31586a38f84e6806f0a4bb445 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:49 +1000
Subject: [PATCH 05/13] calf: rebuild against fluidsynth-2.0.6

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 3d03409bf06a5d1335812097639b6efcb6bba6f0 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:25 +1000
Subject: [PATCH 06/13] csound: rebuild against fluidsynth-2.0.6

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b0f8833e286..516b3cead7b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From b35d494442510caad3739ceb64705de5e775c476 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:35 +1000
Subject: [PATCH 07/13] gst-plugins-bad1: rebuild against fluidsynth-2.0.6

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..726d7b85a77 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.0
-revision=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 4854c0de1e69b11ec7cdd0dfcddd515358c16edd Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:46 +1000
Subject: [PATCH 08/13] lmms: rebuild against fluidsynth-2.0.6

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index e4fa1c03b1e..45a21b0b9a6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From 234a2a10f38d5b3ff36c157db779d8a3688c7dd7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:16 +1000
Subject: [PATCH 09/13] prboom-plus: rebuild against fluidsynth-2.0.6

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 9f7a24e7176171ac3c6d897728d8e1f541d2cac3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:26 +1000
Subject: [PATCH 10/13] qsynth: rebuild against fluidsynth-2.0.6

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b607e283983..1cbb1b26438 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"

From 9688a677df4aca2bae63b7d68945851107031af6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:38 +1000
Subject: [PATCH 11/13] residualvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 56bad46e81717f744636073392bc6620b72f11a5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:57 +1000
Subject: [PATCH 12/13] scummvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..316ba58b709 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
 hostmakedepends="pkg-config nasm"

From 639f2a817b98f4004a299c4106b13b2f7b814e32 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 17:15:30 +1000
Subject: [PATCH 13/13] tuxguitar: rebuild and patch for fluidsynth-2.0.6

---
 srcpkgs/tuxguitar/patches/fluidsynth.patch | 123 +++++++++++++++++++++
 srcpkgs/tuxguitar/template                 |   2 +-
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tuxguitar/patches/fluidsynth.patch

diff --git a/srcpkgs/tuxguitar/patches/fluidsynth.patch b/srcpkgs/tuxguitar/patches/fluidsynth.patch
new file mode 100644
index 00000000000..f435ccd99c1
--- /dev/null
+++ b/srcpkgs/tuxguitar/patches/fluidsynth.patch
@@ -0,0 +1,123 @@
+Index: TuxGuitar-fluidsynth/jni/GNUmakefile
+===================================================================
+--- TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1800)
+@@ -1,5 +1,5 @@
+ RM?=rm -f
+-CFLAGS?=-I$(shell gcj -print-file-name=include/) -fPIC
++CFLAGS?=-I../../build-scripts/native-modules/common-include -fPIC
+ LDFLAGS?=
+ LDLIBS?=-lfluidsynth
+ LDPATH?=-L/usr/lib
+Index: TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+===================================================================
+--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1800)
+@@ -4,6 +4,9 @@
+ #include <fluidsynth.h>
+ #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h"
+ 
++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro)) 
++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) 
++
+ typedef struct{
+ 	fluid_settings_t* settings;
+ 	fluid_synth_t* synth;
+@@ -217,7 +220,7 @@
+ 			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum(handle->settings,(char *)jkey, &value );
++			fluid_settings_getnum(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
+@@ -236,7 +239,7 @@
+ 			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint(handle->settings,(char *)jkey, &value );
++			fluid_settings_getint(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+@@ -256,7 +259,8 @@
+ 			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
++			fluid_settings_dupstr(handle->settings, (char *)jkey, &value);
++			
+ 			jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -273,11 +277,16 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
+ 		if (mid != 0){
++			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+-			
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getnum_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getnum_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+-			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
++			(*env)->CallVoidMethod( env, ref , mid , (jdouble) value );
+ 		}
+ 	}
+ }
+@@ -290,9 +299,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
+ 		if (mid != 0){
++			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+ 			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getint_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getint_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+ 		}
+@@ -307,8 +321,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
+ 		if (mid != 0){
++			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
++#else
++			value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++#endif
+ 			jstring jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -331,7 +351,7 @@
+ 			double maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum );
+@@ -354,7 +374,7 @@
+ 			int maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum );
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 27ba7a7b28a..5df6328b455 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (3 preceding siblings ...)
  2019-09-13  7:15 ` voidlinux-github
@ 2019-09-13  7:16 ` voidlinux-github
  2019-09-13  7:16 ` voidlinux-github
                   ` (26 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-13  7:16 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 16035 bytes --]

From c0ef446149399f83bae23a88975fb333a5eeb93d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:41:17 +1000
Subject: [PATCH 01/13] fluidsynth: update to 2.0.6

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 75693119f70..c6f6606edec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,7 +969,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..89c45527c35 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.0.6
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 42751d4b84e17dd036fc5b94ea36543072c77bd8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:21 +1000
Subject: [PATCH 02/13] Carla: rebuild against fluidsynth-2.0.6

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From ea80f95f9eba980fc4cdca9d5a38f15c21bcd5c6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:30 +1000
Subject: [PATCH 03/13] SLADE: rebuild against fluidsynth-2.0.6

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index d3ce292f6d6..cccfad2981b 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.6
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel

From 14b5fd067927b6f70615c4f3d58824c17616a4c6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:40 +1000
Subject: [PATCH 04/13] audacious-plugins: rebuild against fluidsynth-2.0.6

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..335d113114e 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel

From fab28a97b27ca3b31586a38f84e6806f0a4bb445 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:49 +1000
Subject: [PATCH 05/13] calf: rebuild against fluidsynth-2.0.6

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 3d03409bf06a5d1335812097639b6efcb6bba6f0 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:25 +1000
Subject: [PATCH 06/13] csound: rebuild against fluidsynth-2.0.6

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b0f8833e286..516b3cead7b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From b35d494442510caad3739ceb64705de5e775c476 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:35 +1000
Subject: [PATCH 07/13] gst-plugins-bad1: rebuild against fluidsynth-2.0.6

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..726d7b85a77 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.0
-revision=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 4854c0de1e69b11ec7cdd0dfcddd515358c16edd Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:46 +1000
Subject: [PATCH 08/13] lmms: rebuild against fluidsynth-2.0.6

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index e4fa1c03b1e..45a21b0b9a6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From 234a2a10f38d5b3ff36c157db779d8a3688c7dd7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:16 +1000
Subject: [PATCH 09/13] prboom-plus: rebuild against fluidsynth-2.0.6

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 9f7a24e7176171ac3c6d897728d8e1f541d2cac3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:26 +1000
Subject: [PATCH 10/13] qsynth: rebuild against fluidsynth-2.0.6

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b607e283983..1cbb1b26438 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"

From 9688a677df4aca2bae63b7d68945851107031af6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:38 +1000
Subject: [PATCH 11/13] residualvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 56bad46e81717f744636073392bc6620b72f11a5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:57 +1000
Subject: [PATCH 12/13] scummvm: rebuild against fluidsynth-2.0.6

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..316ba58b709 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
 hostmakedepends="pkg-config nasm"

From 639f2a817b98f4004a299c4106b13b2f7b814e32 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 17:15:30 +1000
Subject: [PATCH 13/13] tuxguitar: rebuild and patch for fluidsynth-2.0.6

---
 srcpkgs/tuxguitar/patches/fluidsynth.patch | 123 +++++++++++++++++++++
 srcpkgs/tuxguitar/template                 |   2 +-
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tuxguitar/patches/fluidsynth.patch

diff --git a/srcpkgs/tuxguitar/patches/fluidsynth.patch b/srcpkgs/tuxguitar/patches/fluidsynth.patch
new file mode 100644
index 00000000000..f435ccd99c1
--- /dev/null
+++ b/srcpkgs/tuxguitar/patches/fluidsynth.patch
@@ -0,0 +1,123 @@
+Index: TuxGuitar-fluidsynth/jni/GNUmakefile
+===================================================================
+--- TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1800)
+@@ -1,5 +1,5 @@
+ RM?=rm -f
+-CFLAGS?=-I$(shell gcj -print-file-name=include/) -fPIC
++CFLAGS?=-I../../build-scripts/native-modules/common-include -fPIC
+ LDFLAGS?=
+ LDLIBS?=-lfluidsynth
+ LDPATH?=-L/usr/lib
+Index: TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+===================================================================
+--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1800)
+@@ -4,6 +4,9 @@
+ #include <fluidsynth.h>
+ #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h"
+ 
++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro)) 
++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) 
++
+ typedef struct{
+ 	fluid_settings_t* settings;
+ 	fluid_synth_t* synth;
+@@ -217,7 +220,7 @@
+ 			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum(handle->settings,(char *)jkey, &value );
++			fluid_settings_getnum(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
+@@ -236,7 +239,7 @@
+ 			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint(handle->settings,(char *)jkey, &value );
++			fluid_settings_getint(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+@@ -256,7 +259,8 @@
+ 			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
++			fluid_settings_dupstr(handle->settings, (char *)jkey, &value);
++			
+ 			jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -273,11 +277,16 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
+ 		if (mid != 0){
++			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+-			
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getnum_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getnum_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+-			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
++			(*env)->CallVoidMethod( env, ref , mid , (jdouble) value );
+ 		}
+ 	}
+ }
+@@ -290,9 +299,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
+ 		if (mid != 0){
++			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+ 			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getint_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getint_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+ 		}
+@@ -307,8 +321,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
+ 		if (mid != 0){
++			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
++#else
++			value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++#endif
+ 			jstring jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -331,7 +351,7 @@
+ 			double maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum );
+@@ -354,7 +374,7 @@
+ 			int maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum );
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 27ba7a7b28a..5df6328b455 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (5 preceding siblings ...)
  2019-09-13  7:16 ` voidlinux-github
@ 2019-09-13  7:17 ` voidlinux-github
  2019-09-21 15:05 ` voidlinux-github
                   ` (24 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-13  7:17 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-531127592

Comment:
I've made some progress. The only remaining issue is that tuxguitar fails with
```
=> ERROR: tuxguitar-1.5.2_2: ELF files found in /usr/share:
=> ERROR:    /usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
=> ERROR:    /usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
=> ERROR:    /usr/share/tuxguitar/lib/libicedtea-sound.so
=> ERROR:    /usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so
=> ERROR:    /usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
=> ERROR: tuxguitar-1.5.2_2: cannot continue with installation!
```

I assume I need to adjust the template to vmove them to /usr/lib?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (6 preceding siblings ...)
  2019-09-13  7:17 ` voidlinux-github
@ 2019-09-21 15:05 ` voidlinux-github
  2019-10-14  5:38 ` voidlinux-github
                   ` (23 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-09-21 15:05 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-533805016

Comment:

> 
> I assume I need to adjust the template to vmove them to /usr/lib?

@fosslinux Ι changed the template as follows and everything seems to work...

```
post_build() {
	cat > tuxguitar <<_EOF
#!/bin/sh -e
cd /usr/lib/tuxguitar
exec ./tuxguitar.sh -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false "\$@"
_EOF
}

do_install() {
	vmkdir usr/lib
	vmkdir usr/share
	vcopy build-scripts/tuxguitar-linux-${_arch}/target/tuxguitar-${version}-linux-${_arch} usr/lib/tuxguitar
	for _i in alsa oss jack fluidsynth; do
		vcopy build-scripts/native-modules/tuxguitar-${_i}-linux-${_arch}/target/build/* usr/lib/tuxguitar/
	done

	for _i in 16 24 32 48 64 96; do
		vmkdir usr/share/icons/hicolor/${_i}x${_i}/mimetypes
		vinstall TuxGuitar/share/skins/Lavender/icon-${_i}x${_i}.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps tuxguitar.png
		for _j in audio-x-{tuxguitar,gtp,ptb}; do
			ln -s ../apps/tuxguitar.png ${DESTDIR}/usr/share/icons/hicolor/${_i}x${_i}/mimetypes/$_j.png
		done
	done

	vinstall misc/tuxguitar.xml 644 usr/share/mime/packages
	vinstall misc/tuxguitar.desktop 644 usr/share/applications
	vbin tuxguitar
}
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (7 preceding siblings ...)
  2019-09-21 15:05 ` voidlinux-github
@ 2019-10-14  5:38 ` voidlinux-github
  2019-12-29 13:19 ` voidlinux-github
                   ` (22 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-10-14  5:38 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-541508546

Comment:
Thank you @mobinmob, I've been a bit busy recently but will try this out shortly.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (8 preceding siblings ...)
  2019-10-14  5:38 ` voidlinux-github
@ 2019-12-29 13:19 ` voidlinux-github
  2019-12-29 21:30 ` voidlinux-github
                   ` (21 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-12-29 13:19 UTC (permalink / raw)
  To: ml

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

New comment by luzpaz on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-569504910

Comment:
Any progress on this ?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (9 preceding siblings ...)
  2019-12-29 13:19 ` voidlinux-github
@ 2019-12-29 21:30 ` voidlinux-github
  2019-12-29 22:12 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (20 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-12-29 21:30 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-569543670

Comment:
I plan to attempt to finish this today.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (10 preceding siblings ...)
  2019-12-29 21:30 ` voidlinux-github
@ 2019-12-29 22:12 ` " voidlinux-github
  2020-01-01 21:46 ` voidlinux-github
                   ` (19 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2019-12-29 22:12 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 17984 bytes --]

From e653f11bd18a4162542cdead08c166b46be9dee3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:21 +1000
Subject: [PATCH 01/16] Carla: rebuild against fluidsynth-2.1.0

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From d40a375c416d0567d70106eeed2a4bcc4c4326fe Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:30 +1000
Subject: [PATCH 02/16] SLADE: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 07f6efa7a8c..245462391a5 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"

From bdeea1fd620374cbb8a21dda2b90a9de271261bf Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:44:49 +1000
Subject: [PATCH 03/16] calf: rebuild against fluidsynth-2.1.0

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 15d863613c159dc7433785abfb10f72f8dbed69f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:25 +1000
Subject: [PATCH 04/16] csound: rebuild against fluidsynth-2.1.0

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 558c9a1240a..e174adb0b9a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From 2432f29d39818b176d339f4ab2946f438c7795d9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:35 +1000
Subject: [PATCH 05/16] gst-plugins-bad1: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6ae3de3548c..6df09fb2a9a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.2
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 91b6d80412e41ff59602ddff47d65e5838d84594 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:45:46 +1000
Subject: [PATCH 06/16] lmms: rebuild against fluidsynth-2.1.0

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index f11605aff13..9a92c66fe18 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From df8cac17bce90d57386d197c5e04ce7676bf2c99 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:16 +1000
Subject: [PATCH 07/16] prboom-plus: rebuild against fluidsynth-2.1.0

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 3311a1a07645eb33e7e246a7b62437ba4e3af775 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:26 +1000
Subject: [PATCH 08/16] qsynth: rebuild against fluidsynth-2.1.0

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index cf870fa6696..0663ca8f219 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From f0071409318f31d32be9491166bd518cf082a355 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:38 +1000
Subject: [PATCH 09/16] residualvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 2fb3169a7162eeecc31299f19b3a551923f156fc Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:46:57 +1000
Subject: [PATCH 10/16] scummvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 70e5a912720..b02bbe0cfd4 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From 298a6fe131d87dc47b60af08dc980eff6eba70cd Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 17:15:30 +1000
Subject: [PATCH 11/16] tuxguitar: rebuild and patch for fluidsynth-2.1.0

---
 srcpkgs/tuxguitar/patches/fluidsynth.patch | 123 +++++++++++++++++++++
 srcpkgs/tuxguitar/template                 |   2 +-
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tuxguitar/patches/fluidsynth.patch

diff --git a/srcpkgs/tuxguitar/patches/fluidsynth.patch b/srcpkgs/tuxguitar/patches/fluidsynth.patch
new file mode 100644
index 00000000000..f435ccd99c1
--- /dev/null
+++ b/srcpkgs/tuxguitar/patches/fluidsynth.patch
@@ -0,0 +1,123 @@
+Index: TuxGuitar-fluidsynth/jni/GNUmakefile
+===================================================================
+--- TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/GNUmakefile	(revision 1800)
+@@ -1,5 +1,5 @@
+ RM?=rm -f
+-CFLAGS?=-I$(shell gcj -print-file-name=include/) -fPIC
++CFLAGS?=-I../../build-scripts/native-modules/common-include -fPIC
+ LDFLAGS?=
+ LDLIBS?=-lfluidsynth
+ LDPATH?=-L/usr/lib
+Index: TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+===================================================================
+--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1799)
++++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c	(revision 1800)
+@@ -4,6 +4,9 @@
+ #include <fluidsynth.h>
+ #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h"
+ 
++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro)) 
++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) 
++
+ typedef struct{
+ 	fluid_settings_t* settings;
+ 	fluid_synth_t* synth;
+@@ -217,7 +220,7 @@
+ 			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum(handle->settings,(char *)jkey, &value );
++			fluid_settings_getnum(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
+@@ -236,7 +239,7 @@
+ 			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint(handle->settings,(char *)jkey, &value );
++			fluid_settings_getint(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+@@ -256,7 +259,8 @@
+ 			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
++			fluid_settings_dupstr(handle->settings, (char *)jkey, &value);
++			
+ 			jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -273,11 +277,16 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
+ 		if (mid != 0){
++			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+-			
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getnum_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getnum_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+-			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
++			(*env)->CallVoidMethod( env, ref , mid , (jdouble) value );
+ 		}
+ 	}
+ }
+@@ -290,9 +299,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
+ 		if (mid != 0){
++			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+ 			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getint_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getint_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+ 		}
+@@ -307,8 +321,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
+ 		if (mid != 0){
++			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
++#else
++			value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++#endif
+ 			jstring jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -331,7 +351,7 @@
+ 			double maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum );
+@@ -354,7 +374,7 @@
+ 			int maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum );
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 428ca30abca..d2c3f261930 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

From 3cd89f062ce0b5c088efa0f91bfbafdc3862ed92 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 30 Dec 2019 09:05:05 +1100
Subject: [PATCH 12/16] SDL2_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 80d654951b9..324db64a73e 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel

From d27ed49ca00a7b110d99ee4839a2f5fbfdf92a6f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 30 Dec 2019 09:05:19 +1100
Subject: [PATCH 13/16] SDL_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f6..db87ae1829d 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"

From f41a1bc96a325a209dc2ab87c8553f6b879004fb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 30 Dec 2019 09:05:31 +1100
Subject: [PATCH 14/16] audacious-plugins: rebuild against fluidsynth-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index a50d65e7819..dc26ad1e39a 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"

From c4f6e4baeb0b35afce83f8be766bdef42211ca58 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 30 Dec 2019 09:05:42 +1100
Subject: [PATCH 15/16] gzdoom: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 83935bacf7c..08702e64ec6 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.2.4
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake

From 07074137a3ec89ae19303af4d79eb994f560d6d3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 12:41:17 +1000
Subject: [PATCH 16/16] fluidsynth: update to 2.1.0

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b1c87a98aa..e93cb284123 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -974,7 +974,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..c0a3e06c5a1 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (11 preceding siblings ...)
  2019-12-29 22:12 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-01 21:46 ` voidlinux-github
  2020-01-01 21:50 ` voidlinux-github
                   ` (18 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 21:46 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 13250 bytes --]

From f302dabf8e2ef9ae7a3a889ecf166f9e47468910 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 01/17] gzdoom: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 83935bacf7c..08702e64ec6 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.2.4
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake

From a36e1b98a6b17f91eb74d875c7ebb58bf7bff8ca Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 02/17] audacious-plugins: rebuild against fluidsynth-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index a50d65e7819..dc26ad1e39a 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"

From d75768007c3b36d91f0c4aa3419e74e93129297c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 03/17] SDL_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f6..db87ae1829d 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"

From 47d29f4b47f9db340401eb02f9670a04809dd1f1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 04/17] SDL2_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 80d654951b9..324db64a73e 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel

From f437b828d0dcd430ce426fccc13efa793f7b64e4 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 05/17] scummvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 70e5a912720..b02bbe0cfd4 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From 445a624e4697cdcf7aa4b544b8cc8da2f7d5c37c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 06/17] residualvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From fdc43fb8ae492120fce664356a357fe42e2f941a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 07/17] qsynth: rebuild against fluidsynth-2.1.0

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index cf870fa6696..0663ca8f219 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From 633feae29059eef4e1a50eaf4840e2a38a5b0f5c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 08/17] prboom-plus: rebuild against fluidsynth-2.1.0

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 84e6a0c98c1d8f374c664bf2899621c3571ed7e0 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 09/17] lmms: rebuild against fluidsynth-2.1.0

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index f11605aff13..9a92c66fe18 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From c11c76e17e2feadf55eaebc5dd8517299b9c1e48 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 10/17] gst-plugins-bad1: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6ae3de3548c..6df09fb2a9a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.2
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 703c28586d2c2fee15c7e0c67c84388f5de84d18 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 11/17] csound: rebuild against fluidsynth-2.1.0

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 558c9a1240a..e174adb0b9a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From a0b9b286d2a05df23339f1221d5559d63a7e8174 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 12/17] calf: rebuild against fluidsynth-2.1.0

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 4577b7bdeccbc69b958a2c6d54bc81b07e83d6fd Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 13/17] SLADE: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 07f6efa7a8c..245462391a5 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"

From e54c0915f2d849f2ff14b7540b65ea4a9d5476aa Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 14/17] Carla: rebuild against fluidsynth-2.1.0

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From 8bbab6d53f66e4c1038c3535c015de9c1a73f728 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:49 +0000
Subject: [PATCH 15/17] Carla: add patch for GCC 9

---
 srcpkgs/Carla/patches/remove-memory-include.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/Carla/patches/remove-memory-include.patch

diff --git a/srcpkgs/Carla/patches/remove-memory-include.patch b/srcpkgs/Carla/patches/remove-memory-include.patch
new file mode 100644
index 00000000000..e2a303d922b
--- /dev/null
+++ b/srcpkgs/Carla/patches/remove-memory-include.patch
@@ -0,0 +1,10 @@
+--- source/bridges-ui/Makefile 2019-03-22 04:32:17.000000000 +1100
++++ source/bridges-ui/Makefile  2019-12-30 14:09:50.801149275 +1100
+@@ -223,6 +223,7 @@
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating CarlaBridgeToolkitQt5.moc"
+	@$(MOC_QT5) $< -DMOC_PARSING -o $@
++	@sed -i "/#include <memory>/d" $@
+
+ $(OBJDIR)/resources.qt5.cpp: ../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)

From 43597662c0be82c1a63cc40197e02de12d2b7f1a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:07:02 +0000
Subject: [PATCH 16/17] tuxguitar: rebuild againast fluidsynth-2.1.0

---
 srcpkgs/tuxguitar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 428ca30abca..d2c3f261930 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

From c8913e5b041a20c3a45277e034e6889f021576d1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 17/17] fluidsynth: update to 2.1.0

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b1c87a98aa..e93cb284123 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -974,7 +974,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..c0a3e06c5a1 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (12 preceding siblings ...)
  2020-01-01 21:46 ` voidlinux-github
@ 2020-01-01 21:50 ` voidlinux-github
  2020-01-01 22:11 ` voidlinux-github
                   ` (17 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 21:50 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570086271

Comment:
So, I've got quite a bit further.

Tuxguitar has been fixed with the recent update; hooray!

I've rebased against master to remove the merge conflicts and manually fixed each of those conflicts.

There's been some new packages added with a fluidsynth dependency so I've rebuilt each of those against it.

I did a rather lengthy build of each of these packages cross compiled.

It seems that the following still needs fixing:
- [ ] scummvm/residualvm on musl (AFAICT unrelated to this PR), they have the same error.
- [ ] lmms on musl.
- [ ] SLADE on musl.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (13 preceding siblings ...)
  2020-01-01 21:50 ` voidlinux-github
@ 2020-01-01 22:11 ` voidlinux-github
  2020-01-01 22:26 ` voidlinux-github
                   ` (16 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 22:11 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570086271

Comment:
So, I've got quite a bit further.

Tuxguitar has been fixed with the recent update; hooray!

I've rebased against master to remove the merge conflicts and manually fixed each of those conflicts.

There's been some new packages added with a fluidsynth dependency so I've rebuilt each of those against it.

I did a rather lengthy build of each of these packages cross compiled.

It seems that the following still needs fixing:
- [ ] scummvm/residualvm. (AFAICT unrelated to this PR), they have the same error.
- [ ] lmms on musl.
- [ ] SLADE on musl.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (14 preceding siblings ...)
  2020-01-01 22:11 ` voidlinux-github
@ 2020-01-01 22:26 ` voidlinux-github
  2020-01-01 22:27 ` voidlinux-github
                   ` (15 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 22:26 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570086271

Comment:
So, I've got quite a bit further.

Tuxguitar has been fixed with the recent update; hooray!

I've rebased against master to remove the merge conflicts and manually fixed each of those conflicts.

There's been some new packages added with a fluidsynth dependency so I've rebuilt each of those against it.

I did a rather lengthy build of each of these packages cross compiled.

It seems that the following still needs fixing:
- [x] scummvm/residualvm. (AFAICT unrelated to this PR), they have the same error.
- [ ] lmms on musl.
- [ ] SLADE on musl.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (15 preceding siblings ...)
  2020-01-01 22:26 ` voidlinux-github
@ 2020-01-01 22:27 ` voidlinux-github
  2020-01-01 22:28 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (14 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 22:27 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570088650

Comment:
The issue with scummvm was include paths; void's SDL is in `/usr/include/SDL` rather than `/usr/include` where scummvm expects to find it. So I just patched it to use `/usr/include/SDL`.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (16 preceding siblings ...)
  2020-01-01 22:27 ` voidlinux-github
@ 2020-01-01 22:28 ` " voidlinux-github
  2020-01-01 22:28 ` voidlinux-github
                   ` (13 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 22:28 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 15934 bytes --]

From 7d9e9b4ba8348f70814e417108099a50e55382d5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 01/18] fluidsynth: update to 2.1.0

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b1c87a98aa..e93cb284123 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -974,7 +974,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..c0a3e06c5a1 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From cac87c67125e282c0dcd06d6f6aefb1c1af0d25d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 02/18] gzdoom: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 83935bacf7c..08702e64ec6 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.2.4
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake

From ada925bf75f64c9805f8da6dea79bc13e0f90266 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 03/18] audacious-plugins: rebuild against fluidsynth-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index a50d65e7819..dc26ad1e39a 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"

From d5faa8a9e5b06c58a70740f6808c0966292494fb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 04/18] SDL_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f6..db87ae1829d 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"

From d5c6485cb3388401d2ced350d9af2483978d785f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 05/18] SDL2_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 80d654951b9..324db64a73e 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel

From 290cad47bb4a1a2a867a5ba357aece47990a7f87 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 1 Jan 2020 22:27:23 +0000
Subject: [PATCH 06/18] scummvm: fix SDL dependencies and includes

---
 srcpkgs/scummvm/patches/sdl-header.patch | 36 ++++++++++++++++++++++++
 srcpkgs/scummvm/template                 |  6 ++--
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/scummvm/patches/sdl-header.patch

diff --git a/srcpkgs/scummvm/patches/sdl-header.patch b/srcpkgs/scummvm/patches/sdl-header.patch
new file mode 100644
index 00000000000..588862d3c76
--- /dev/null
+++ b/srcpkgs/scummvm/patches/sdl-header.patch
@@ -0,0 +1,36 @@
+diff -u backends/platform/sdl/sdl-sys.h backends/platform/sdl/sdl-sys.h
+--- backends/platform/sdl/sdl-sys.h	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl-sys.h	2020-01-01 22:13:24.034946909 +0000
+@@ -141,13 +141,13 @@
+ #if defined(__SYMBIAN32__)
+ #include <esdl\SDL.h>
+ #else
+-#include <SDL.h>
++#include <SDL/SDL.h>
+ #endif
+ 
+ // Ignore warnings from system headers pulled by SDL
+ #pragma warning(push)
+ #pragma warning(disable:4121) // alignment of a member was sensitive to packing
+-#include <SDL_syswm.h>
++#include <SDL/SDL_syswm.h>
+ #pragma warning(pop)
+ 
+ // Restore the forbidden exceptions from the hack above
+diff -u backends/platform/sdl/sdl.cpp backends/platform/sdl/sdl.cpp
+--- backends/platform/sdl/sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl.cpp	2020-01-01 22:13:35.726989837 +0000
+@@ -58,11 +58,11 @@
+ #endif
+ 
+ #ifdef USE_SDL_NET
+-#include <SDL_net.h>
++#include <SDL/SDL_net.h>
+ #endif
+ 
+ #if SDL_VERSION_ATLEAST(2, 0, 0)
+-#include <SDL_clipboard.h>
++#include <SDL/SDL_clipboard.h>
+ #endif
+ 
+ OSystem_SDL::OSystem_SDL()
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 70e5a912720..83697e606c7 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -5,11 +5,11 @@ revision=1
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config nasm"
+hostmakedepends="pkg-config nasm git"
 makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel
  fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel
- freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel
- libmpeg2-devel liba52-devel"
+ freetype-devel libjpeg-turbo-devel libcurl-devel SDL-devel SDL_net-devel
+ SDL2_net-devel libmpeg2-devel liba52-devel"
 short_desc="Free implementation of LucasArts' SCUMM interpreter"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"

From dcee92b04139cb24f8b3627ed9685db95b7afdf1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 07/18] scummvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 83697e606c7..b01f899a2e9 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From 09a084aa5f5b9b267dca435e66ee7f9fda265b57 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 08/18] residualvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 42c3fcf7c32829c3d85d234b88e064e027a02d78 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 09/18] qsynth: rebuild against fluidsynth-2.1.0

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index cf870fa6696..0663ca8f219 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From df64a33f73008b26e614d20cc7b91f9dec659b06 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 10/18] prboom-plus: rebuild against fluidsynth-2.1.0

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From d76810fa8991da08b24ec9b8673fb2d2869e7f1e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 11/18] lmms: rebuild against fluidsynth-2.1.0

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index f11605aff13..9a92c66fe18 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From ab71f5d4c89e675d417ebab167a32109348a30e2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 12/18] gst-plugins-bad1: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6ae3de3548c..6df09fb2a9a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.2
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 12ee42fcbcc2b0d2e541b604cb32c7941a4f2bc0 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 13/18] csound: rebuild against fluidsynth-2.1.0

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 558c9a1240a..e174adb0b9a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From cbf4d4cd441da891061a547fffa3bf15ad0a04cf Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 14/18] calf: rebuild against fluidsynth-2.1.0

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 8e7bdcd50639ec593c09478434ba0503cf1660d1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 15/18] SLADE: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 07f6efa7a8c..245462391a5 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"

From e25549ffe6922687994e8a1d57ad1445df3404fb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:49 +0000
Subject: [PATCH 16/18] Carla: add patch for GCC 9

---
 srcpkgs/Carla/patches/remove-memory-include.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/Carla/patches/remove-memory-include.patch

diff --git a/srcpkgs/Carla/patches/remove-memory-include.patch b/srcpkgs/Carla/patches/remove-memory-include.patch
new file mode 100644
index 00000000000..e2a303d922b
--- /dev/null
+++ b/srcpkgs/Carla/patches/remove-memory-include.patch
@@ -0,0 +1,10 @@
+--- source/bridges-ui/Makefile 2019-03-22 04:32:17.000000000 +1100
++++ source/bridges-ui/Makefile  2019-12-30 14:09:50.801149275 +1100
+@@ -223,6 +223,7 @@
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating CarlaBridgeToolkitQt5.moc"
+	@$(MOC_QT5) $< -DMOC_PARSING -o $@
++	@sed -i "/#include <memory>/d" $@
+
+ $(OBJDIR)/resources.qt5.cpp: ../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)

From 7dcd2d263a7ff9d5bf572bd6e6fc47186c102257 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 17/18] Carla: rebuild against fluidsynth-2.1.0

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From c2c041022254cf831506ada0e7097e5afa0e68a4 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:07:02 +0000
Subject: [PATCH 18/18] tuxguitar: rebuild againast fluidsynth-2.1.0

---
 srcpkgs/tuxguitar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 428ca30abca..d2c3f261930 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.0.6
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (17 preceding siblings ...)
  2020-01-01 22:28 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-01 22:28 ` voidlinux-github
  2020-01-02  3:55 ` [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0 voidlinux-github
                   ` (12 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-01 22:28 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570086271

Comment:
So, I've got quite a bit further.

Started by updating to fluidsynth 2.1.0.

Tuxguitar has been fixed with the recent update; hooray!

I've rebased against master to remove the merge conflicts and manually fixed each of those conflicts.

There's been some new packages added with a fluidsynth dependency so I've rebuilt each of those against it.

I did a rather lengthy build of each of these packages cross compiled.

It seems that the following still needs fixing:
- [x] scummvm/residualvm. (AFAICT unrelated to this PR), they have the same error.
- [ ] lmms on musl.
- [ ] SLADE on musl.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (18 preceding siblings ...)
  2020-01-01 22:28 ` voidlinux-github
@ 2020-01-02  3:55 ` voidlinux-github
  2020-01-02  6:38 ` voidlinux-github
                   ` (11 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  3:55 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.1.0
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 17796 bytes --]

From 7d9e9b4ba8348f70814e417108099a50e55382d5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 01/19] fluidsynth: update to 2.1.0

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8b1c87a98aa..e93cb284123 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -974,7 +974,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..c0a3e06c5a1 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 1a3ba57b5b6fe2cc81eda81e78facf03fc88f752 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 2 Jan 2020 03:54:10 +0000
Subject: [PATCH 02/19] fluisynth fix

---
 .../fluidsynth/patches/attribute-broken.patch    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/fluidsynth/patches/attribute-broken.patch

diff --git a/srcpkgs/fluidsynth/patches/attribute-broken.patch b/srcpkgs/fluidsynth/patches/attribute-broken.patch
new file mode 100644
index 00000000000..4a2e5e1617e
--- /dev/null
+++ b/srcpkgs/fluidsynth/patches/attribute-broken.patch
@@ -0,0 +1,16 @@
+--- include/fluidsynth/log.h	2019-11-30 14:42:25.000000000 +0000
++++ include/fluidsynth/log.h	2020-01-01 22:38:50.356605363 +0000
+@@ -77,12 +77,7 @@
+ 
+ FLUIDSYNTH_API void fluid_default_log_function(int level, const char *message, void *data);
+ 
+-FLUIDSYNTH_API int fluid_log(int level, const char *fmt, ...)
+-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+-__attribute__ ((format (printf, 2, 3)))
+-#endif
+-;
+-
++FLUIDSYNTH_API int fluid_log(int level, const char *fmt, ...);
+ 
+ #ifdef __cplusplus
+ }

From 9e5581d990f932c1bbd6922c6307b29864d74b7b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 03/19] gzdoom: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 83935bacf7c..08702e64ec6 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.2.4
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake

From 9476b72d450b4b9031f5868e2f06ad152e78bf33 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 04/19] audacious-plugins: rebuild against fluidsynth-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index a50d65e7819..dc26ad1e39a 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"

From 068d9f3d72d8b78f4dc4ce6c702952713a75a697 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 05/19] SDL_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f6..db87ae1829d 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"

From 18f936b0e22173de9e577a9597d543b29c2664d2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 06/19] SDL2_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 80d654951b9..324db64a73e 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel

From 2f9e3fff029a2ae7929c452d4682c3c8f0ea78f4 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Wed, 1 Jan 2020 22:27:23 +0000
Subject: [PATCH 07/19] scummvm: fix SDL includes

---
 srcpkgs/scummvm/patches/sdl-headers.patch | 50 +++++++++++++++++++++++
 srcpkgs/scummvm/template                  |  6 +--
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/scummvm/patches/sdl-headers.patch

diff --git a/srcpkgs/scummvm/patches/sdl-headers.patch b/srcpkgs/scummvm/patches/sdl-headers.patch
new file mode 100644
index 00000000000..0474b5141d1
--- /dev/null
+++ b/srcpkgs/scummvm/patches/sdl-headers.patch
@@ -0,0 +1,50 @@
+diff -ru backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
+--- backends/platform/androidsdl/androidsdl-sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/androidsdl/androidsdl-sdl.cpp	2020-01-02 02:58:46.051265044 +0000
+@@ -27,8 +27,8 @@
+ #include "backends/platform/androidsdl/androidsdl-sdl.h"
+ #include "backends/events/androidsdl/androidsdl-events.h"
+ #include "backends/graphics/androidsdl/androidsdl-graphics.h"
+-#include <SDL_android.h>
+-#include <SDL_screenkeyboard.h>
++#include <SDL2/SDL_android.h>
++#include <SDL2/SDL_screenkeyboard.h>
+ 
+ void OSystem_ANDROIDSDL::initBackend() {
+ 	// Create the backend custom managers
+diff -ru backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
+--- backends/platform/sdl/sdl-sys.h	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl-sys.h	2020-01-02 02:58:46.099265215 +0000
+@@ -141,13 +141,13 @@
+ #if defined(__SYMBIAN32__)
+ #include <esdl\SDL.h>
+ #else
+-#include <SDL.h>
++#include <SDL2/SDL.h>
+ #endif
+ 
+ // Ignore warnings from system headers pulled by SDL
+ #pragma warning(push)
+ #pragma warning(disable:4121) // alignment of a member was sensitive to packing
+-#include <SDL_syswm.h>
++#include <SDL2/SDL_syswm.h>
+ #pragma warning(pop)
+ 
+ // Restore the forbidden exceptions from the hack above
+diff -ru backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
+--- backends/platform/sdl/sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl.cpp	2020-01-02 02:58:46.099265215 +0000
+@@ -58,11 +58,11 @@
+ #endif
+ 
+ #ifdef USE_SDL_NET
+-#include <SDL_net.h>
++#include <SDL2/SDL_net.h>
+ #endif
+ 
+ #if SDL_VERSION_ATLEAST(2, 0, 0)
+-#include <SDL_clipboard.h>
++#include <SDL2/SDL_clipboard.h>
+ #endif
+ 
+ OSystem_SDL::OSystem_SDL()
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 70e5a912720..83697e606c7 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -5,11 +5,11 @@ revision=1
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config nasm"
+hostmakedepends="pkg-config nasm git"
 makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel
  fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel
- freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel
- libmpeg2-devel liba52-devel"
+ freetype-devel libjpeg-turbo-devel libcurl-devel SDL-devel SDL_net-devel
+ SDL2_net-devel libmpeg2-devel liba52-devel"
 short_desc="Free implementation of LucasArts' SCUMM interpreter"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later"

From bfcd27a457ac13aa876bbfe987c14f27bed369b5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 08/19] scummvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/scummvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 83697e606c7..b01f899a2e9 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From ce267c7353c96e195eaa8e64c5cfa9cea7c803e7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 09/19] residualvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 2cb59f49b23786da560cad72be3487138bb63487 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 10/19] qsynth: rebuild against fluidsynth-2.1.0

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index cf870fa6696..0663ca8f219 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From 62c54c2276ccb8ff810f61e6aa68a007e6dd4d98 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 11/19] prboom-plus: rebuild against fluidsynth-2.1.0

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From c101f79bfcd1988a8085cb71ed65fdd67a34cc86 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 12/19] lmms: rebuild against fluidsynth-2.1.0

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index f11605aff13..9a92c66fe18 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From 12b76e2cf38d5c8b06005f4ea1c54507629d4d6c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 13/19] gst-plugins-bad1: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6ae3de3548c..6df09fb2a9a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.2
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 45d387674a39ace1b1ca6a29b02fa643c6e6cda7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 14/19] csound: rebuild against fluidsynth-2.1.0

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 558c9a1240a..e174adb0b9a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From f8d6e27c5acb3b23223ccc708ebe7a3e6c51fe31 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 15/19] calf: rebuild against fluidsynth-2.1.0

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 9e80c03f7aebc95a29101d0693538213d9ff76a8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 16/19] SLADE: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 07f6efa7a8c..245462391a5 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"

From 26b19e2428d5c13f952fa001fbb162fc9108df55 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:49 +0000
Subject: [PATCH 17/19] Carla: add patch for GCC 9

---
 srcpkgs/Carla/patches/remove-memory-include.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/Carla/patches/remove-memory-include.patch

diff --git a/srcpkgs/Carla/patches/remove-memory-include.patch b/srcpkgs/Carla/patches/remove-memory-include.patch
new file mode 100644
index 00000000000..e2a303d922b
--- /dev/null
+++ b/srcpkgs/Carla/patches/remove-memory-include.patch
@@ -0,0 +1,10 @@
+--- source/bridges-ui/Makefile 2019-03-22 04:32:17.000000000 +1100
++++ source/bridges-ui/Makefile  2019-12-30 14:09:50.801149275 +1100
+@@ -223,6 +223,7 @@
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating CarlaBridgeToolkitQt5.moc"
+	@$(MOC_QT5) $< -DMOC_PARSING -o $@
++	@sed -i "/#include <memory>/d" $@
+
+ $(OBJDIR)/resources.qt5.cpp: ../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)

From 9d67453b727e4e19ad010c2967ed4f39d1fea649 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 18/19] Carla: rebuild against fluidsynth-2.1.0

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From 3d22151a340e74c95c4620b6c5a414d466273f1c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:07:02 +0000
Subject: [PATCH 19/19] tuxguitar: rebuild againast fluidsynth-2.1.0

---
 srcpkgs/tuxguitar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 428ca30abca..d2c3f261930 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (19 preceding siblings ...)
  2020-01-02  3:55 ` [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0 voidlinux-github
@ 2020-01-02  6:38 ` voidlinux-github
  2020-01-02  7:01 ` voidlinux-github
                   ` (10 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  6:38 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570128694

Comment:
And more scummvm painfulness.... seems to be fixed now with that patch.

Moving on to lmms, seems to just be a missing dependency. Testing builds now.

Then will try and fix residulalvm and SLADE.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (20 preceding siblings ...)
  2020-01-02  6:38 ` voidlinux-github
@ 2020-01-02  7:01 ` voidlinux-github
  2020-01-02  7:01 ` voidlinux-github
                   ` (9 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  7:01 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570131228

Comment:
ResidualVM is working now from the fluidsynth __attribute__ patch.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (21 preceding siblings ...)
  2020-01-02  7:01 ` voidlinux-github
@ 2020-01-02  7:01 ` voidlinux-github
  2020-01-02  7:17 ` voidlinux-github
                   ` (8 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  7:01 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570131228

Comment:
ResidualVM is working now from the fluidsynth `__attribute__` patch.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (22 preceding siblings ...)
  2020-01-02  7:01 ` voidlinux-github
@ 2020-01-02  7:17 ` voidlinux-github
  2020-01-02  7:17 ` voidlinux-github
                   ` (7 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  7:17 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570133318

Comment:
Lmms and SLADE both have very strange errors, seeming to be related to missing dependencies on musl.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (23 preceding siblings ...)
  2020-01-02  7:17 ` voidlinux-github
@ 2020-01-02  7:17 ` voidlinux-github
  2020-01-02  7:17 ` voidlinux-github
                   ` (6 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  7:17 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570133318

Comment:
Lmms and SLADE both have very strange errors, seeming to be related to missing dependencies on musl. However it seems those are already there!

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (24 preceding siblings ...)
  2020-01-02  7:17 ` voidlinux-github
@ 2020-01-02  7:17 ` voidlinux-github
  2020-01-02  9:37 ` voidlinux-github
                   ` (5 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  7:17 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570133318

Comment:
Lmms and SLADE both have very strange errors, seeming to be related to missing dependencies on musl. However it seems those are already there!

I'm not sure what is causing this.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (25 preceding siblings ...)
  2020-01-02  7:17 ` voidlinux-github
@ 2020-01-02  9:37 ` voidlinux-github
  2020-01-02  9:37 ` voidlinux-github
                   ` (4 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  9:37 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570156787

Comment:
Just tested ScummVM and ResidualVM on x86_64-musl and have some remarks:

* The error wich is addressed by the `__attribute__` patch has been fixed in ScummVM/ResidualVM here: https://github.com/scummvm/scummvm/commit/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6. So if no other package has a problem with this I think it might be better not to patch fluidsynth but ScummVM/ResidualVM instead and remove that patch when a new stable version is released.
* I don’t think `git` is necessary in `hostmakedepends` for ScummVM. They use it to get a version number for unstable/nightly builds. So the error message can safely be ignored.
* Why did you add `SDL-devel` and `SDL_net-devel` to ScummVM’s `makedepends`? I don’t think mixing SDL versions is a good idea. ;) The problem with finding the headers might be a result of this (e.g. `sdl2-config` vs. `sdl-config`). For me it works just fine with SDL2 only, no patch needed.

Local builds with the changes mentioned above applied work for me without any problem so far. :)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (26 preceding siblings ...)
  2020-01-02  9:37 ` voidlinux-github
@ 2020-01-02  9:37 ` voidlinux-github
  2020-01-02 10:59 ` voidlinux-github
                   ` (3 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02  9:37 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570156787

Comment:
Just tested ScummVM and ResidualVM on x86_64-musl and have some remarks:

* The error which is addressed by the `__attribute__` patch has been fixed in ScummVM/ResidualVM here: https://github.com/scummvm/scummvm/commit/8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6. So if no other package has a problem with this I think it might be better not to patch fluidsynth but ScummVM/ResidualVM instead and remove that patch when a new stable version is released.
* I don’t think `git` is necessary in `hostmakedepends` for ScummVM. They use it to get a version number for unstable/nightly builds. So the error message can safely be ignored.
* Why did you add `SDL-devel` and `SDL_net-devel` to ScummVM’s `makedepends`? I don’t think mixing SDL versions is a good idea. ;) The problem with finding the headers might be a result of this (e.g. `sdl2-config` vs. `sdl-config`). For me it works just fine with SDL2 only, no patch needed.

Local builds with the changes mentioned above applied work for me without any problem so far. :)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (27 preceding siblings ...)
  2020-01-02  9:37 ` voidlinux-github
@ 2020-01-02 10:59 ` voidlinux-github
  2020-01-03 21:57 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (2 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-02 10:59 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-570175759

Comment:
lmms and SLADE build just fine here for musl (native and cross). The errors you get are probably because of a polluted masterdir. It should work after zapping it. :)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (28 preceding siblings ...)
  2020-01-02 10:59 ` voidlinux-github
@ 2020-01-03 21:57 ` " voidlinux-github
  2020-01-03 22:05 ` voidlinux-github
  2020-01-12 17:05 ` voidlinux-github
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-03 21:57 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.1.0
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 16923 bytes --]

From dd2955451be6d5d064733acefb19ffdda6493844 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 01/18] fluidsynth: update to 2.1.0

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..4cdbcf69d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -974,7 +974,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..c0a3e06c5a1 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 92c9b068f59c0c518721cfe685e0c488b28acc73 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 02/18] gzdoom: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 83935bacf7c..08702e64ec6 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.2.4
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake

From a3cfa79b624bb7d61cfec83cd59577277111b869 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 03/18] audacious-plugins: rebuild against fluidsynth-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index a50d65e7819..dc26ad1e39a 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"

From 59380e130e08ce035aba157a03393a0097c4a354 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 04/18] SDL_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f6..db87ae1829d 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"

From 2149c5a0229b4c404955f714c95a15f3743b1557 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 05/18] SDL2_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 80d654951b9..324db64a73e 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel

From 61a928570daa03862b00012bfd5b9a7ba8610a1b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 06/18] scummvm: rebuild and patch against fluidsynth-2.1.0

---
 srcpkgs/scummvm/patches/fluidsynth-2.1.patch | 29 ++++++++++++++++++++
 srcpkgs/scummvm/template                     |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.1.patch

diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.1.patch b/srcpkgs/scummvm/patches/fluidsynth-2.1.patch
new file mode 100644
index 00000000000..a319352f38d
--- /dev/null
+++ b/srcpkgs/scummvm/patches/fluidsynth-2.1.patch
@@ -0,0 +1,29 @@
+--- audio/softsynth/fluidsynth.cpp	2019-10-04 21:41:29.000000000 +0000
++++ audio/softsynth/fluidsynth.cpp	2020-01-03 08:45:52.431870573 +0000
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+@@ -35,8 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-#include <fluidsynth.h>
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 70e5a912720..b02bbe0cfd4 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From 1d75328010df9168bbb6bd1f91c0055f9d8e307a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 3 Jan 2020 05:34:43 +0000
Subject: [PATCH 07/18] scummvm: patch SDL includes

---
 srcpkgs/scummvm/patches/sdl-headers.patch | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 srcpkgs/scummvm/patches/sdl-headers.patch

diff --git a/srcpkgs/scummvm/patches/sdl-headers.patch b/srcpkgs/scummvm/patches/sdl-headers.patch
new file mode 100644
index 00000000000..0474b5141d1
--- /dev/null
+++ b/srcpkgs/scummvm/patches/sdl-headers.patch
@@ -0,0 +1,50 @@
+diff -ru backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
+--- backends/platform/androidsdl/androidsdl-sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/androidsdl/androidsdl-sdl.cpp	2020-01-02 02:58:46.051265044 +0000
+@@ -27,8 +27,8 @@
+ #include "backends/platform/androidsdl/androidsdl-sdl.h"
+ #include "backends/events/androidsdl/androidsdl-events.h"
+ #include "backends/graphics/androidsdl/androidsdl-graphics.h"
+-#include <SDL_android.h>
+-#include <SDL_screenkeyboard.h>
++#include <SDL2/SDL_android.h>
++#include <SDL2/SDL_screenkeyboard.h>
+ 
+ void OSystem_ANDROIDSDL::initBackend() {
+ 	// Create the backend custom managers
+diff -ru backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
+--- backends/platform/sdl/sdl-sys.h	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl-sys.h	2020-01-02 02:58:46.099265215 +0000
+@@ -141,13 +141,13 @@
+ #if defined(__SYMBIAN32__)
+ #include <esdl\SDL.h>
+ #else
+-#include <SDL.h>
++#include <SDL2/SDL.h>
+ #endif
+ 
+ // Ignore warnings from system headers pulled by SDL
+ #pragma warning(push)
+ #pragma warning(disable:4121) // alignment of a member was sensitive to packing
+-#include <SDL_syswm.h>
++#include <SDL2/SDL_syswm.h>
+ #pragma warning(pop)
+ 
+ // Restore the forbidden exceptions from the hack above
+diff -ru backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
+--- backends/platform/sdl/sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl.cpp	2020-01-02 02:58:46.099265215 +0000
+@@ -58,11 +58,11 @@
+ #endif
+ 
+ #ifdef USE_SDL_NET
+-#include <SDL_net.h>
++#include <SDL2/SDL_net.h>
+ #endif
+ 
+ #if SDL_VERSION_ATLEAST(2, 0, 0)
+-#include <SDL_clipboard.h>
++#include <SDL2/SDL_clipboard.h>
+ #endif
+ 
+ OSystem_SDL::OSystem_SDL()

From 16960a0b9042ae92bc1e5db6c6c4baf72e2d3d39 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 08/18] residualvm: rebuild against fluidsynth-2.1.0

---
 srcpkgs/residualvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 9099da650afd5716484e67085a97cf413a2ac28c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 09/18] qsynth: rebuild against fluidsynth-2.1.0

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index cf870fa6696..0663ca8f219 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From fcd9055f2366d41a8b80f51d9dc0ddbba18086ec Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 10/18] prboom-plus: rebuild against fluidsynth-2.1.0

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From eb254bb59a37ee719ad259cadeb6cb1b65db651c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 11/18] lmms: rebuild against fluidsynth-2.1.0

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index f11605aff13..9a92c66fe18 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From a220dcea471f27dd83a428d45169b541f1c2e6ce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 12/18] gst-plugins-bad1: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6ae3de3548c..6df09fb2a9a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.2
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 7723929e3848f415194ecdfb6919daa5402908ad Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 13/18] csound: rebuild against fluidsynth-2.1.0

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 558c9a1240a..e174adb0b9a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From ae29fc14089456fa727f90ade9f09cb0f2ea80ba Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 14/18] calf: rebuild against fluidsynth-2.1.0

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From 437d791251f51167ec64151c94af7b7edbceeae5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 15/18] SLADE: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 07f6efa7a8c..245462391a5 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"

From c92095fa626f5969f7f094e090bf16e894465269 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:49 +0000
Subject: [PATCH 16/18] Carla: add patch for GCC 9

---
 srcpkgs/Carla/patches/remove-memory-include.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/Carla/patches/remove-memory-include.patch

diff --git a/srcpkgs/Carla/patches/remove-memory-include.patch b/srcpkgs/Carla/patches/remove-memory-include.patch
new file mode 100644
index 00000000000..e2a303d922b
--- /dev/null
+++ b/srcpkgs/Carla/patches/remove-memory-include.patch
@@ -0,0 +1,10 @@
+--- source/bridges-ui/Makefile 2019-03-22 04:32:17.000000000 +1100
++++ source/bridges-ui/Makefile  2019-12-30 14:09:50.801149275 +1100
+@@ -223,6 +223,7 @@
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating CarlaBridgeToolkitQt5.moc"
+	@$(MOC_QT5) $< -DMOC_PARSING -o $@
++	@sed -i "/#include <memory>/d" $@
+
+ $(OBJDIR)/resources.qt5.cpp: ../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)

From d0c37f7fa98a34ff42f1d33656e4d7aeb90b5908 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 17/18] Carla: rebuild against fluidsynth-2.1.0

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From 874674e94a05a147a2dab2db712046128729bbc8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:07:02 +0000
Subject: [PATCH 18/18] tuxguitar: rebuild againast fluidsynth-2.1.0

---
 srcpkgs/tuxguitar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 428ca30abca..d2c3f261930 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (29 preceding siblings ...)
  2020-01-03 21:57 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-03 22:05 ` voidlinux-github
  2020-01-12 17:05 ` voidlinux-github
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-03 22:05 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.1.0
updated to 2.0.6. bumped shlibs. Also took maintainership.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 18162 bytes --]

From dd2955451be6d5d064733acefb19ffdda6493844 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 01/18] fluidsynth: update to 2.1.0

---
 common/shlibs               | 2 +-
 srcpkgs/fluidsynth/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..4cdbcf69d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -974,7 +974,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.1 libfluidsynth-1.1.5_1
+libfluidsynth.so.2 libfluidsynth-2.0.6_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..c0a3e06c5a1 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,18 +1,18 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
 hostmakedepends="pkg-config"
 makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
 short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
+checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 92c9b068f59c0c518721cfe685e0c488b28acc73 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:28 +0000
Subject: [PATCH 02/18] gzdoom: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gzdoom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 83935bacf7c..08702e64ec6 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.2.4
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake

From a3cfa79b624bb7d61cfec83cd59577277111b869 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 03/18] audacious-plugins: rebuild against fluidsynth-2.1.0

---
 srcpkgs/audacious-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index a50d65e7819..dc26ad1e39a 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=3.10.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="pkg-config"

From 59380e130e08ce035aba157a03393a0097c4a354 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 04/18] SDL_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 14c9815b4f6..db87ae1829d 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL_mixer'
 pkgname=SDL_mixer
 version=1.2.12
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"

From 2149c5a0229b4c404955f714c95a15f3743b1557 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:29 +0000
Subject: [PATCH 05/18] SDL2_mixer: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SDL2_mixer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template
index 80d654951b9..324db64a73e 100644
--- a/srcpkgs/SDL2_mixer/template
+++ b/srcpkgs/SDL2_mixer/template
@@ -1,7 +1,7 @@
 # Template file for 'SDL2_mixer'
 pkgname=SDL2_mixer
 version=2.0.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel

From 61a928570daa03862b00012bfd5b9a7ba8610a1b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 06/18] scummvm: rebuild and patch against fluidsynth-2.1.0

---
 srcpkgs/scummvm/patches/fluidsynth-2.1.patch | 29 ++++++++++++++++++++
 srcpkgs/scummvm/template                     |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.1.patch

diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.1.patch b/srcpkgs/scummvm/patches/fluidsynth-2.1.patch
new file mode 100644
index 00000000000..a319352f38d
--- /dev/null
+++ b/srcpkgs/scummvm/patches/fluidsynth-2.1.patch
@@ -0,0 +1,29 @@
+--- audio/softsynth/fluidsynth.cpp	2019-10-04 21:41:29.000000000 +0000
++++ audio/softsynth/fluidsynth.cpp	2020-01-03 08:45:52.431870573 +0000
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+@@ -35,8 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-#include <fluidsynth.h>
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 70e5a912720..b02bbe0cfd4 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From 1d75328010df9168bbb6bd1f91c0055f9d8e307a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 3 Jan 2020 05:34:43 +0000
Subject: [PATCH 07/18] scummvm: patch SDL includes

---
 srcpkgs/scummvm/patches/sdl-headers.patch | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 srcpkgs/scummvm/patches/sdl-headers.patch

diff --git a/srcpkgs/scummvm/patches/sdl-headers.patch b/srcpkgs/scummvm/patches/sdl-headers.patch
new file mode 100644
index 00000000000..0474b5141d1
--- /dev/null
+++ b/srcpkgs/scummvm/patches/sdl-headers.patch
@@ -0,0 +1,50 @@
+diff -ru backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
+--- backends/platform/androidsdl/androidsdl-sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/androidsdl/androidsdl-sdl.cpp	2020-01-02 02:58:46.051265044 +0000
+@@ -27,8 +27,8 @@
+ #include "backends/platform/androidsdl/androidsdl-sdl.h"
+ #include "backends/events/androidsdl/androidsdl-events.h"
+ #include "backends/graphics/androidsdl/androidsdl-graphics.h"
+-#include <SDL_android.h>
+-#include <SDL_screenkeyboard.h>
++#include <SDL2/SDL_android.h>
++#include <SDL2/SDL_screenkeyboard.h>
+ 
+ void OSystem_ANDROIDSDL::initBackend() {
+ 	// Create the backend custom managers
+diff -ru backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
+--- backends/platform/sdl/sdl-sys.h	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl-sys.h	2020-01-02 02:58:46.099265215 +0000
+@@ -141,13 +141,13 @@
+ #if defined(__SYMBIAN32__)
+ #include <esdl\SDL.h>
+ #else
+-#include <SDL.h>
++#include <SDL2/SDL.h>
+ #endif
+ 
+ // Ignore warnings from system headers pulled by SDL
+ #pragma warning(push)
+ #pragma warning(disable:4121) // alignment of a member was sensitive to packing
+-#include <SDL_syswm.h>
++#include <SDL2/SDL_syswm.h>
+ #pragma warning(pop)
+ 
+ // Restore the forbidden exceptions from the hack above
+diff -ru backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
+--- backends/platform/sdl/sdl.cpp	2019-10-04 21:41:29.000000000 +0000
++++ backends/platform/sdl/sdl.cpp	2020-01-02 02:58:46.099265215 +0000
+@@ -58,11 +58,11 @@
+ #endif
+ 
+ #ifdef USE_SDL_NET
+-#include <SDL_net.h>
++#include <SDL2/SDL_net.h>
+ #endif
+ 
+ #if SDL_VERSION_ATLEAST(2, 0, 0)
+-#include <SDL_clipboard.h>
++#include <SDL2/SDL_clipboard.h>
+ #endif
+ 
+ OSystem_SDL::OSystem_SDL()

From 2809367568496b7f531733fec6f07551c16b4588 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 08/18] residualvm: rebuild and patch against fluidsynth-2.1.0

---
 .../residualvm/patches/fluidsynth-2.1.patch   | 29 +++++++++++++++++++
 srcpkgs/residualvm/template                   |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/residualvm/patches/fluidsynth-2.1.patch

diff --git a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch
new file mode 100644
index 00000000000..a319352f38d
--- /dev/null
+++ b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch
@@ -0,0 +1,29 @@
+--- audio/softsynth/fluidsynth.cpp	2019-10-04 21:41:29.000000000 +0000
++++ audio/softsynth/fluidsynth.cpp	2020-01-03 08:45:52.431870573 +0000
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+@@ -35,8 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-#include <fluidsynth.h>
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 556a3d48750..583d2a489ec 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"

From 6dcec686bcf5796c1784a2dbef17c9d4a7005a04 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 09/18] qsynth: rebuild against fluidsynth-2.1.0

---
 srcpkgs/qsynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index cf870fa6696..0663ca8f219 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From 3be6266a5deb9f2dab11e1dfa16f8d1373ff8589 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 10/18] prboom-plus: rebuild against fluidsynth-2.1.0

---
 srcpkgs/prboom-plus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index 07dd2c5ebe6..8b8c71c9199 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From 8ee56e9e824dbcbb24c32d54af1b127b83bfe0a4 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 11/18] lmms: rebuild against fluidsynth-2.1.0

---
 srcpkgs/lmms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index f11605aff13..9a92c66fe18 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"

From c5a457453f4e11850909d58d8c3b62fef76effcb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 12/18] gst-plugins-bad1: rebuild against fluidsynth-2.1.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 6ae3de3548c..6df09fb2a9a 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.16.2
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 2c63f65e796c91ee52d4350deb3d1fdee624bd29 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 13/18] csound: rebuild against fluidsynth-2.1.0

---
 srcpkgs/csound/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index 558c9a1240a..e174adb0b9a 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.13.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From e770c069c3464e8e83a602f1d032d5e2c9f2842c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 14/18] calf: rebuild against fluidsynth-2.1.0

---
 srcpkgs/calf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 18398fd936d..8826ba7711d 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From e7d716edf6becb396f5f8d299c0a195a0d1ff29d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 15/18] SLADE: rebuild against fluidsynth-2.1.0

---
 srcpkgs/SLADE/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 07f6efa7a8c..245462391a5 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
 hostmakedepends="pkg-config p7zip"

From 56a8b06c628b780cc791f05a2b76ce07c1f1f073 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:49 +0000
Subject: [PATCH 16/18] Carla: add patch for GCC 9

---
 srcpkgs/Carla/patches/remove-memory-include.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/Carla/patches/remove-memory-include.patch

diff --git a/srcpkgs/Carla/patches/remove-memory-include.patch b/srcpkgs/Carla/patches/remove-memory-include.patch
new file mode 100644
index 00000000000..e2a303d922b
--- /dev/null
+++ b/srcpkgs/Carla/patches/remove-memory-include.patch
@@ -0,0 +1,10 @@
+--- source/bridges-ui/Makefile 2019-03-22 04:32:17.000000000 +1100
++++ source/bridges-ui/Makefile  2019-12-30 14:09:50.801149275 +1100
+@@ -223,6 +223,7 @@
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating CarlaBridgeToolkitQt5.moc"
+	@$(MOC_QT5) $< -DMOC_PARSING -o $@
++	@sed -i "/#include <memory>/d" $@
+
+ $(OBJDIR)/resources.qt5.cpp: ../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)

From 87f90da676c7317715c648055eb6059ea8e95c36 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:31 +0000
Subject: [PATCH 17/18] Carla: rebuild against fluidsynth-2.1.0

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..d651d804a85 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.0.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 make_build_args="DEFAULT_QT=5"

From 9c4e1b546cb9cfde24272311c5afbfdca64afe46 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:07:02 +0000
Subject: [PATCH 18/18] tuxguitar: rebuild againast fluidsynth-2.1.0

---
 srcpkgs/tuxguitar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 428ca30abca..d2c3f261930 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.3
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [WIP] fluidsynth: update to 2.1.0
  2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
                   ` (30 preceding siblings ...)
  2020-01-03 22:05 ` voidlinux-github
@ 2020-01-12 17:05 ` voidlinux-github
  31 siblings, 0 replies; 33+ messages in thread
From: voidlinux-github @ 2020-01-12 17:05 UTC (permalink / raw)
  To: ml

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/14416#issuecomment-573435699

Comment:
I don’t think the sdl-headers patch for scummvm is necessary – perhaps you just forgot to remove it. Anyway, it works for me without.

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, back to index

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
2019-09-12 11:09 ` voidlinux-github
2019-09-12 20:30 ` voidlinux-github
2019-09-13  7:15 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-13  7:15 ` voidlinux-github
2019-09-13  7:16 ` voidlinux-github
2019-09-13  7:16 ` voidlinux-github
2019-09-13  7:17 ` voidlinux-github
2019-09-21 15:05 ` voidlinux-github
2019-10-14  5:38 ` voidlinux-github
2019-12-29 13:19 ` voidlinux-github
2019-12-29 21:30 ` voidlinux-github
2019-12-29 22:12 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-01 21:46 ` voidlinux-github
2020-01-01 21:50 ` voidlinux-github
2020-01-01 22:11 ` voidlinux-github
2020-01-01 22:26 ` voidlinux-github
2020-01-01 22:27 ` voidlinux-github
2020-01-01 22:28 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-01 22:28 ` voidlinux-github
2020-01-02  3:55 ` [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0 voidlinux-github
2020-01-02  6:38 ` voidlinux-github
2020-01-02  7:01 ` voidlinux-github
2020-01-02  7:01 ` voidlinux-github
2020-01-02  7:17 ` voidlinux-github
2020-01-02  7:17 ` voidlinux-github
2020-01-02  7:17 ` voidlinux-github
2020-01-02  9:37 ` voidlinux-github
2020-01-02  9:37 ` voidlinux-github
2020-01-02 10:59 ` voidlinux-github
2020-01-03 21:57 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-03 22:05 ` voidlinux-github
2020-01-12 17:05 ` voidlinux-github

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git