Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] fluidsynth: update to 2.1.1
@ 2020-05-19 15:11 Clyybber
  2020-05-19 23:17 ` fosslinux
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: Clyybber @ 2020-05-19 15:11 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 1641 bytes --]

From 1cf23b9b226cf60e80f3ad0ee518b3aaa9b34aa4 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 19 May 2020 17:21:52 +0200
Subject: [PATCH] fluidsynth: update to 2.1.1

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

diff --git a/common/shlibs b/common/shlibs
index 962143cc7cd..c18211db614 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -973,7 +973,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.1.1_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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
@ 2020-05-19 23:17 ` fosslinux
  2020-05-20 10:11 ` [PR PATCH] [Updated] " Clyybber
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: fosslinux @ 2020-05-19 23:17 UTC (permalink / raw)
  To: ml


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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-631136932

Comment:
Hi! Each of the packages that have a dependency on fluidsynth need to be revbumped, `xrevshlibs` will help you with that. See my PR when I tried to do this, I was going to try again but I'm more than happy for someone else to do it ^.^ https://github.com/void-linux/void-packages/pull/14416 you'll need to test that each of the bumped packages compile, some of them aren't small packages :)

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

* Re: [PR PATCH] [Updated] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
  2020-05-19 23:17 ` fosslinux
@ 2020-05-20 10:11 ` Clyybber
  2020-05-20 23:23 ` fosslinux
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Clyybber @ 2020-05-20 10:11 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 7346 bytes --]

From 40702340541673b9b03948c42ee9d55a01bca3ae Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 19 May 2020 17:21:52 +0200
Subject: [PATCH] fluidsynth: update to 2.1.1

---
 common/shlibs                      | 2 +-
 srcpkgs/Carla/template             | 2 +-
 srcpkgs/SLADE/template             | 2 +-
 srcpkgs/ardour/template            | 2 +-
 srcpkgs/audacious-plugins/template | 2 +-
 srcpkgs/calf/template              | 2 +-
 srcpkgs/csound/template            | 2 +-
 srcpkgs/fluidsynth/template        | 6 +++---
 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 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 962143cc7cd..c18211db614 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -973,7 +973,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.1.1_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/Carla/template b/srcpkgs/Carla/template
index d7998ca66fe..8ea0fb0ab7b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 10228f37b84..f3a5ae447ea 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.11
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip which"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 9839dcd003b..b0e1152a5d5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=5.12
-revision=4
+revision=5
 build_style=waf
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 5c86edb9006..9f30316896b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"
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 5533353d825..e9f17a3400b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.14.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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 8d79b85cec8..87a58efbda7 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=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index c877a17007a..6948d94ce11 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=3
+revision=4
 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 1a04b2af22e..3446f2a1807 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 1691b73f732..38cba292bba 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 783e7a43576..12be03569aa 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
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] 16+ messages in thread

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
  2020-05-19 23:17 ` fosslinux
  2020-05-20 10:11 ` [PR PATCH] [Updated] " Clyybber
@ 2020-05-20 23:23 ` fosslinux
  2020-05-21  8:33 ` newbluemoon
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: fosslinux @ 2020-05-20 23:23 UTC (permalink / raw)
  To: ml


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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-631788951

Comment:
Looking good, I will test locally for you soon. However, you should split each revbump into a commit per package: https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes

So, like:

> Carla: rebuild for fluidsynth 2.1.1

Commit example: https://github.com/void-linux/void-packages/commit/95c9ef42bb6805f88743d87c39ccb0c7fa4a5ec4

HTH!

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (2 preceding siblings ...)
  2020-05-20 23:23 ` fosslinux
@ 2020-05-21  8:33 ` newbluemoon
  2020-05-21  8:38 ` newbluemoon
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: newbluemoon @ 2020-05-21  8:33 UTC (permalink / raw)
  To: ml


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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-631960628

Comment:
ResidualVM still needs this patch: https://github.com/void-linux/void-packages/pull/14416/commits/de47c11010d32f0b4a3bf6d08ccde4cae550afcb
ScummVM has been updated in the meantime so it’s fixed there.

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (3 preceding siblings ...)
  2020-05-21  8:33 ` newbluemoon
@ 2020-05-21  8:38 ` newbluemoon
  2020-05-21 10:10 ` [PR PATCH] [Updated] " Clyybber
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: newbluemoon @ 2020-05-21  8:38 UTC (permalink / raw)
  To: ml


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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-631960628

Comment:
ResidualVM still needs this patch: https://github.com/void-linux/void-packages/pull/14416/commits/de47c11010d32f0b4a3bf6d08ccde4cae550afcb
ScummVM has been updated in the meantime so it’s fixed there.

Edit: With the latest development version ResidualVM doesn’t need the patch anymore; the last release is rather old.

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

* Re: [PR PATCH] [Updated] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (4 preceding siblings ...)
  2020-05-21  8:38 ` newbluemoon
@ 2020-05-21 10:10 ` Clyybber
  2020-05-27 20:23 ` Chocimier
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Clyybber @ 2020-05-21 10:10 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 7346 bytes --]

From 40702340541673b9b03948c42ee9d55a01bca3ae Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 19 May 2020 17:21:52 +0200
Subject: [PATCH] fluidsynth: update to 2.1.1

---
 common/shlibs                      | 2 +-
 srcpkgs/Carla/template             | 2 +-
 srcpkgs/SLADE/template             | 2 +-
 srcpkgs/ardour/template            | 2 +-
 srcpkgs/audacious-plugins/template | 2 +-
 srcpkgs/calf/template              | 2 +-
 srcpkgs/csound/template            | 2 +-
 srcpkgs/fluidsynth/template        | 6 +++---
 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 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 962143cc7cd..c18211db614 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -973,7 +973,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.1.1_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/Carla/template b/srcpkgs/Carla/template
index d7998ca66fe..8ea0fb0ab7b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 10228f37b84..f3a5ae447ea 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.11
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip which"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 9839dcd003b..b0e1152a5d5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=5.12
-revision=4
+revision=5
 build_style=waf
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 5c86edb9006..9f30316896b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"
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 5533353d825..e9f17a3400b 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.14.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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 8d79b85cec8..87a58efbda7 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=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index c877a17007a..6948d94ce11 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.1
-revision=3
+revision=4
 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 1a04b2af22e..3446f2a1807 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 1691b73f732..38cba292bba 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 783e7a43576..12be03569aa 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
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] 16+ messages in thread

* Re: [PR PATCH] [Updated] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (5 preceding siblings ...)
  2020-05-21 10:10 ` [PR PATCH] [Updated] " Clyybber
@ 2020-05-27 20:23 ` Chocimier
  2020-05-27 20:24 ` Chocimier
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-05-27 20:23 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 11186 bytes --]

From eb32b479371f2d10d3648151d30d10f15a550c66 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:50:46 +0200
Subject: [PATCH 01/13] fluidsynth: update to 2.1.1

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

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..63a08c02ffe 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.1.1_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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From fdfb1c0b4f59d2332651794d2b83ce100ac3e58b Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:17 +0200
Subject: [PATCH 02/13] Carla: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d7998ca66fe..8ea0fb0ab7b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From a4c4cee39fafb5e3f0b504e7c3cba171a217396c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:45 +0200
Subject: [PATCH 03/13] ardour: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 9839dcd003b..b0e1152a5d5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=5.12
-revision=4
+revision=5
 build_style=waf
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"

From 2ebbaf0d204e0ea796578e0ba9672628a219c91c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:18 +0200
Subject: [PATCH 04/13] audacious-plugins: rebuild for fluidsynth 2.1.1

---
 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 5c86edb9006..9f30316896b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"

From 8bcc4fe164c216f95775d3efe4030db27de09837 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:46 +0200
Subject: [PATCH 05/13] calf: rebuild for fluidsynth 2.1.1

---
 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 829c5e62d171e2c754f5d89c74bcb17a49bc2782 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:53:18 +0200
Subject: [PATCH 06/13] csound: rebuild for fluidsynth 2.1.1

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

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

From 389330bc8419e4ab8f3765f5c16888564fc51ddf Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:12 +0200
Subject: [PATCH 07/13] lmms: rebuild for fluidsynth 2.1.1

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

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

From 70730e23701b4b41dff62d846280eba03644614c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:26 +0200
Subject: [PATCH 08/13] prboom-plus: rebuild for fluidsynth 2.1.1

---
 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 028f1a9c78603ee05b86f990c7db3600c3fb1212 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:42 +0200
Subject: [PATCH 09/13] qsynth: rebuild for fluidsynth 2.1.1

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

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

From 1db2b3cc265d2836fff0c334023e4c720e3e7068 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:06 +0200
Subject: [PATCH 10/13] scummvm: rebuild for fluidsynth 2.1.1

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

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

From 3917ddd085795bda6b0cd6991d5046fd57358975 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:24 +0200
Subject: [PATCH 11/13] tuxguitar: rebuild for fluidsynth 2.1.1

---
 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 068c219717a466a30f7b4c641e56ea878ab480d6 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:40 +0200
Subject: [PATCH 12/13] SLADE: rebuild for fluidsynth 2.1.1

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

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

From 5c2cb58d8f14cf0fe131c6da66efc5623945bc7d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 13/13] residualvm: rebuild and patch against fluidsynth 2.1.1

---
 .../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 1691b73f732..38cba292bba 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)"

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

* Re: [PR PATCH] [Updated] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (6 preceding siblings ...)
  2020-05-27 20:23 ` Chocimier
@ 2020-05-27 20:24 ` Chocimier
  2020-05-27 20:26 ` Chocimier
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-05-27 20:24 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 14940 bytes --]

From eb32b479371f2d10d3648151d30d10f15a550c66 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:50:46 +0200
Subject: [PATCH 01/13] fluidsynth: update to 2.1.1

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

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..63a08c02ffe 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.1.1_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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From fdfb1c0b4f59d2332651794d2b83ce100ac3e58b Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:17 +0200
Subject: [PATCH 02/13] Carla: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d7998ca66fe..8ea0fb0ab7b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From a4c4cee39fafb5e3f0b504e7c3cba171a217396c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:45 +0200
Subject: [PATCH 03/13] ardour: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 9839dcd003b..b0e1152a5d5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=5.12
-revision=4
+revision=5
 build_style=waf
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"

From 2ebbaf0d204e0ea796578e0ba9672628a219c91c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:18 +0200
Subject: [PATCH 04/13] audacious-plugins: rebuild for fluidsynth 2.1.1

---
 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 5c86edb9006..9f30316896b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"

From 8bcc4fe164c216f95775d3efe4030db27de09837 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:46 +0200
Subject: [PATCH 05/13] calf: rebuild for fluidsynth 2.1.1

---
 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 829c5e62d171e2c754f5d89c74bcb17a49bc2782 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:53:18 +0200
Subject: [PATCH 06/13] csound: rebuild for fluidsynth 2.1.1

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

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

From 389330bc8419e4ab8f3765f5c16888564fc51ddf Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:12 +0200
Subject: [PATCH 07/13] lmms: rebuild for fluidsynth 2.1.1

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

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

From 70730e23701b4b41dff62d846280eba03644614c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:26 +0200
Subject: [PATCH 08/13] prboom-plus: rebuild for fluidsynth 2.1.1

---
 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 028f1a9c78603ee05b86f990c7db3600c3fb1212 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:42 +0200
Subject: [PATCH 09/13] qsynth: rebuild for fluidsynth 2.1.1

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

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

From 69f401d157f2ac46ec107e8d4406821589e1e99a Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:06 +0200
Subject: [PATCH 10/13] scummvm: rebuild for fluidsynth 2.1.1

---
 .../patches/Fluidsynth-v2.1-part1.patch       | 27 ++++++++++
 .../patches/Fluidsynth-v2.1-part2.patch       | 53 +++++++++++++++++++
 srcpkgs/scummvm/template                      |  2 +-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch

diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
new file mode 100644
index 00000000000..ef7ff6e8871
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
@@ -0,0 +1,27 @@
+From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Sun, 15 Dec 2019 22:22:20 +0000
+Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+
+
+This is as reported by eriktorbjorn.
+---
+ audio/softsynth/fluidsynth.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 4034b2ffc36..33a74a15247 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -35,7 +35,12 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
++// needed to allow compilation, as reported by eriktorbjorn on 20191215
++// This is in include/fluidsynth/log.h around line 82
++#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+ #include <fluidsynth.h>
++#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+ 
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
new file mode 100644
index 00000000000..4b948dd21f7
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
@@ -0,0 +1,53 @@
+From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Tue, 17 Dec 2019 04:21:04 +0000
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 33a74a15247..f8c2412492e 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -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,13 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
+-// needed to allow compilation, as reported by eriktorbjorn on 20191215
+-// This is in include/fluidsynth/log.h around line 82
+-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+-#include <fluidsynth.h>
+-#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 783e7a43576..12be03569aa 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From d7306d441ee57ed30a6d84eee6d30c4c1e1e6454 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:24 +0200
Subject: [PATCH 11/13] tuxguitar: rebuild for fluidsynth 2.1.1

---
 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 e4751b99e519eb63154c61a84a4ab1d27d1fe8fe Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:40 +0200
Subject: [PATCH 12/13] SLADE: rebuild for fluidsynth 2.1.1

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

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

From 36d9ffef1134b89d3625459a7dac03b24c5eeb03 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 13/13] residualvm: rebuild and patch against fluidsynth 2.1.1

---
 .../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 1691b73f732..38cba292bba 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)"

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (7 preceding siblings ...)
  2020-05-27 20:24 ` Chocimier
@ 2020-05-27 20:26 ` Chocimier
  2020-05-28  5:17 ` newbluemoon
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-05-27 20:26 UTC (permalink / raw)
  To: ml


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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-634920743

Comment:
Added ScummVM patches, as i need it for #21227.

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (8 preceding siblings ...)
  2020-05-27 20:26 ` Chocimier
@ 2020-05-28  5:17 ` newbluemoon
  2020-05-28  5:27 ` newbluemoon
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: newbluemoon @ 2020-05-28  5:17 UTC (permalink / raw)
  To: ml


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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-631960628

Comment:
ResidualVM still needs this patch: https://github.com/void-linux/void-packages/pull/14416/commits/de47c11010d32f0b4a3bf6d08ccde4cae550afcb
<s>ScummVM has been updated in the meantime so it’s fixed there.</s>
Edit 2: ScummVM’s master branch had been updated, but sadly not the branch for the 2.1.2 release.

Edit: With the latest development version ResidualVM doesn’t need the patch anymore; the last release is rather old.

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (9 preceding siblings ...)
  2020-05-28  5:17 ` newbluemoon
@ 2020-05-28  5:27 ` newbluemoon
  2020-05-28 22:56 ` [PR PATCH] [Updated] " Chocimier
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: newbluemoon @ 2020-05-28  5:27 UTC (permalink / raw)
  To: ml


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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-635111414

Comment:
ScummVM’s master branch had already been patched for fluidsynth 2.1 last December, but it’s not the last release from March (as I mistakingly assumed, sorry).

@Chocimier As residualvm uses large parts of scummvm you can use the same patch for both. The second part of the patch just reverts most of the first part. Maybe it makes things a bit easier to read to just have one? :)

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

* Re: [PR PATCH] [Updated] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (10 preceding siblings ...)
  2020-05-28  5:27 ` newbluemoon
@ 2020-05-28 22:56 ` Chocimier
  2020-05-28 23:02 ` Chocimier
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-05-28 22:56 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 16367 bytes --]

From eb32b479371f2d10d3648151d30d10f15a550c66 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:50:46 +0200
Subject: [PATCH 01/14] fluidsynth: update to 2.1.1

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

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..63a08c02ffe 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.1.1_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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From fdfb1c0b4f59d2332651794d2b83ce100ac3e58b Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:17 +0200
Subject: [PATCH 02/14] Carla: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d7998ca66fe..8ea0fb0ab7b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From a4c4cee39fafb5e3f0b504e7c3cba171a217396c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:45 +0200
Subject: [PATCH 03/14] ardour: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 9839dcd003b..b0e1152a5d5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=5.12
-revision=4
+revision=5
 build_style=waf
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"

From 2ebbaf0d204e0ea796578e0ba9672628a219c91c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:18 +0200
Subject: [PATCH 04/14] audacious-plugins: rebuild for fluidsynth 2.1.1

---
 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 5c86edb9006..9f30316896b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"

From 8bcc4fe164c216f95775d3efe4030db27de09837 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:46 +0200
Subject: [PATCH 05/14] calf: rebuild for fluidsynth 2.1.1

---
 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 829c5e62d171e2c754f5d89c74bcb17a49bc2782 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:53:18 +0200
Subject: [PATCH 06/14] csound: rebuild for fluidsynth 2.1.1

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

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

From 389330bc8419e4ab8f3765f5c16888564fc51ddf Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:12 +0200
Subject: [PATCH 07/14] lmms: rebuild for fluidsynth 2.1.1

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

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

From 70730e23701b4b41dff62d846280eba03644614c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:26 +0200
Subject: [PATCH 08/14] prboom-plus: rebuild for fluidsynth 2.1.1

---
 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 028f1a9c78603ee05b86f990c7db3600c3fb1212 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:42 +0200
Subject: [PATCH 09/14] qsynth: rebuild for fluidsynth 2.1.1

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

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

From 69f401d157f2ac46ec107e8d4406821589e1e99a Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:06 +0200
Subject: [PATCH 10/14] scummvm: rebuild for fluidsynth 2.1.1

---
 .../patches/Fluidsynth-v2.1-part1.patch       | 27 ++++++++++
 .../patches/Fluidsynth-v2.1-part2.patch       | 53 +++++++++++++++++++
 srcpkgs/scummvm/template                      |  2 +-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch

diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
new file mode 100644
index 00000000000..ef7ff6e8871
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
@@ -0,0 +1,27 @@
+From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Sun, 15 Dec 2019 22:22:20 +0000
+Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+
+
+This is as reported by eriktorbjorn.
+---
+ audio/softsynth/fluidsynth.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 4034b2ffc36..33a74a15247 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -35,7 +35,12 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
++// needed to allow compilation, as reported by eriktorbjorn on 20191215
++// This is in include/fluidsynth/log.h around line 82
++#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+ #include <fluidsynth.h>
++#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+ 
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
new file mode 100644
index 00000000000..4b948dd21f7
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
@@ -0,0 +1,53 @@
+From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Tue, 17 Dec 2019 04:21:04 +0000
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 33a74a15247..f8c2412492e 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -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,13 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
+-// needed to allow compilation, as reported by eriktorbjorn on 20191215
+-// This is in include/fluidsynth/log.h around line 82
+-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+-#include <fluidsynth.h>
+-#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 783e7a43576..12be03569aa 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From d7306d441ee57ed30a6d84eee6d30c4c1e1e6454 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:24 +0200
Subject: [PATCH 11/14] tuxguitar: rebuild for fluidsynth 2.1.1

---
 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 e4751b99e519eb63154c61a84a4ab1d27d1fe8fe Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:40 +0200
Subject: [PATCH 12/14] SLADE: rebuild for fluidsynth 2.1.1

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

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

From 36d9ffef1134b89d3625459a7dac03b24c5eeb03 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 13/14] residualvm: rebuild and patch against fluidsynth 2.1.1

---
 .../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 1691b73f732..38cba292bba 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 f64bed2cd31ed2f354814484cd84d2b6c8bcd954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 29 May 2020 00:51:24 +0200
Subject: [PATCH 14/14] ardour: update to 6.0.

---
 srcpkgs/ardour/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b0e1152a5d5..c733890c2c3 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,11 +1,12 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=5.12
-revision=5
-build_style=waf
+version=6.0
+revision=1
+build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"
-hostmakedepends="python git graphviz doxygen pkg-config clang perl tar"
+make_build_args="-v"
+hostmakedepends="python3 git graphviz doxygen pkg-config clang perl"
 makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
  taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel
  vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
@@ -19,5 +20,5 @@ homepage="http://ardour.org"
 nocross="executes test binaries during configure"
 
 do_fetch() {
-	git clone --branch=$version https://github.com/Ardour/$pkgname $pkgname-$version
+	git clone --depth 1 --branch=$version https://github.com/Ardour/ardour $pkgname-$version
 }

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

* Re: fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (11 preceding siblings ...)
  2020-05-28 22:56 ` [PR PATCH] [Updated] " Chocimier
@ 2020-05-28 23:02 ` Chocimier
  2020-05-28 23:03 ` [PR PATCH] [Updated] [WIP] " Chocimier
  2020-06-01 15:11 ` Clyybber
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-05-28 23:02 UTC (permalink / raw)
  To: ml


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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-635656834

Comment:
@newbluemoon: I like more to use what upstream give, because it's less work.

Ardour 5 fails to build and I won't even try to fix, let's update to 6.
But ardour 6 also fails currently with:

    [  98/1063] Compiling libs/ardour/sse_functions_64bit.s
    runner ['as', '-Ilibs/ardour', '-I../libs/ardour', '-Ilibs/surfaces/control_protocol', '-I../libs/surfaces/control_protocol', '-Ilibs', '-I../libs', '-Ilibs/midi++2', '-I../libs/midi++2', '-Ilibs/evoral', '-I../libs/evoral', '-Ilibs/audiographer', '-I../libs/audiographer', '-Ilibs/audiographer/src', '-I../libs/audiographer/src', '-Ilibs/ptformat', '-I../libs/ptformat', '-Ilibs/pbd', '-I../libs/pbd', '-Ilibs/evoral/libsmf', '-I../libs/evoral/libsmf', '-Ilibs/temporal', '-I../libs/temporal', '-Ilibs/lua', '-I../libs/lua', '-Ilibs/zita-resampler', '-I../libs/zita-resampler', '-Ilibs/zita-convolver', '-I../libs/zita-convolver', '-I/usr/include/glibmm-2.4', '-I/usr/lib/glibmm-2.4/include', '-I/usr/include/glib-2.0', '-I/usr/lib/glib-2.0/include', '-I/usr/include/sigc++-2.0', '-I/usr/lib/sigc++-2.0/include', '-I/usr/include/libxml2', '-I/usr/include/raptor2', '-I/usr/include/giomm-2.4', '-I/usr/lib/giomm-2.4/include', '-I/usr/include/libmount', '-I/usr/include/blkid', '-I/usr/include/taglib', '-I/usr/include/lilv-0', '-I/usr/include/sratom-0', '-I/usr/include/sord-0', '-I/usr/include/serd-0', '-I/usr/include/suil-0', '-I/builddir/ardour-6.0/build', '-DINTERNAL_SHARED_LIBS=1', '-DUSE_EXTERNAL_LIBS=1', '-DHAVE_ALSA=1', '-DHAVE_GLIB=1', '-DHAVE_GTHREAD=1', '-DHAVE_GLIBMM=1', '-DHAVE_SNDFILE=1', '-DHAVE_GIOMM=1', '-DHAVE_CURL=1', '-DHAVE_ARCHIVE=1', '-DHAVE_LO=1', '-DHAVE_TAGLIB=1', '-DHAVE_VAMPSDK=1', '-DHAVE_VAMPHOSTSDK=1', '-DHAVE_RUBBERBAND=1', '-DEXPORT_VISIBILITY_HIDDEN=0', '-DENABLE_NLS=1', '-DLXVST_SUPPORT=1', '-DCONFIG_ARCH="x86_64"', '-DHAVE_TOOLS_SANITY_CHECK=1', '-DHAVE_TOOLS_GCCABICHECK=1', '-DHAVE_LIBS_CLEARLOOKS_NEWER=1', '-DHAVE_LIBFLUIDSYNTH=1', '-DHAVE_LIBS_FLUIDSYNTH=1', '-DHAVE_HIDAPI=1', '-DHAVE_LIBS_HIDAPI=1', '-DHAVE_LIBLTC=1', '-DHAVE_LIBS_LIBLTC=1', '-DHAVE_LIBS_LUA=1', '-DHAVE_LIBS_PTFORMAT=1', '-DHAVE_LIBS_QM_DSP=1', '-DHAVE_FFTW3F=1', '-DHAVE_AUBIO=1', '-DHAVE_AUBIO4=1', '-DHAVE_LIBS_VAMP_PLUGINS=1', '-DHAVE_LIBS_VAMP_PYIN=1', '-DHAVE_LIBS_ZITA_RESAMPLER=1', '-DHAVE_LIBS_ZITA_CONVOLVER=1', '-DHAVE_XML=1', '-DHAVE_SIGCPP=1', '-DHAVE_EXECINFO=1', '-DHAVE_POSIX_MEMALIGN=1', '-DHAVE_GETMNTENT=1', '-DHAVE_LOCALTIME_R=1', '-DHAVE_LIBS_PBD=1', '-DHAVE_LIBS_MIDIPP2=1', '-DHAVE_LIBS_EVORAL=1', '-DHAVE_USB=1', '-DHAVE_CONTROL_PROTOCOL=1', '-DHAVE_FADERPORT=1', '-DHAVE_FADERPORT8=1', '-DHAVE_CC121=1', '-DHAVE_GENERIC_MIDI=1', '-DHAVE_MACKIE=1', '-DHAVE_US2400=1', '-DHAVE_LAUNCH_CONTROL_XL=1', '-DHAVE_PANGOMM=1', '-DHAVE_CAIROMM=1', '-DHAVE_PUSH2=1', '-DHAVE_CONTOURDESIGN=1', '-DHAVE_LIBS_SURFACES=1', '-DHAVE_2IN2OUT=1', '-DHAVE_1IN2OUT=1', '-DHAVE_VBAP=1', '-DHAVE_STEREOBALANCE=1', '-DHAVE_LIBS_PANNERS=1', '-DHAVE_JACK=1', '-DHAVE_JACK_METADATA=1', '-DHAVE_DUMMY=1', '-DHAVE_LIBS_BACKENDS=1', '-DHAVE_LIBS_TEMPORAL=1', '-DHAVE_LRDF=1', '-DHAVE_SAMPLERATE=1', '-DHAVE_LV2=1', '-DHAVE_LV2_1_10_0=1', '-DHAVE_SERD=1', '-DHAVE_SORD=1', '-DHAVE_SRATOM=1', '-DHAVE_LILV=1', '-DHAVE_SUIL=1', '-DLV2_SUPPORT=1', '-DLV2_EXTENDED=1', '-DHAVE_OGG=1', '-DHAVE_FLAC=1', '-DHAVE_FFTW35F=1', '-DUSE_RUBBERBAND=1', '-DCURRENT_SESSION_FILE_VERSION=6000', '-DHAVE_SYS_VFS_H=1', '-DHAVE_SYS_STATVFS_H=1', '-DHAVE_UNISTD=1', '-DHAVE_BOOST_SCOPED_PTR_HPP=1', '-DHAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1', '-DHAVE_LIBS_ARDOUR=1', '-DHAVE_GTKMM=1', '-DHAVE_GTK=1', '-DHAVE_LIBS_GTKMM2EXT=1', '-DHAVE_BOOST_FORMAT_HPP=1', '-DHAVE_LIBS_AUDIOGRAPHER=1', '-DHAVE_LIBS_CANVAS=1', '-DHAVE_LIBS_WIDGETS=1', '-DHAVE_LIBS_WAVEVIEW=1', '-DHAVE_LV2_1_0_0=1', '-DHAVE_LIBS_PLUGINS_REASONABLESYNTH_LV2=1', '-DHAVE_CAIRO=1', '-DHAVE_LIBS_PLUGINS_A_COMP_LV2=1', '-DHAVE_LIBS_PLUGINS_A_EXP_LV2=1', '-DHAVE_LIBS_PLUGINS_A_DELAY_LV2=1', '-DHAVE_LIBS_PLUGINS_A_EQ_LV2=1', '-DHAVE_LIBS_PLUGINS_A_REVERB_LV2=1', '-DHAVE_LIBS_PLUGINS_A_FLUIDSYNTH_LV2=1', '-DHAVE_X11=1', '-DHAVE_PANGOFT2=1', '-DHAVE_FONTCONFIG=1', '-DHAVE_BOOST_SHARED_PTR_HPP=1', '-DHAVE_BOOST_WEAK_PTR_HPP=1', '-DHAVE_GTK2_ARDOUR=1', '-DHAVE_SHARE_EXPORT=1', '-DHAVE_SHARE_MIDI_MAPS=1', '-DHAVE_SHARE_MCP=1', '-DHAVE_SHARE_OSC=1', '-DHAVE_SHARE_PATCHFILES=1', '-DHAVE_SHARE_PLUGIN_METADATA=1', '-DHAVE_SHARE_SCRIPTS=1', '-DHAVE_SHARE_WEB_SURFACES=1', '-DHAVE_HEADLESS=1', '-DHAVE_LUASESSION=1', '-DHAVE_SESSION_UTILS=1', '-DHAVE_LIBS_FST=1', '-DHAVE_LIBS_VFORK=1', '-DHAVE_DBUS=1', '-DHAVE_LIBS_ARDOURALSAUTIL=1', '-DLIBARDOUR_DLL_EXPORTS=1', '-DPACKAGE="ardour6"', '-DDATA_DIR="/usr/share/ardour6"', '-DCONFIG_DIR="/usr/etc"', '-DLOCALEDIR="/usr/share/ardour6/locale"', '-DLIBARDOUR="ardour6"', '-DLXVST_SUPPORT', '../libs/ardour/sse_functions_64bit.s', '-c', '-olibs/ardour/sse_functions_64bit.s.1.o']
    as: invalid option -- 'U'

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

* Re: [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (12 preceding siblings ...)
  2020-05-28 23:02 ` Chocimier
@ 2020-05-28 23:03 ` Chocimier
  2020-06-01 15:11 ` Clyybber
  14 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-05-28 23:03 UTC (permalink / raw)
  To: ml


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

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

https://github.com/Clyybber/void-packages update-fluidsynth
https://github.com/void-linux/void-packages/pull/22134

[WIP] fluidsynth: update to 2.1.1


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-fluidsynth-22134.patch --]
[-- Type: text/x-diff, Size: 16377 bytes --]

From eb32b479371f2d10d3648151d30d10f15a550c66 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:50:46 +0200
Subject: [PATCH 01/14] fluidsynth: update to 2.1.1

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

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..63a08c02ffe 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.1.1_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..b40767a0b4e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=1.1.11
-revision=2
+version=2.1.1
+revision=1
 build_style=cmake
 configure_args="-DLIB_SUFFIX=
  -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From fdfb1c0b4f59d2332651794d2b83ce100ac3e58b Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:17 +0200
Subject: [PATCH 02/14] Carla: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d7998ca66fe..8ea0fb0ab7b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From a4c4cee39fafb5e3f0b504e7c3cba171a217396c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:51:45 +0200
Subject: [PATCH 03/14] ardour: rebuild for fluidsynth 2.1.1

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

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 9839dcd003b..b0e1152a5d5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=5.12
-revision=4
+revision=5
 build_style=waf
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"

From 2ebbaf0d204e0ea796578e0ba9672628a219c91c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:18 +0200
Subject: [PATCH 04/14] audacious-plugins: rebuild for fluidsynth 2.1.1

---
 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 5c86edb9006..9f30316896b 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'audacious-plugins'
 pkgname=audacious-plugins
 version=4.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config"

From 8bcc4fe164c216f95775d3efe4030db27de09837 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:52:46 +0200
Subject: [PATCH 05/14] calf: rebuild for fluidsynth 2.1.1

---
 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 829c5e62d171e2c754f5d89c74bcb17a49bc2782 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:53:18 +0200
Subject: [PATCH 06/14] csound: rebuild for fluidsynth 2.1.1

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

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

From 389330bc8419e4ab8f3765f5c16888564fc51ddf Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:12 +0200
Subject: [PATCH 07/14] lmms: rebuild for fluidsynth 2.1.1

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

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

From 70730e23701b4b41dff62d846280eba03644614c Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:26 +0200
Subject: [PATCH 08/14] prboom-plus: rebuild for fluidsynth 2.1.1

---
 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 028f1a9c78603ee05b86f990c7db3600c3fb1212 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:54:42 +0200
Subject: [PATCH 09/14] qsynth: rebuild for fluidsynth 2.1.1

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

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

From 69f401d157f2ac46ec107e8d4406821589e1e99a Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:06 +0200
Subject: [PATCH 10/14] scummvm: rebuild for fluidsynth 2.1.1

---
 .../patches/Fluidsynth-v2.1-part1.patch       | 27 ++++++++++
 .../patches/Fluidsynth-v2.1-part2.patch       | 53 +++++++++++++++++++
 srcpkgs/scummvm/template                      |  2 +-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
 create mode 100644 srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch

diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
new file mode 100644
index 00000000000..ef7ff6e8871
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part1.patch
@@ -0,0 +1,27 @@
+From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Sun, 15 Dec 2019 22:22:20 +0000
+Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+
+
+This is as reported by eriktorbjorn.
+---
+ audio/softsynth/fluidsynth.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 4034b2ffc36..33a74a15247 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -35,7 +35,12 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
++// needed to allow compilation, as reported by eriktorbjorn on 20191215
++// This is in include/fluidsynth/log.h around line 82
++#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+ #include <fluidsynth.h>
++#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+ 
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
diff --git a/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
new file mode 100644
index 00000000000..4b948dd21f7
--- /dev/null
+++ b/srcpkgs/scummvm/patches/Fluidsynth-v2.1-part2.patch
@@ -0,0 +1,53 @@
+From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Tue, 17 Dec 2019 04:21:04 +0000
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git audio/softsynth/fluidsynth.cpp audio/softsynth/fluidsynth.cpp
+index 33a74a15247..f8c2412492e 100644
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -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,13 +41,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
+-// Fluidsynth v2.1+ uses printf in one of it's headers, so this is
+-// needed to allow compilation, as reported by eriktorbjorn on 20191215
+-// This is in include/fluidsynth/log.h around line 82
+-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+-#include <fluidsynth.h>
+-#undef FORBIDDEN_SYMBOL_EXCEPTION_printf
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ 	MidiChannel_MPU401 _midiChannels[16];
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 783e7a43576..12be03569aa 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"

From d7306d441ee57ed30a6d84eee6d30c4c1e1e6454 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:24 +0200
Subject: [PATCH 11/14] tuxguitar: rebuild for fluidsynth 2.1.1

---
 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 e4751b99e519eb63154c61a84a4ab1d27d1fe8fe Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 21 May 2020 10:55:40 +0200
Subject: [PATCH 12/14] SLADE: rebuild for fluidsynth 2.1.1

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

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

From 36d9ffef1134b89d3625459a7dac03b24c5eeb03 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@tilde.team>
Date: Mon, 30 Dec 2019 05:06:30 +0000
Subject: [PATCH 13/14] residualvm: rebuild and patch against fluidsynth 2.1.1

---
 .../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 1691b73f732..38cba292bba 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 483fd49be28b831c08b7e8c556df8be9c417dfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 29 May 2020 00:51:24 +0200
Subject: [PATCH 14/14] ardour: update to 6.0.

[ci-skip]
---
 srcpkgs/ardour/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b0e1152a5d5..c733890c2c3 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,11 +1,12 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=5.12
-revision=5
-build_style=waf
+version=6.0
+revision=1
+build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs"
-hostmakedepends="python git graphviz doxygen pkg-config clang perl tar"
+make_build_args="-v"
+hostmakedepends="python3 git graphviz doxygen pkg-config clang perl"
 makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
  taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel
  vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
@@ -19,5 +20,5 @@ homepage="http://ardour.org"
 nocross="executes test binaries during configure"
 
 do_fetch() {
-	git clone --branch=$version https://github.com/Ardour/$pkgname $pkgname-$version
+	git clone --depth 1 --branch=$version https://github.com/Ardour/ardour $pkgname-$version
 }

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

* Re: [WIP] fluidsynth: update to 2.1.1
  2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
                   ` (13 preceding siblings ...)
  2020-05-28 23:03 ` [PR PATCH] [Updated] [WIP] " Chocimier
@ 2020-06-01 15:11 ` Clyybber
  14 siblings, 0 replies; 16+ messages in thread
From: Clyybber @ 2020-06-01 15:11 UTC (permalink / raw)
  To: ml


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

New comment by Clyybber on void-packages repository

https://github.com/void-linux/void-packages/pull/22134#issuecomment-636914336

Comment:
@Chocimier Thank you for fixing this PR. I just recently compiled ardour6 from git just fine, so not sure what the build error is about. One thing worth mentioning is that ardour6 failed when loading or creating a session, because it fails in pthread_create with "Resource temporarily unavailable" (https://github.com/Ardour/ardour/commit/9e054aff585d626fc663985a2d74e3d7b22ed916).
I debugged together with pauldavisthefirst comparing ulimits, glibc versions, etc. but couldn't find the culprit.
Curiously their precompiled binary works (compiled with gcc 8), while the one I built doesn't (gcc 9).

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

end of thread, back to index

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19 15:11 [PR PATCH] fluidsynth: update to 2.1.1 Clyybber
2020-05-19 23:17 ` fosslinux
2020-05-20 10:11 ` [PR PATCH] [Updated] " Clyybber
2020-05-20 23:23 ` fosslinux
2020-05-21  8:33 ` newbluemoon
2020-05-21  8:38 ` newbluemoon
2020-05-21 10:10 ` [PR PATCH] [Updated] " Clyybber
2020-05-27 20:23 ` Chocimier
2020-05-27 20:24 ` Chocimier
2020-05-27 20:26 ` Chocimier
2020-05-28  5:17 ` newbluemoon
2020-05-28  5:27 ` newbluemoon
2020-05-28 22:56 ` [PR PATCH] [Updated] " Chocimier
2020-05-28 23:02 ` Chocimier
2020-05-28 23:03 ` [PR PATCH] [Updated] [WIP] " Chocimier
2020-06-01 15:11 ` Clyybber

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