FreeBSD Bugzilla – Attachment 193413 Details for
Bug 228265
audio/fluidsynth: Update to 1.1.11
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
fluidsynth-1.1.11.patch
fluidsynth-1.1.11.patch (text/plain), 8.74 KB, created by
takefu
on 2018-05-15 06:21:55 UTC
(
hide
)
Description:
fluidsynth-1.1.11.patch
Filename:
MIME Type:
Creator:
takefu
Created:
2018-05-15 06:21:55 UTC
Size:
8.74 KB
patch
obsolete
>diff -udprN /usr/ports/audio/fluidsynth/Makefile ./Makefile >--- /usr/ports/audio/fluidsynth/Makefile 2018-05-07 13:55:33.000000000 +0000 >+++ ./Makefile 2018-05-10 00:58:59.245928000 +0000 >@@ -2,22 +2,24 @@ > # $FreeBSD: head/audio/fluidsynth/Makefile 469288 2018-05-07 13:55:33Z amdmi3 $ > > PORTNAME= fluidsynth >-PORTVERSION= 1.1.6 >-PORTREVISION= 5 >+PORTVERSION= 1.1.11 > CATEGORIES= audio >-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} > >-MAINTAINER= multimedia@FreeBSD.org >+GH_ACCOUNT= FluidSynth >+GH_TAGNAME= v${PORTVERSION} >+ >+MAINTAINER= je3kmz@freebsd.org > COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications > >-LICENSE= LGPL20+ >-LICENSE_FILE= ${WRKSRC}/COPYING >+LICENSE= LGPL21 >+LICENSE_FILE= ${WRKSRC}/LICENSE > > 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 > CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ > -Denable-midishare:BOOL=FALSE >diff -udprN /usr/ports/audio/fluidsynth/distinfo ./distinfo >--- /usr/ports/audio/fluidsynth/distinfo 2013-02-04 09:34:00.000000000 +0000 >+++ ./distinfo 2018-05-10 00:50:19.696340000 +0000 >@@ -1,2 +1,3 @@ >-SHA256 (fluidsynth-1.1.6.tar.bz2) = d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601 >-SIZE (fluidsynth-1.1.6.tar.bz2) = 823783 >+TIMESTAMP = 1525913419 >+SHA256 (FluidSynth-fluidsynth-1.1.11-v1.1.11_GH0.tar.gz) = da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8 >+SIZE (FluidSynth-fluidsynth-1.1.11-v1.1.11_GH0.tar.gz) = 634566 >diff -udprN /usr/ports/audio/fluidsynth/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt >--- /usr/ports/audio/fluidsynth/files/patch-CMakeLists.txt 2016-12-17 13:41:32.000000000 +0000 >+++ ./files/patch-CMakeLists.txt 2018-05-15 06:04:04.011419000 +0000 >@@ -1,22 +1,25 @@ >---- CMakeLists.txt.orig 2012-08-16 04:01:13 UTC >+--- CMakeLists.txt.orig 2018-05-06 07:05:11 UTC > +++ CMakeLists.txt >-@@ -61,6 +61,7 @@ option ( enable-debug "enable debugging >- option ( enable-libsndfile "compile libsndfile support (if it is available)" on ) >- option ( enable-aufile "compile support for sound file output" on ) >+@@ -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 ) > >-+unset ( SNDIO_SUPPORT CACHE ) >-+if ( enable-sndio ) >-+ set ( SNDIO_SUPPORT 1 ) >-+endif ( enable-sndio ) >+ # Platform specific options >+@@ -358,6 +359,14 @@ else(NOT enable-pkgconfig) >+ unset_pkg_config ( PULSE ) >+ endif ( enable-pulseaudio ) >+ >++ unset ( SNDIO_SUPPORT CACHE ) >++ if ( enable-sndio ) >++ pkg_check_modules ( SNDIO libsndio>=1.4.0 ) >++ set ( SNDIO_SUPPORT ${SNDIO_FOUND} ) >++ else ( enable-sndio ) >++ unset_pkg_config ( SNDIO ) >++ endif ( enable-sndio ) > + >- unset ( ALSA_SUPPORT CACHE ) >- if ( enable-alsa ) >- pkg_check_modules ( ALSA alsa>=0.9.1 ) >+ unset ( ALSA_SUPPORT CACHE ) >+ if ( enable-alsa ) >+ pkg_check_modules ( ALSA alsa>=0.9.1 ) >diff -udprN /usr/ports/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c ./files/patch-src_drivers_fluid__adriver.c >--- /usr/ports/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c 2016-12-17 13:41:32.000000000 +0000 >+++ ./files/patch-src_drivers_fluid__adriver.c 2018-05-15 06:04:23.975581000 +0000 >@@ -1,5 +1,4 @@ >-$OpenBSD: patch-src_drivers_fluid_adriver_c,v 1.1 2013/03/29 12:37:43 sthen Exp $ >---- src/drivers/fluid_adriver.c.orig 2012-08-16 04:01:13 UTC >+--- src/drivers/fluid_adriver.c.orig 2018-05-06 07:05:11 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); >@@ -7,9 +6,9 @@ $OpenBSD: patch-src_drivers_fluid_adrive > > +#if SNDIO_SUPPORT > +fluid_audio_driver_t* new_fluid_sndio_audio_driver(fluid_settings_t* settings, >-+ fluid_synth_t* synth); >++ fluid_synth_t* synth); > +fluid_audio_driver_t* new_fluid_sndio_audio_driver2(fluid_settings_t* settings, >-+ fluid_audio_func_t func, void* data); >++ 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 >@@ -17,21 +16,22 @@ $OpenBSD: patch-src_drivers_fluid_adrive > #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 >- >+@@ -122,6 +131,14 @@ int delete_fluid_file_audio_driver(fluid > /* 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_s >+ { "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 */ >@@ -42,7 +42,7 @@ $OpenBSD: patch-src_drivers_fluid_adrive > 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); >-@@ -257,6 +275,9 @@ void fluid_audio_driver_settings(fluid_s >+@@ -272,6 +291,9 @@ void fluid_audio_driver_settings(fluid_s > #if OSS_SUPPORT > fluid_settings_add_option(settings, "audio.driver", "oss"); > #endif >diff -udprN /usr/ports/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c ./files/patch-src_drivers_fluid__alsa.c >--- /usr/ports/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c 2016-07-26 16:51:15.000000000 +0000 >+++ ./files/patch-src_drivers_fluid__alsa.c 1970-01-01 00:00:00.000000000 +0000 >@@ -1,20 +0,0 @@ >---- 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; >diff -udprN /usr/ports/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c ./files/patch-src_drivers_fluid__oss.c >--- /usr/ports/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c 2016-07-26 16:51:15.000000000 +0000 >+++ ./files/patch-src_drivers_fluid__oss.c 2018-05-15 06:04:45.025872000 +0000 >@@ -1,13 +1,13 @@ >---- src/drivers/fluid_oss.c.orig 2012-08-16 04:01:13 UTC >+--- 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)? >--#ifdef SNDCTL_DSP_CHANNELS >+-#if !defined(SOUND_PCM_WRITE_CHANNELS) && defined(SNDCTL_DSP_CHANNELS) > - #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS > -#endif >-+// #ifdef SNDCTL_DSP_CHANNELS >++// #if !defined(SOUND_PCM_WRITE_CHANNELS) && defined(SNDCTL_DSP_CHANNELS) > +// #define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS > +// #endif > >diff -udprN /usr/ports/audio/fluidsynth/pkg-plist ./pkg-plist >--- /usr/ports/audio/fluidsynth/pkg-plist 2014-09-22 09:49:39.000000000 +0000 >+++ ./pkg-plist 2018-05-10 01:31:17.707531000 +0000 >@@ -19,6 +19,6 @@ include/fluidsynth/version.h > include/fluidsynth/voice.h > lib/libfluidsynth.so > lib/libfluidsynth.so.1 >-lib/libfluidsynth.so.1.5.2 >+lib/libfluidsynth.so.1.7.2 > libdata/pkgconfig/fluidsynth.pc > man/man1/fluidsynth.1.gz
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 228265
:
193413
|
193417
|
193418