Attachment #193418 for bug #228265




# $FreeBSD: head/audio/fluidsynth/Makefile 469288 2018-05-07 13:55:33Z amdmi3 $

PORTNAME=	fluidsynth
PORTVERSION=	1.1.11
PORTREVISION=	5
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	Real-time software synthesizer based on the SoundFont 2 specifications

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/LICENSE

GH_ACCOUNT=	FluidSynth
GH_TAGNAME=	v${PORTVERSION}

OPTIONS_DEFINE=	JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO READLINE \
		SNDFILE SNDIO
OPTIONS_DEFAULT=	JACK READLINE

USES=		cmake pkgconfig tar:bzip2
USE_GITHUB=	yes
USE_GNOME=	glib20
USE_LDCONFIG=	yes
CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
		-Denable-midishare:BOOL=FALSE
USE_LDCONFIG=	yes

LDFLAGS+=	-lpthread

JACK_LIB_DEPENDS=	libjack.so:audio/jack

Lines 1-2 Link Here

(-)./distinfo (-2 / +3 lines)
1	SHA256 (fluidsynth-1.1.6.tar.bz2) = d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601	1	TIMESTAMP = 1525913419
2	SIZE (fluidsynth-1.1.6.tar.bz2) = 823783	2	SHA256 (FluidSynth-fluidsynth-1.1.11-v1.1.11_GH0.tar.gz) = da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
		3	SIZE (FluidSynth-fluidsynth-1.1.11-v1.1.11_GH0.tar.gz) = 634566




--- CMakeLists.txt.orig	2018-05-06 07:05:11 UTC
+++ CMakeLists.txt
@@ -68,6 +68,7 @@ option ( enable-midishare "compile MidiS
 option ( enable-oss "compile OSS support (if it is available)" on )
 option ( enable-pkgconfig "use pkg-config to locate fluidsynth's (mostly optional) dependencies" on )
 option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
+option ( enable-sndio "compile Sndio support (if it is available)" on )
 option ( enable-jack "compile JACK support (if it is available)" on )
 option ( enable-midishare "compile MidiShare support (if it is available)" on )
 option ( enable-readline "compile readline lib line editing (if it is available)" on )
@@ -313,6 +314,11 @@ else ( enable-pulseaudio )
   unset_pkg_config ( PULSE )
 endif ( enable-pulseaudio )
 
 # Platform specific options
@@ -358,6 +359,11 @@ else(NOT enable-pkgconfig)
     unset_pkg_config ( PULSE )
     endif ( enable-pulseaudio )
 
+    unset ( SNDIO_SUPPORT CACHE )
+    if ( enable-sndio )
+      set ( SNDIO_SUPPORT 1 )
+    endif ( enable-sndio )
+
     unset ( ALSA_SUPPORT CACHE )
     if ( enable-alsa )
     pkg_check_modules ( ALSA alsa>=0.9.1 )




--- src/drivers/fluid_adriver.c.orig	2018-05-06 07:05:11 UTC
--- src/drivers/fluid_adriver.c.orig	2012-08-16 04:01:13 UTC
+++ src/drivers/fluid_adriver.c
@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_
 void fluid_oss_audio_driver_settings(fluid_settings_t* settings);

 
+#if SNDIO_SUPPORT
+fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings,
+						   fluid_synth_t* synth);
+fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings,
+						    fluid_audio_func_t func, void* data);
+int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p);
+void fluid_sndio_audio_driver_settings(fluid_settings_t* settings);
+#endif

 #if COREAUDIO_SUPPORT
 fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings,
 						  fluid_synth_t* synth);
@@ -122,6 +131,14 @@ int delete_fluid_file_audio_driver(fluid
 
 /* Available audio drivers, listed in order of preference */
 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 },
+#endif
+
 #if JACK_SUPPORT
     { "jack",
         new_fluid_jack_audio_driver,
@@ -238,7 +255,9 @@ void fluid_audio_driver_settings(fluid_s
                                FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL);
 
   /* Set the default driver */

   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);
@@ -272,6 +291,9 @@ void fluid_audio_driver_settings(fluid_s
 #if OSS_SUPPORT
   fluid_settings_add_option(settings, "audio.driver", "oss");
 #endif




--- src/drivers/fluid_alsa.c.orig	2012-08-16 04:01:13 UTC
+++ src/drivers/fluid_alsa.c
@@ -347,14 +347,16 @@ static int fluid_alsa_handle_write_error
   case -EAGAIN:
     snd_pcm_wait(pcm, 1);
     break;
-  case -EPIPE:
   case -EBADFD:
     if (snd_pcm_prepare(pcm) != 0) {
       FLUID_LOG(FLUID_ERR, "Failed to prepare the audio device");
       return FLUID_FAILED;
     }
     break;
+  case -EPIPE:
+#if EPIPE != ESTRPIPE
   case -ESTRPIPE:
+#endif
     if ((snd_pcm_resume(pcm) != 0) && (snd_pcm_prepare(pcm) != 0)) {
       FLUID_LOG(FLUID_ERR, "Failed to resume the audio device");
       return FLUID_FAILED;




--- src/drivers/fluid_oss.c.orig	2018-05-06 07:05:11 UTC
+++ src/drivers/fluid_oss.c
@@ -45,9 +45,9 @@
 #define BUFFER_LENGTH 512
 
 // Build issue on some systems (OSS 4.0)?
-#if !defined(SOUND_PCM_WRITE_CHANNELS) && defined(SNDCTL_DSP_CHANNELS)
-  #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
-#endif
+// #if !defined(SOUND_PCM_WRITE_CHANNELS) && defined(SNDCTL_DSP_CHANNELS)
+//   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
+// #endif
 

Lines 19-24 include/fluidsynth/version.h Link Here

(-)./pkg-plist (-1 / +1 lines)
19	include/fluidsynth/voice.h	19	include/fluidsynth/voice.h
20	lib/libfluidsynth.so	20	lib/libfluidsynth.so
21	lib/libfluidsynth.so.1	21	lib/libfluidsynth.so.1
22	lib/libfluidsynth.so.1.5.2	22	lib/libfluidsynth.so.1.7.2
23	libdata/pkgconfig/fluidsynth.pc	23	libdata/pkgconfig/fluidsynth.pc
24	man/man1/fluidsynth.1.gz	24	man/man1/fluidsynth.1.gz

Return to bug 228265

Lines 2-28 Link Here

(-)./Makefile (-7 / +8 lines)
2	# $FreeBSD: head/audio/fluidsynth/Makefile 469288 2018-05-07 13:55:33Z amdmi3 $	2	# $FreeBSD: head/audio/fluidsynth/Makefile 469288 2018-05-07 13:55:33Z amdmi3 $
3		3
4	PORTNAME= fluidsynth	4	PORTNAME= fluidsynth
5	PORTVERSION= 1.1.6	5	PORTVERSION= 1.1.11
6	PORTREVISION= 5
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9		7
10	MAINTAINER= multimedia@FreeBSD.org	8	MAINTAINER= multimedia@FreeBSD.org
11	COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications	9	COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications
12		10
13	LICENSE= LGPL20+	11	LICENSE= LGPL21
14	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/LICENSE
		13
		14	GH_ACCOUNT= FluidSynth
		15	GH_TAGNAME= v${PORTVERSION}
15		16
16	OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO READLINE \	17	OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO READLINE \
17	SNDFILE SNDIO	18	SNDFILE SNDIO
18	OPTIONS_DEFAULT= JACK READLINE	19	OPTIONS_DEFAULT= JACK READLINE
19		20
20	USES= cmake pkgconfig tar:bzip2	21	USES= cmake pkgconfig tar:bzip2
		22	USE_GITHUB= yes
21	USE_GNOME= glib20	23	USE_GNOME= glib20
		24	USE_LDCONFIG= yes
22	CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \	25	CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \
23	-Denable-midishare:BOOL=FALSE	26	-Denable-midishare:BOOL=FALSE
24	USE_LDCONFIG= yes
25
26	LDFLAGS+= -lpthread	27	LDFLAGS+= -lpthread
27		28
28	JACK_LIB_DEPENDS= libjack.so:audio/jack	29	JACK_LIB_DEPENDS= libjack.so:audio/jack

Lines 1-22 Link Here

(-)./files/patch-CMakeLists.txt (-16 / +16 lines)
1	--- CMakeLists.txt.orig 2012-08-16 04:01:13 UTC	1	--- CMakeLists.txt.orig 2018-05-06 07:05:11 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -61,6 +61,7 @@ option ( enable-debug "enable debugging	3	@@ -68,6 +68,7 @@ option ( enable-midishare "compile MidiS
4	option ( enable-libsndfile "compile libsndfile support (if it is available)" on )	4	option ( enable-oss "compile OSS support (if it is available)" on )
5	option ( enable-aufile "compile support for sound file output" on )	5	option ( enable-pkgconfig "use pkg-config to locate fluidsynth's (mostly optional) dependencies" on )
6	option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )	6	option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
7	+option ( enable-sndio "compile Sndio support (if it is available)" on )	7	+option ( enable-sndio "compile Sndio support (if it is available)" on )
8	option ( enable-jack "compile JACK support (if it is available)" on )
9	option ( enable-midishare "compile MidiShare support (if it is available)" on )
10	option ( enable-readline "compile readline lib line editing (if it is available)" on )	8	option ( enable-readline "compile readline lib line editing (if it is available)" on )
11	@@ -313,6 +314,11 @@ else ( enable-pulseaudio )
12	unset_pkg_config ( PULSE )
13	endif ( enable-pulseaudio )
14		9
15	+unset ( SNDIO_SUPPORT CACHE )	10	# Platform specific options
16	+if ( enable-sndio )	11	@@ -358,6 +359,11 @@ else(NOT enable-pkgconfig)
17	+ set ( SNDIO_SUPPORT 1 )	12	unset_pkg_config ( PULSE )
18	+endif ( enable-sndio )	13	endif ( enable-pulseaudio )
		14
		15	+ unset ( SNDIO_SUPPORT CACHE )
		16	+ if ( enable-sndio )
		17	+ set ( SNDIO_SUPPORT 1 )
		18	+ endif ( enable-sndio )
19	+	19	+
20	unset ( ALSA_SUPPORT CACHE )	20	unset ( ALSA_SUPPORT CACHE )
21	if ( enable-alsa )	21	if ( enable-alsa )
22	pkg_check_modules ( ALSA alsa>=0.9.1 )	22	pkg_check_modules ( ALSA alsa>=0.9.1 )

Lines 1-5 Link Here

(-)./files/patch-src_drivers_fluid__adriver.c (-16 / +16 lines)
1	$OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp $	1	--- src/drivers/fluid_adriver.c.orig 2018-05-06 07:05:11 UTC
2	--- src/drivers/fluid_adriver.c.orig 2012-08-16 04:01:13 UTC
3	+++ src/drivers/fluid_adriver.c	2	+++ src/drivers/fluid_adriver.c
4	@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_	3	@@ -64,6 +64,15 @@ int delete_fluid_oss_audio_driver(fluid_
5	void fluid_oss_audio_driver_settings(fluid_settings_t* settings);	4	void fluid_oss_audio_driver_settings(fluid_settings_t* settings);
Lines 7-15 $OpenBSD: patch-src_drivers_fluid_adrive Link Here
7		6
8	+#if SNDIO_SUPPORT	7	+#if SNDIO_SUPPORT
9	+fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings,	8	+fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings,
10	+ fluid_synth_t* synth);	9	+ fluid_synth_t* synth);
11	+fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings,	10	+fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings,
12	+ fluid_audio_func_t func, void* data);	11	+ fluid_audio_func_t func, void* data);
13	+int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p);	12	+int delete_fluid_sndio_audio_driver(fluid_audio_driver_t* p);
14	+void fluid_sndio_audio_driver_settings(fluid_settings_t* settings);	13	+void fluid_sndio_audio_driver_settings(fluid_settings_t* settings);
15	+#endif	14	+#endif
Lines 17-37 $OpenBSD: patch-src_drivers_fluid_adrive Link Here
17	#if COREAUDIO_SUPPORT	16	#if COREAUDIO_SUPPORT
18	fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings,	17	fluid_audio_driver_t* new_fluid_core_audio_driver(fluid_settings_t* settings,
19	fluid_synth_t* synth);	18	fluid_synth_t* synth);
20	@@ -120,6 +129,13 @@ int delete_fluid_file_audio_driver(fluid	19	@@ -122,6 +131,14 @@ int delete_fluid_file_audio_driver(fluid
21
22	/* Available audio drivers, listed in order of preference */	20	/* Available audio drivers, listed in order of preference */
23	fluid_audriver_definition_t fluid_audio_drivers[] = {	21	static const fluid_audriver_definition_t fluid_audio_drivers[] =
		22	{
24	+#if SNDIO_SUPPORT	23	+#if SNDIO_SUPPORT
25	+ { "sndio",	24	+ { "sndio",
26	+ new_fluid_sndio_audio_driver,	25	+ new_fluid_sndio_audio_driver,
27	+ new_fluid_sndio_audio_driver2,	26	+ new_fluid_sndio_audio_driver2,
28	+ delete_fluid_sndio_audio_driver,	27	+ delete_fluid_sndio_audio_driver,
29	+ fluid_sndio_audio_driver_settings },	28	+ fluid_sndio_audio_driver_settings },
30	+#endif	29	+#endif
		30	+
31	#if JACK_SUPPORT	31	#if JACK_SUPPORT
32	{ "jack",	32	{ "jack",
33	new_fluid_jack_audio_driver,	33	new_fluid_jack_audio_driver,
34	@@ -223,7 +239,9 @@ void fluid_audio_driver_settings(fluid_s	34	@@ -238,7 +255,9 @@ void fluid_audio_driver_settings(fluid_s
35	FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL);	35	FLUID_DEFAULT_AUDIO_RT_PRIO, 0, 99, 0, NULL, NULL);
36		36
37	/* Set the default driver */	37	/* Set the default driver */
Lines 42-48 $OpenBSD: patch-src_drivers_fluid_adrive Link Here
42	fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL);	42	fluid_settings_register_str(settings, "audio.driver", "jack", 0, NULL, NULL);
43	#elif ALSA_SUPPORT	43	#elif ALSA_SUPPORT
44	fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL);	44	fluid_settings_register_str(settings, "audio.driver", "alsa", 0, NULL, NULL);
45	@@ -257,6 +275,9 @@ void fluid_audio_driver_settings(fluid_s	45	@@ -272,6 +291,9 @@ void fluid_audio_driver_settings(fluid_s
46	#if OSS_SUPPORT	46	#if OSS_SUPPORT
47	fluid_settings_add_option(settings, "audio.driver", "oss");	47	fluid_settings_add_option(settings, "audio.driver", "oss");
48	#endif	48	#endif

Lines 1-20 Link Here

(-)./files/patch-src_drivers_fluid__alsa.c (-20 lines)
1	--- src/drivers/fluid_alsa.c.orig 2012-08-16 04:01:13 UTC
2	+++ src/drivers/fluid_alsa.c
3	@@ -347,14 +347,16 @@ static int fluid_alsa_handle_write_error
4	case -EAGAIN:
5	snd_pcm_wait(pcm, 1);
6	break;
7	- case -EPIPE:
8	case -EBADFD:
9	if (snd_pcm_prepare(pcm) != 0) {
10	FLUID_LOG(FLUID_ERR, "Failed to prepare the audio device");
11	return FLUID_FAILED;
12	}
13	break;
14	+ case -EPIPE:
15	+#if EPIPE != ESTRPIPE
16	case -ESTRPIPE:
17	+#endif
18	if ((snd_pcm_resume(pcm) != 0) && (snd_pcm_prepare(pcm) != 0)) {
19	FLUID_LOG(FLUID_ERR, "Failed to resume the audio device");
20	return FLUID_FAILED;

Lines 1-13 Link Here

(-)./files/patch-src_drivers_fluid__oss.c (-3 / +3 lines)
1	--- src/drivers/fluid_oss.c.orig 2012-08-16 04:01:13 UTC	1	--- src/drivers/fluid_oss.c.orig 2018-05-06 07:05:11 UTC
2	+++ src/drivers/fluid_oss.c	2	+++ src/drivers/fluid_oss.c
3	@@ -45,9 +45,9 @@	3	@@ -45,9 +45,9 @@
4	#define BUFFER_LENGTH 512	4	#define BUFFER_LENGTH 512
5		5
6	// Build issue on some systems (OSS 4.0)?	6	// Build issue on some systems (OSS 4.0)?
7	-#ifdef SNDCTL_DSP_CHANNELS	7	-#if !defined(SOUND_PCM_WRITE_CHANNELS) && defined(SNDCTL_DSP_CHANNELS)
8	- #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS	8	- #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS
9	-#endif	9	-#endif
10	+// #ifdef SNDCTL_DSP_CHANNELS	10	+// #if !defined(SOUND_PCM_WRITE_CHANNELS) && defined(SNDCTL_DSP_CHANNELS)
11	+// #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS	11	+// #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS
12	+// #endif	12	+// #endif
13		13