cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to fluidsynth-1.1.9; not the newest, but seems the last one that

Browse Source 
still builds ok with autoconf with only light fiddling, and the sndio
patchset needs more work to adapt to cmake.

while there: https homepage, move to github
This commit is contained in:
sthen 2021-06-25 21:48:40 +00:00
parent b83b94024c
commit fa58135684
13 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audio/fluidsynth/Makefile
View File

@ -1,27 +1,26 @@
# $OpenBSD: Makefile,v 1.30 2019/07/12 20:43:33 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2021/06/25 21:48:40 sthen Exp $
COMMENT = SoundFont2 software synthesizer
DISTNAME = fluidsynth-1.1.6
REVISION = 5
GH_ACCOUNT = FluidSynth
GH_PROJECT = fluidsynth
GH_TAGNAME = v1.1.9
SHARED_LIBS += fluidsynth 1.0 # 6.2
SHARED_LIBS += fluidsynth 2.0 # 6.0
CATEGORIES = audio
HOMEPAGE = http://www.fluidsynth.org/
HOMEPAGE = https://www.fluidsynth.org/
# LGPLv2+
PERMIT_PACKAGE = Yes
WANTLIB = FLAC c glib-2.0 gthread-2.0 iconv intl m curses ogg pcre
WANTLIB += pthread readline sndfile sndio vorbis vorbisenc
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fluidsynth/}
WANTLIB = FLAC c glib-2.0 gthread-2.0 iconv intl m curses ogg opus
WANTLIB += pcre pthread readline sndfile sndio vorbis vorbisenc
LIB_DEPENDS = audio/libsndfile \
devel/glib2
AUTOCONF_VERSION = 2.61
AUTOMAKE_VERSION = 1.9
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.16
AUTORECONF = ./autogen.sh
# autogen.sh needs aclocal/lib-ld.m4
@ -44,5 +43,9 @@ CONFIGURE_ARGS += --disable-jack-support
post-patch:
cp ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/
# not defined in autoconf build, but required by source code
# upstream really wants cmake, but the sndio patches need porting first
sed -i 's,DEFAULT_SOUNDFONT,"${LOCALBASE}/share/generaluser-gs/GeneralUser_GS.sf2",' \
${WRKSRC}/src/synth/fluid_synth.c
.include <bsd.port.mk>

4
audio/fluidsynth/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (fluidsynth-1.1.6.tar.gz) = UIUzkdnr7am023h++yP5ix4mtylt0rtdDZa1vM7iFxw=
SIZE (fluidsynth-1.1.6.tar.gz) = 958735
SHA256 (fluidsynth-1.1.9.tar.gz) = 3WMh4Tp8h17zAyZEvTGX6Es9JJKOI3m8gGa3ys571BA=
SIZE (fluidsynth-1.1.9.tar.gz) = 630651

12
audio/fluidsynth/patches/patch-Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_am,v 1.1 2021/06/25 21:48:40 sthen Exp $
automake: Don't whine about not having README
Index: Makefile.am
--- Makefile.am.orig
+++ Makefile.am
@@ -9,3 +9,4 @@ EXTRA_DIST = TODO acinclude.m4 autogen.sh fluidsynth.p
DISTCLEANFILES = fluidsynth.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fluidsynth.pc
+README: README.md

10
audio/fluidsynth/patches/patch-configure_ac
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.4 2013/03/29 12:37:43 sthen Exp $
--- configure.ac.orig Thu Aug 16 05:01:13 2012
+++ configure.ac Sun Mar 24 23:57:37 2013
$OpenBSD: patch-configure_ac,v 1.5 2021/06/25 21:48:40 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -94,7 +94,7 @@ dnl Check for GNU LD
AC_LIB_PROG_LD_GNU
AM_CONDITIONAL(GNU_LD_SUPPORT, test "x$with_gnu_ld" = "xyes")
@ -47,7 +49,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2013/03/29 12:37:43 sthen Exp $
dnl - Check support for MidiShare
AC_MIDISHARE
@@ -517,6 +537,12 @@ if test "${OSS_SUPPORT}" = "1"; then
@@ -547,6 +567,12 @@ if test "${OSS_SUPPORT}" = "1"; then
echo "OSS: yes"
else
echo "OSS: no"

3
audio/fluidsynth/patches/patch-fluidsynth_pc_in
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-fluidsynth_pc_in,v 1.3 2013/03/29 12:37:43 sthen Exp $
$OpenBSD: patch-fluidsynth_pc_in,v 1.4 2021/06/25 21:48:40 sthen Exp $
--- fluidsynth.pc.in.orig Thu Aug 16 05:01:13 2012
+++ fluidsynth.pc.in Sun Mar 24 23:55:55 2013
@@ -6,5 +6,5 @@ includedir=@includedir@

10
audio/fluidsynth/patches/patch-src_Makefile_am
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-src_Makefile_am,v 1.3 2013/03/29 12:37:43 sthen Exp $
--- src/Makefile.am.orig Thu Aug 16 05:01:13 2012
+++ src/Makefile.am Mon Mar 25 00:05:56 2013
$OpenBSD: patch-src_Makefile_am,v 1.4 2021/06/25 21:48:40 sthen Exp $
Index: src/Makefile.am
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -40,6 +40,9 @@ if OSS_SUPPORT
fluid_oss = drivers/fluid_oss.c
endif
@ -27,7 +29,7 @@ $OpenBSD: patch-src_Makefile_am,v 1.3 2013/03/29 12:37:43 sthen Exp $
$(fluid_windows) \
$(fluid_dart) \
$(fluid_rtkit) \
@@ -181,7 +186,7 @@ INCLUDES = -I$(top_srcdir)/include \
@@ -180,7 +185,7 @@ INCLUDES = -I$(top_srcdir)/include \
libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
$(READLINE_LIBS) $(COREAUDIO_LIBS) $(COREMIDI_LIBS) $(JACK_LIBS) \
$(ALSA_LIBS) $(PULSE_LIBS) $(PORTAUDIO_LIBS) $(DART_LIBS) \

33
audio/fluidsynth/patches/patch-src_drivers_fluid_adriver_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp $
--- src/drivers/fluid_adriver.c.orig Thu Aug 16 05:01:13 2012
+++ src/drivers/fluid_adriver.c Sun Mar 24 23:55:55 2013
$OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.2 2021/06/25 21:48:40 sthen Exp $
Index: src/drivers/fluid_adriver.c
--- src/drivers/fluid_adriver.c.orig
+++ src/drivers/fluid_adriver.c
@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_audio_driver_t
void fluid_oss_audio_driver_settings(fluid_settings_t* settings);
#endif
@ -17,21 +19,22 @@ $OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp
#if COREAUDIO_SUPPORT
fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings,
fluid_synth_t* synth);
@@ -120,6 +129,13 @@ int delete_fluid_file_audio_driver(fluid_audio_driver_
@@ -122,6 +131,14 @@ int delete_fluid_file_audio_driver(fluid_audio_driver_
/* Available audio drivers, listed in order of preference */
fluid_audriver_definition_t fluid_audio_drivers[] = {
static const fluid_audriver_definition_t fluid_audio_drivers[] =
{
+#if SNDIO_SUPPORT
+ { "sndio",
+ new_fluid_sndio_audio_driver,
+ new_fluid_sndio_audio_driver2,
+ delete_fluid_sndio_audio_driver,
+ fluid_sndio_audio_driver_settings },
+ { "sndio",
+ new_fluid_sndio_audio_driver,
+ new_fluid_sndio_audio_driver2,
+ delete_fluid_sndio_audio_driver,
+ fluid_sndio_audio_driver_settings },
+#endif
+
#if JACK_SUPPORT
{ "jack",
new_fluid_jack_audio_driver,
@@ -223,7 +239,9 @@ void fluid_audio_driver_settings(fluid_settings_t* set
{ "jack",
new_fluid_jack_audio_driver,
@@ -238,7 +255,9 @@ void fluid_audio_driver_settings(fluid_settings_t* set
FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL);
/* Set the default driver */
@ -42,7 +45,7 @@ $OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp
fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL);
#elif ALSA_SUPPORT
fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL);
@@ -256,6 +274,9 @@ void fluid_audio_driver_settings(fluid_settings_t* set
@@ -271,6 +290,9 @@ void fluid_audio_driver_settings(fluid_settings_t* set
#endif
#if OSS_SUPPORT
fluid_settings_add_option(settings, "audio.driver", "oss");

10
audio/fluidsynth/patches/patch-src_drivers_fluid_jack_c
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_drivers_fluid_jack_c,v 1.1 2013/03/29 12:37:43 sthen Exp $
--- src/drivers/fluid_jack.c.orig Thu Aug 16 05:01:13 2012
+++ src/drivers/fluid_jack.c Sun Mar 24 23:59:51 2013
@@ -101,7 +101,7 @@ fluid_jack_audio_driver_settings(fluid_settings_t* set
$OpenBSD: patch-src_drivers_fluid_jack_c,v 1.2 2021/06/25 21:48:40 sthen Exp $
Index: src/drivers/fluid_jack.c
--- src/drivers/fluid_jack.c.orig
+++ src/drivers/fluid_jack.c
@@ -108,7 +108,7 @@ fluid_jack_audio_driver_settings(fluid_settings_t* set
{
fluid_settings_register_str(settings, "audio.jack.id", "fluidsynth", 0, NULL, NULL);
fluid_settings_register_int(settings, "audio.jack.multi", 0, 0, 1, FLUID_HINT_TOGGLED, NULL, NULL);

16
audio/fluidsynth/patches/patch-src_drivers_fluid_mdriver_c
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_drivers_fluid_mdriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp $
--- src/drivers/fluid_mdriver.c.orig Thu Aug 16 05:01:13 2012
+++ src/drivers/fluid_mdriver.c Sun Mar 24 23:55:55 2013
@@ -46,6 +46,15 @@ fluid_midi_driver_t *new_fluid_jack_midi_driver (fluid
$OpenBSD: patch-src_drivers_fluid_mdriver_c,v 1.2 2021/06/25 21:48:40 sthen Exp $
Index: src/drivers/fluid_mdriver.c
--- src/drivers/fluid_mdriver.c.orig
+++ src/drivers/fluid_mdriver.c
@@ -53,6 +53,15 @@ fluid_midi_driver_t *new_fluid_jack_midi_driver (fluid
int delete_fluid_jack_midi_driver(fluid_midi_driver_t *p);
#endif
@ -17,7 +19,7 @@ $OpenBSD: patch-src_drivers_fluid_mdriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp
/* OSS */
#if OSS_SUPPORT
fluid_midi_driver_t* new_fluid_oss_midi_driver(fluid_settings_t* settings,
@@ -96,6 +105,12 @@ struct fluid_mdriver_definition_t {
@@ -105,6 +114,12 @@ struct fluid_mdriver_definition_t {
struct fluid_mdriver_definition_t fluid_midi_drivers[] = {
@ -30,7 +32,7 @@ $OpenBSD: patch-src_drivers_fluid_mdriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp
#if JACK_SUPPORT
{ "jack",
new_fluid_jack_midi_driver,
@@ -149,7 +164,9 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
@@ -158,7 +173,9 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
FLUID_DEFAULT_MIDI_RT_PRIO, 0, 99, 0, NULL, NULL);
/* Set the default driver */
@ -41,7 +43,7 @@ $OpenBSD: patch-src_drivers_fluid_mdriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp
fluid_settings_register_str(settings, "midi.driver", "alsa_seq", 0, NULL, NULL);
#elif JACK_SUPPORT
fluid_settings_register_str(settings, "midi.driver", "jack", 0, NULL, NULL);
@@ -169,6 +186,9 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
@@ -178,6 +195,9 @@ void fluid_midi_driver_settings(fluid_settings_t* sett
#if ALSA_SUPPORT
fluid_settings_add_option(settings, "midi.driver", "alsa_seq");
fluid_settings_add_option(settings, "midi.driver", "alsa_raw");

33
audio/fluidsynth/patches/patch-src_fluidsynth_c
View File

@ -1,18 +1,9 @@
$OpenBSD: patch-src_fluidsynth_c,v 1.3 2013/03/29 12:37:43 sthen Exp $
--- src/fluidsynth.c.orig Thu Aug 16 05:01:13 2012
+++ src/fluidsynth.c Sun Mar 24 23:58:13 2013
@@ -295,9 +295,9 @@ int main(int argc, char** argv)
int with_server = 0;
int dump = 0;
int fast_render = 0;
- int connect_lash = 1;
char *optchars = "a:C:c:dE:f:F:G:g:hijK:L:lm:nO:o:p:R:r:sT:Vvz:";
#ifdef LASH_ENABLED
+ int connect_lash = 1;
int enabled_lash = 0; /* set to TRUE if lash gets enabled */
fluid_lash_args_t *lash_args;
@@ -325,7 +325,9 @@ int main(int argc, char** argv)
$OpenBSD: patch-src_fluidsynth_c,v 1.4 2021/06/25 21:48:40 sthen Exp $
Index: src/fluidsynth.c
--- src/fluidsynth.c.orig
+++ src/fluidsynth.c
@@ -324,7 +324,9 @@ int main(int argc, char** argv)
{"audio-groups", 1, 0, 'G'},
{"chorus", 1, 0, 'C'},
{"connect-jack-outputs", 0, 0, 'j'},
@ -22,15 +13,3 @@ $OpenBSD: patch-src_fluidsynth_c,v 1.3 2013/03/29 12:37:43 sthen Exp $
{"dump", 0, 0, 'd'},
{"fast-render", 1, 0, 'F'},
{"gain", 1, 0, 'g'},
@@ -460,9 +462,11 @@ int main(int argc, char** argv)
audio_channels = atoi(optarg);
fluid_settings_setint(settings, "synth.audio-channels", audio_channels);
break;
+#ifdef LASH_ENABLED
case 'l': /* disable LASH */
connect_lash = 0;
break;
+#endif
case 'm':
if (FLUID_STRCMP (optarg, "help") == 0)
{

8
audio/fluidsynth/patches/patch-src_utils_fluid_sys_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-src_utils_fluid_sys_c,v 1.1 2013/03/29 12:37:43 sthen Exp $
--- src/utils/fluid_sys.c.orig Thu Aug 16 05:01:13 2012
+++ src/utils/fluid_sys.c Mon Mar 25 00:20:40 2013
$OpenBSD: patch-src_utils_fluid_sys_c,v 1.2 2021/06/25 21:48:40 sthen Exp $
Index: src/utils/fluid_sys.c
--- src/utils/fluid_sys.c.orig
+++ src/utils/fluid_sys.c
@@ -429,8 +429,10 @@ fluid_thread_self_set_prio (int prio_level)
memset(&priority, 0, sizeof(priority));
priority.sched_priority = prio_level;

4
audio/fluidsynth/patches/patch-src_utils_fluidsynth_priv_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_utils_fluidsynth_priv_h,v 1.1 2020/04/22 16:53:20 cwen Exp $
$OpenBSD: patch-src_utils_fluidsynth_priv_h,v 1.2 2021/06/25 21:48:40 sthen Exp $
Don't use an header that is not provided
Don't use a header that is not provided
Index: src/utils/fluidsynth_priv.h
--- src/utils/fluidsynth_priv.h.orig

4
audio/fluidsynth/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2015/05/22 11:31:10 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2021/06/25 21:48:40 sthen Exp $
@bin bin/fluidsynth
include/fluidsynth/
include/fluidsynth.h
@ -19,7 +19,7 @@ include/fluidsynth/synth.h
include/fluidsynth/types.h
include/fluidsynth/version.h
include/fluidsynth/voice.h
lib/libfluidsynth.a
@static-lib lib/libfluidsynth.a
lib/libfluidsynth.la
@lib lib/libfluidsynth.so.${LIBfluidsynth_VERSION}
lib/pkgconfig/fluidsynth.pc