From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] fluidsynth: update to 2.1.1
Date: Wed, 27 May 2020 22:23:58 +0200 [thread overview]
Message-ID: <20200527202358.mvJ3HFnDKcJPo3tj2DTdpbtj2d90N-DRw0_BUmPNGRU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22134@inbox.vuxu.org>
[-- 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)"
next prev parent reply other threads:[~2020-05-27 20:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 15:11 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527202358.mvJ3HFnDKcJPo3tj2DTdpbtj2d90N-DRw0_BUmPNGRU@z \
--to=chocimier@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).