diff -urN /usr/ports/audio/fluidsynth/Makefile audio/fluidsynth/Makefile --- /usr/ports/audio/fluidsynth/Makefile 2011-09-24 13:19:27.000000000 +0900 +++ audio/fluidsynth/Makefile 2011-09-24 13:48:02.000000000 +0900 @@ -6,71 +6,92 @@ # PORTNAME= fluidsynth -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.5 CATEGORIES= audio -MASTER_SITES= SAVANNAH/fluid +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications +LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING + OPTIONS= JACK "Enable Jack audio support" On \ + ALSA "Enable ALSA audio support" Off \ + DBUS "Enable D-Bus support" Off \ LADSPA "Enable LADSPA audio support" Off \ + LASH "Enable LASH audio support" Off \ PORTAUDIO "Enable PortAudio support" Off \ PULSEAUDIO "Enable PulseAudio support" Off \ SNDFILE "Enable Libsndfile support" Off -USE_GNOME= glib20 gnomehack pkgconfig -USE_GMAKE= yes -USE_AUTOTOOLS= libtool -CONFIGURE_ARGS= --disable-alsa-support --disable-midishare \ - --disable-coreaudio --disable-coremidi \ - --disable-dart --disable-lash \ - --disable-ladcca +USE_BZIP2= yes +USE_GNOME= glib20 pkgconfig +USE_CMAKE= yes +CMAKE_USE_PTHREAD=yes +CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ + -Denable-midishare:BOOL=FALSE \ + -DCMAKE_SHARED_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" USE_LDCONFIG= yes MAN1= fluidsynth.1 -CPPFLAGS+= ${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= ${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} - .include .if defined(WITH_JACK) LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .else -CONFIGURE_ARGS+= --disable-jack-support +CMAKE_ARGS+= -Denable-jack:BOOL=FALSE +.endif + +.if defined(WITH_ALSA) +LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +.else +CMAKE_ARGS+= -Denable-alsa:BOOL=FALSE +.endif + +.if defined(WITH_DBUS) +LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus +.else +CMAKE_ARGS+= -Denable-dbus:BOOL=FALSE .endif .if defined(WITH_LADSPA) BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa RUN_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -CONFIGURE_ARGS+= --enable-ladspa +CMAKE_ARGS+= -Denable-ladspa:BOOL=TRUE +.endif + +.if defined(WITH_LASH) +LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash +.else +CMAKE_ARGS+= -Denable-lash:BOOL=FALSE .endif .if defined(WITH_PORTAUDIO) BUILD_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 RUN_DEPENDS+= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 -PA2_CFLAGS= `pkg-config --cflags-only-I portaudio-2.0` -PA2_LIBS= `pkg-config --libs-only-L portaudio-2.0` -.else -CONFIGURE_ARGS+= --disable-portaudio-support +CMAKE_ARGS+= -Denable-portaudio:BOOL=TRUE .endif .if defined(WITH_PULSEAUDIO) LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio .else -CONFIGURE_ARGS+= --disable-pulse-support +CMAKE_ARGS+= -Denable-pulseaudio:BOOL=FALSE .endif .if defined(WITH_SNDFILE) LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile .else -CONFIGURE_ARGS+= --disable-libsndfile-support +CMAKE_ARGS+= -Denable-libsndfile:BOOL=FALSE .endif post-patch: - @${REINPLACE_CMD} -e 's| -O2 | |g ; \ - s|== "yes"|= "yes"|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '197 s/,/ /' ${WRKSRC}/include/fluidsynth/synth.h + @${REINPLACE_CMD} -e \ + '/Linux/s|^|#| ; \ + s|enable_midishare|enable-midishare| ; \ + s|$${LIB_INSTALL_DIR}$${LIB_SUFFIX}/pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + 's|share/man|man|' ${WRKSRC}/cmake_admin/DefaultDirs.cmake .include diff -urN /usr/ports/audio/fluidsynth/distinfo audio/fluidsynth/distinfo --- /usr/ports/audio/fluidsynth/distinfo 2011-03-20 02:13:40.000000000 +0900 +++ audio/fluidsynth/distinfo 2011-09-05 04:01:15.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (fluidsynth-1.1.1.tar.gz) = 55638cb04f39f4df76c081e22ca7feeea58ddd20ebf779a7db2d38b1ff374cd6 -SIZE (fluidsynth-1.1.1.tar.gz) = 756184 +SHA256 (fluidsynth-1.1.5.tar.bz2) = 44b40ee28f0ed1718c924d8a175e30381431edfb9320026480d56daf7351e3f4 +SIZE (fluidsynth-1.1.5.tar.bz2) = 800195 diff -urN /usr/ports/audio/fluidsynth/files/patch-src__CMakeLists.txt audio/fluidsynth/files/patch-src__CMakeLists.txt --- /usr/ports/audio/fluidsynth/files/patch-src__CMakeLists.txt 1970-01-01 09:00:00.000000000 +0900 +++ audio/fluidsynth/files/patch-src__CMakeLists.txt 2011-09-05 16:30:34.000000000 +0900 @@ -0,0 +1,59 @@ +--- src/CMakeLists.txt.orig 2011-09-04 16:38:58.000000000 +0900 ++++ src/CMakeLists.txt 2011-09-05 16:30:18.000000000 +0900 +@@ -42,6 +42,11 @@ + include_directories ( ${READLINE_INCLUDE_DIR} ) + endif ( READLINE_SUPPORT ) + ++if ( PORTAUDIO_SUPPORT ) ++ set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c ) ++ include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} ) ++endif ( PORTAUDIO_SUPPORT ) ++ + if ( PULSE_SUPPORT ) + set ( fluid_pulse_SOURCES drivers/fluid_pulse.c ) + include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} ) +@@ -70,11 +75,6 @@ + include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} ) + endif ( JACK_SUPPORT ) + +-if ( PORTAUDIO_SUPPORT ) +- set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c ) +- include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} ) +-endif ( PORTAUDIO_SUPPORT ) +- + if ( WINDOWS_SUPPORT ) + set ( fluid_windows_SOURCES fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c ) + endif ( WINDOWS_SUPPORT ) +@@ -207,6 +207,8 @@ + ) + + link_directories ( ++ ${PORTAUDIO_LIBDIR} ++ ${PORTAUDIO_LIBRARY_DIRS} + ${GLIB_LIBDIR} + ${GLIB_LIBRARY_DIRS} + ${LASH_LIBDIR} +@@ -219,8 +221,6 @@ + ${ALSA_LIBRARY_DIRS} + ${PULSE_LIBDIR} + ${PULSE_LIBRARY_DIRS} +- ${PORTAUDIO_LIBDIR} +- ${PORTAUDIO_LIBRARY_DIRS} + ${LIBSNDFILE_LIBDIR} + ${LIBSNDFILE_LIBRARY_DIRS} + ${DBUS_LIBDIR} +@@ -280,13 +280,13 @@ + endif ( LIBFLUID_CPPFLAGS ) + + target_link_libraries ( libfluidsynth ++ ${PORTAUDIO_LIBRARIES} + ${GLIB_LIBRARIES} + ${LASH_LIBRARIES} + ${LADCCA_LIBRARIES} + ${JACK_LIBRARIES} + ${ALSA_LIBRARIES} + ${PULSE_LIBRARIES} +- ${PORTAUDIO_LIBRARIES} + ${LIBSNDFILE_LIBRARIES} + ${DBUS_LIBRARIES} + ${READLINE_LIBS} diff -urN /usr/ports/audio/fluidsynth/files/patch-src__Makefile.in audio/fluidsynth/files/patch-src__Makefile.in --- /usr/ports/audio/fluidsynth/files/patch-src__Makefile.in 2010-01-05 08:14:28.000000000 +0900 +++ audio/fluidsynth/files/patch-src__Makefile.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,22 +0,0 @@ ---- src/Makefile.in.orig 2009-10-31 04:23:15.000000000 +0900 -+++ src/Makefile.in 2009-11-03 15:44:55.000000000 +0900 -@@ -397,13 +397,15 @@ - fluid_filerenderer.c \ - fluid_aufile.c - --INCLUDES = -I$(top_srcdir)/include $(LASH_CFLAGS) $(LADCCA_CFLAGS) \ -+INCLUDES = -I$(top_srcdir)/include \ -+ $(PORTAUDIO_CFLAGS) $(LASH_CFLAGS) $(LADCCA_CFLAGS) \ - $(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \ -- $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS) -+ $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS) - --libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \ -+libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) \ -+ $(PORTAUDIO_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \ - $(READLINE_LIBS) $(COREAUDIO_LIBS) $(COREMIDI_LIBS) $(JACK_LIBS) \ -- $(ALSA_LIBS) $(PULSE_LIBS) $(PORTAUDIO_LIBS) $(DART_LIBS) \ -+ $(ALSA_LIBS) $(PULSE_LIBS) $(DART_LIBS) \ - $(GLIB_LIBS) $(LIBSNDFILE_LIBS) - - libfluidsynth_la_LDFLAGS = \ diff -urN /usr/ports/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c --- /usr/ports/audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c 1970-01-01 09:00:00.000000000 +0900 +++ audio/fluidsynth/files/patch-src__bindings__fluid_rtkit.c 2011-09-05 17:07:25.000000000 +0900 @@ -0,0 +1,39 @@ +--- src/bindings/fluid_rtkit.c.orig 2011-09-04 16:38:58.000000000 +0900 ++++ src/bindings/fluid_rtkit.c 2011-09-05 17:07:06.000000000 +0900 +@@ -34,7 +34,7 @@ + #include "fluid_rtkit.h" + + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) + + #ifndef _GNU_SOURCE + #define _GNU_SOURCE +@@ -44,12 +44,27 @@ + #include + #include + #include ++#include + #include + #include ++#include + ++#if defined(__FreeBSD__) ++#include ++#endif + + static pid_t _gettid(void) { ++#if defined(__FreeBSD__) ++#if __FreeBSD__version > 900030 ++ return pthread_getthreadid_np(); ++#else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ return tid; ++#endif ++#else + return (pid_t) syscall(SYS_gettid); ++#endif + } + + static int translate_error(const char *name) { diff -urN /usr/ports/audio/fluidsynth/pkg-plist audio/fluidsynth/pkg-plist --- /usr/ports/audio/fluidsynth/pkg-plist 2010-01-05 15:49:04.000000000 +0900 +++ audio/fluidsynth/pkg-plist 2011-09-05 16:33:40.000000000 +0900 @@ -17,9 +17,8 @@ include/fluidsynth/types.h include/fluidsynth/version.h include/fluidsynth/voice.h -lib/libfluidsynth.a -lib/libfluidsynth.la lib/libfluidsynth.so -lib/libfluidsynth.so.4 +lib/libfluidsynth.so.1 +lib/libfluidsynth.so.1.5.1 libdata/pkgconfig/fluidsynth.pc @dirrm include/fluidsynth