Date: Thu, 20 Nov 2014 13:09:20 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372914 - head/audio/fluidsynth Message-ID: <201411201309.sAKD9KX9079428@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Nov 20 13:09:20 2014 New Revision: 372914 URL: https://svnweb.freebsd.org/changeset/ports/372914 QAT: https://qat.redports.org/buildarchive/r372914/ Log: - Fix build with PORTAUDIO option enabled in presence of old portaudio by always prepending portaudio2 include/link paths [1] - While here, add LICENSE_FILE Approved by: kwm [1] (via irc) Modified: head/audio/fluidsynth/Makefile Modified: head/audio/fluidsynth/Makefile ============================================================================== --- head/audio/fluidsynth/Makefile Thu Nov 20 13:09:05 2014 (r372913) +++ head/audio/fluidsynth/Makefile Thu Nov 20 13:09:20 2014 (r372914) @@ -11,6 +11,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Real-time software synthesizer based on the SoundFont 2 specifications LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO SNDFILE OPTIONS_DEFAULT= JACK @@ -21,8 +22,8 @@ CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ -Denable-midishare:BOOL=FALSE USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib ${PTHREAD_LIBS} JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CMAKE_OFF= -Denable-jack:BOOL=FALSE @@ -43,8 +44,6 @@ LASH_CMAKE_OFF= -Denable-lash:BOOL=FALS PORTAUDIO_BUILD_DEPENDS= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 PORTAUDIO_RUN_DEPENDS= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 PORTAUDIO_CMAKE_ON= -Denable-portaudio:BOOL=TRUE -PORTAUDIO_CFLAGS= -I${LOCALBASE}/include/portaudio2 -PORTAUDIO_LDFLAGS= -L${LOCALBASE}/lib/portaudio2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -Denable-pulseaudio:BOOL=FALSE @@ -52,12 +51,6 @@ PULSEAUDIO_CMAKE_OFF= -Denable-pulseaudi SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile SNDFILE_CMAKe_OFF= -Denable-libsndfile:BOOL=FALSE -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPORTAUDIO} && exists(${LOCALBASE}/include/portaudio.h) -BROKEN= portaudio2 support does not build in presence of old portaudio -.endif - post-patch: @${REINPLACE_CMD} -e \ '/Linux/s|^|#| ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411201309.sAKD9KX9079428>