Date: Fri, 1 Jun 2018 21:44:32 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471296 - in head/audio/fluidsynth: . files Message-ID: <201806012144.w51LiWj1071095@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Fri Jun 1 21:44:32 2018 New Revision: 471296 URL: https://svnweb.freebsd.org/changeset/ports/471296 Log: Updtate to upstrem version. PR: 228265 Submitted by: takefu@airport.fm Reviewed by: riggs Approved by: multimedia@ (riggs) Deleted: head/audio/fluidsynth/files/patch-src_drivers_fluid__alsa.c Modified: head/audio/fluidsynth/Makefile head/audio/fluidsynth/distinfo head/audio/fluidsynth/files/patch-CMakeLists.txt head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c head/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c head/audio/fluidsynth/pkg-plist Modified: head/audio/fluidsynth/Makefile ============================================================================== --- head/audio/fluidsynth/Makefile Fri Jun 1 21:25:06 2018 (r471295) +++ head/audio/fluidsynth/Makefile Fri Jun 1 21:44:32 2018 (r471296) @@ -2,27 +2,28 @@ # $FreeBSD$ PORTNAME= fluidsynth -PORTVERSION= 1.1.6 -PORTREVISION= 5 +PORTVERSION= 1.1.11 +DISTVERSIONPREFIX= v CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= multimedia@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 +GH_ACCOUNT= FluidSynth + 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 Modified: head/audio/fluidsynth/distinfo ============================================================================== --- head/audio/fluidsynth/distinfo Fri Jun 1 21:25:06 2018 (r471295) +++ head/audio/fluidsynth/distinfo Fri Jun 1 21:44:32 2018 (r471296) @@ -1,2 +1,3 @@ -SHA256 (fluidsynth-1.1.6.tar.bz2) = d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601 -SIZE (fluidsynth-1.1.6.tar.bz2) = 823783 +TIMESTAMP = 1527888754 +SHA256 (FluidSynth-fluidsynth-v1.1.11_GH0.tar.gz) = da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8 +SIZE (FluidSynth-fluidsynth-v1.1.11_GH0.tar.gz) = 634566 Modified: head/audio/fluidsynth/files/patch-CMakeLists.txt ============================================================================== --- head/audio/fluidsynth/files/patch-CMakeLists.txt Fri Jun 1 21:25:06 2018 (r471295) +++ head/audio/fluidsynth/files/patch-CMakeLists.txt Fri Jun 1 21:44:32 2018 (r471296) @@ -1,22 +1,22 @@ ---- 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,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 ) + unset ( ALSA_SUPPORT CACHE ) + if ( enable-alsa ) + pkg_check_modules ( ALSA alsa>=0.9.1 ) Modified: head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c ============================================================================== --- head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c Fri Jun 1 21:25:06 2018 (r471295) +++ head/audio/fluidsynth/files/patch-src_drivers_fluid__adriver.c Fri Jun 1 21:44:32 2018 (r471296) @@ -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_adriver_c,v 1.1 2013 +#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_adriver_c,v 1.1 2013 #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_adriver_c,v 1.1 2013 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 Modified: head/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c ============================================================================== --- head/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c Fri Jun 1 21:25:06 2018 (r471295) +++ head/audio/fluidsynth/files/patch-src_drivers_fluid__oss.c Fri Jun 1 21:44:32 2018 (r471296) @@ -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 Modified: head/audio/fluidsynth/pkg-plist ============================================================================== --- head/audio/fluidsynth/pkg-plist Fri Jun 1 21:25:06 2018 (r471295) +++ head/audio/fluidsynth/pkg-plist Fri Jun 1 21:44:32 2018 (r471296) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806012144.w51LiWj1071095>