Date: Sat, 30 May 2015 20:39:13 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387982 - in head: . audio audio/baresip audio/baresip/files audio/csound audio/csound/files audio/csound6 audio/denemo audio/espeak audio/fluidsynth audio/fmit audio/gnaural audio/hydr... Message-ID: <201505302039.t4UKdDuL011091@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat May 30 20:39:12 2015 New Revision: 387982 URL: https://svnweb.freebsd.org/changeset/ports/387982 Log: Update portaudio to v19/Remove portaudio2 [1] Chase portaudio change Add patches from debian for games/cultivation Add patches from upsteam for audio/rezound Mark py-fastaudio as broken Approved by: maintainer Added: head/audio/rezound/files/050_all_portaudio19.patch (contents, props changed) head/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp (contents, props changed) head/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h (contents, props changed) head/games/cultivation/files/portaudio19.patch (contents, props changed) Deleted: head/audio/baresip/files/ head/audio/lmms/files/patch-include_AudioPortAudio.h head/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h head/audio/portaudio/files/ head/audio/portaudio2/ head/comms/fldigi/files/patch-Makefile.in head/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake Modified: head/MOVED head/audio/Makefile head/audio/baresip/Makefile head/audio/baresip/Makefile.depends head/audio/csound/Makefile head/audio/csound/files/custom.py.in head/audio/csound6/Makefile head/audio/denemo/Makefile head/audio/espeak/Makefile head/audio/fluidsynth/Makefile head/audio/fmit/Makefile head/audio/gnaural/Makefile head/audio/hydrogen-devel/Makefile head/audio/listener/Makefile head/audio/lmms/Makefile head/audio/lmms/files/patch-CMakeLists.txt head/audio/mhwaveedit/Makefile head/audio/mixxx/Makefile head/audio/mixxx/files/patch-build__depends.py head/audio/musescore/Makefile head/audio/openal-soft/Makefile head/audio/portaudio/Makefile head/audio/portaudio/distinfo head/audio/portaudio/pkg-plist head/audio/pure-audio/Makefile head/audio/py-fastaudio/Makefile head/audio/py-pyaudio/Makefile head/audio/py-pyaudio/files/patch-setup.py head/audio/rezound/Makefile head/audio/zynaddsubfx/Makefile head/comms/dabstick-radio/Makefile head/comms/fldigi/Makefile head/comms/gnuradio/Makefile head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt head/comms/jsdr/Makefile head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro head/comms/linrad/Makefile head/comms/quisk/Makefile head/comms/wsjt/Makefile head/comms/wspr/Makefile head/comms/wspr/files/patch-configure.ac head/emulators/dolphin-emu/Makefile head/emulators/dolphin-emu/files/patch-CMakeLists.txt head/emulators/hatari/Makefile head/games/crrcsim/Makefile head/games/cultivation/Makefile head/games/glob2/Makefile head/math/freemat/Makefile head/math/freemat/files/patch-CMakeLists.txt head/math/octave-forge-ltfat/Makefile head/multimedia/aegisub/Makefile head/multimedia/mplayer2/Makefile head/net/pjsip/Makefile head/net/wireshark/Makefile head/russian/emkatic/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat May 30 20:18:19 2015 (r387981) +++ head/MOVED Sat May 30 20:39:12 2015 (r387982) @@ -7605,3 +7605,4 @@ net/rubygem-rightslicehost|net/rubygem-r audio/rubygem-shout|audio/rubygem-ruby-shout|2015-05-27|Rename to match our rubygems naming devel/rubygem-test|devel/rubygem-rubygems-test|2015-05-29|Rename to match our rubygems naming devel/rubygem-deeptest|devel/rubygem-deep_test|2015-05-30|Rename to match our rubygems naming +audio/portaudio2|audio/portaudio|2015-05-30|Merged into the main port Modified: head/audio/Makefile ============================================================================== --- head/audio/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -592,7 +592,6 @@ SUBDIR += pms SUBDIR += pocketsphinx SUBDIR += portaudio - SUBDIR += portaudio2 SUBDIR += praat SUBDIR += puddletag SUBDIR += pulseaudio Modified: head/audio/baresip/Makefile ============================================================================== --- head/audio/baresip/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/baresip/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -2,7 +2,7 @@ PORTNAME= baresip PORTVERSION= 0.4.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.creytiv.com/pub/ @@ -108,7 +108,7 @@ post-patch: ${ECHO_CMD} ' @${ECHO_CMD} $$(MODULES)' >> ${WRKSRC}/Makefile ${REINPLACE_CMD} 's,-lcelt[0-9]*,$$(pkg-config --libs celt),' \ ${WRKSRC}/modules/celt/module.mk - ${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib/portaudio2 -lportaudio,' \ + ${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib -lportaudio,' \ ${WRKSRC}/modules/portaudio/module.mk do-install: Modified: head/audio/baresip/Makefile.depends ============================================================================== --- head/audio/baresip/Makefile.depends Sat May 30 20:18:19 2015 (r387981) +++ head/audio/baresip/Makefile.depends Sat May 30 20:39:12 2015 (r387982) @@ -17,7 +17,7 @@ L16_DEPEND= OPUS_DEPEND= ${LOCALBASE}/include/opus/opus.h:${PORTSDIR}/audio/opus OSS_DEPEND= # In base PLC_DEPEND= ${LOCALBASE}/include/spandsp/plc.h:${PORTSDIR}/comms/spandsp -PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_DEPEND= ${LOCALBASE}/include/portaudio.h:${PORTSDIR}/audio/portaudio SDL_DEPEND= # Handled with USE_SDL in Makefile SNDFILE_DEPEND= ${LOCALBASE}/include/sndfile.h:${PORTSDIR}/audio/libsndfile SPEEX_DEPEND= ${LOCALBASE}/include/speex/speex.h:${PORTSDIR}/audio/speex Modified: head/audio/csound/Makefile ============================================================================== --- head/audio/csound/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/csound/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -107,15 +107,10 @@ MAKE_ARGS+= useOSC=0 .endif .if ${PORT_OPTIONS:MPORTAUDIO} -BUILD_DEPENDS+= portaudio2>=0:${PORTSDIR}/audio/portaudio2 -RUN_DEPENDS+= portaudio2>=0:${PORTSDIR}/audio/portaudio2 +LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio MAKE_ARGS+= usePortAudio=1 -PORTAUDIO_L= "${LOCALBASE}/lib/portaudio2" -PORTAUDIO_R= "-Wl,-rpath,${LOCALBASE}/lib/portaudio2" .else MAKE_ARGS+= usePortAudio=0 -PORTAUDIO_L= # empty -PORTAUDIO_R= # empty .endif .if ${PORT_OPTIONS:MPULSEAUDIO} @@ -157,9 +152,7 @@ CXXLIB= # empty post-patch: @${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|; \ - s|%%PORTAUDIO_L%%|${PORTAUDIO_L}|; \ - s|%%PORTAUDIO_R%%|${PORTAUDIO_R}|" \ + s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|" \ < ${FILESDIR}/custom.py.in > ${WRKSRC}/custom.py @${REINPLACE_CMD} -e "s|'unsupported'|'linux'|; \ s|Exit(-1)|print \"\"|; \ @@ -170,7 +163,6 @@ post-patch: /LINKFLAGS/s|\['-Wl,-Bdynamic'\]|Split('${LDFLAGS}')|; \ s|\"pthread\"|\"\"|; \ s|'pthread'|''|; \ - s|\"portaudio.h\"|\"portaudio2/portaudio.h\"|; \ s|\"boost/any.hpp\"|\"##boost/any.hpp##\"|; \ s|\"alsa/asoundlib.h\"|\"${ALSA_H}\"|; \ s|'xmlfile.h'|'##xmlfile.h##'|; \ @@ -186,8 +178,6 @@ post-patch: /jpluginEnvironment/s|'asound'|''|; \ /portaudioEnvironment/s|'asound'|''|; \ /jackEnvironment/s|'asound'|''|" ${WRKSRC}/SConstruct - @${REINPLACE_CMD} -e "s|<portaudio.h>|<portaudio2/portaudio.h>|" \ - ${WRKSRC}/InOut/rtpa.c @${REINPLACE_CMD} -e "s|linux/if.h|sys/types.h|" \ ${WRKSRC}/OOps/remote.c Modified: head/audio/csound/files/custom.py.in ============================================================================== --- head/audio/csound/files/custom.py.in Sat May 30 20:18:19 2015 (r387981) +++ head/audio/csound/files/custom.py.in Sat May 30 20:39:12 2015 (r387982) @@ -6,7 +6,7 @@ customCPPPATH = [ '%%LOCALBASE%%/include customCCFLAGS = [ ] customCXXFLAGS = [ ] customLIBS = [ 'intl' ] -customLIBPATH = [ '%%PORTAUDIO_L%%', '%%LOCALBASE%%/lib' ] -customSHLINKFLAGS = [ '%%PORTAUDIO_R%%' ] +customLIBPATH = [ '%%LOCALBASE%%/lib' ] +customSHLINKFLAGS = [ ] customSWIGFLAGS = [] platform = 'linux' Modified: head/audio/csound6/Makefile ============================================================================== --- head/audio/csound6/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/csound6/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,6 +3,7 @@ PORTNAME= csound PORTVERSION= 6.04 +PORTREVISION= 1 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} PKGNAMESUFFIX= 6 @@ -86,10 +87,8 @@ PNG_DESC= Build Image opcodes PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png PNG_CMAKE_OFF= -DBUILD_IMAGE_OPCODES:BOOL=OFF PORTAUDIO_DESC= Build PortAudio I/O module -PORTAUDIO_BUILD_DEPENDS=portaudio2>0:${PORTSDIR}/audio/portaudio2 -PORTAUDIO_RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 -PORTAUDIO_CMAKE_ON= -DPORTAUDIO_INCLUDE_PATH:STRING="${LOCALBASE}/include/portaudio2" \ - -DPORTAUDIO_LIBRARY:STRING="${LOCALBASE}/lib/portaudio2/libportaudio.so" +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio +PORTAUDIO_CMAKE_ON= -DUSE_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DUSE_PORTAUDIO:BOOL=OFF PULSEAUDIO_DESC= Build PulseAudio I/O module PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio @@ -120,9 +119,6 @@ post-patch: 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/InOut/CMakeLists.txt @${REINPLACE_CMD} -e \ - 's|<portaudio.h>|<portaudio2/portaudio.h>|' \ - ${WRKSRC}/InOut/rtpa.c - @${REINPLACE_CMD} -e \ 's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \ s|/usr/local|${LOCALBASE}| ; \ /linuxjoystick/s|^|#| ; \ Modified: head/audio/denemo/Makefile ============================================================================== --- head/audio/denemo/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/denemo/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,6 +3,7 @@ PORTNAME= denemo PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GNU @@ -16,7 +17,7 @@ LIB_DEPENDS= libaubio.so:${PORTSDIR}/aud libjack.so:${PORTSDIR}/audio/jack \ libsmf.so:${PORTSDIR}/audio/libsmf \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ - libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ + libportaudio.so:${PORTSDIR}/audio/portaudio \ librubberband.so:${PORTSDIR}/audio/rubberband \ libguile-2.0.so:${PORTSDIR}/lang/guile2 \ libfftw3.so:${PORTSDIR}/math/fftw3 @@ -32,10 +33,8 @@ CONFIGURE_ARGS= --enable-jack \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf -CPPFLAGS+= -I${LOCALBASE}/include/portaudio2 \ - -I${LOCALBASE}/include -LDFLAGS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so \ - -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= * PORTEXAMPLES= * Modified: head/audio/espeak/Makefile ============================================================================== --- head/audio/espeak/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/espeak/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= espeak PORTVERSION= 1.48.04 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -19,7 +19,7 @@ OPTIONS_RADIO= AUDIO_SYSTEM OPTIONS_RADIO_AUDIO_SYSTEM= PORTAUDIO PULSEAUDIO RUNTIME RUNTIME_DESC= Sound interface selected at runtime -PORTAUDIOLIB= libportaudio.so.0:${PORTSDIR}/audio/portaudio +PORTAUDIOLIB= libportaudio.so:${PORTSDIR}/audio/portaudio PULSEAUDIOLIB= libpulse.so:${PORTSDIR}/audio/pulseaudio PORTAUDIO_LIB_DEPENDS= ${PORTAUDIOLIB} @@ -49,8 +49,13 @@ REINPLACE_ARGS= -i.bak -e "s|%%DATADIR%% BROKEN_sparc64= Does not compile on sparc64 +.include <bsd.port.options.mk> + post-patch: cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES} +.if ${PORT_OPTIONS:MPORTAUDIO} + ${MV} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h +.endif post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/audio/fluidsynth/Makefile ============================================================================== --- head/audio/fluidsynth/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/fluidsynth/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= fluidsynth PORTVERSION= 1.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -22,9 +22,6 @@ CMAKE_ARGS= -Denable-ladcca:BOOL=FALSE \ -Denable-midishare:BOOL=FALSE USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib - JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CMAKE_OFF= -Denable-jack:BOOL=FALSE @@ -41,8 +38,7 @@ LADSPA_CMAKE_ON= -Denable-ladspa:BOOL=TR LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash LASH_CMAKE_OFF= -Denable-lash:BOOL=FALSE -PORTAUDIO_BUILD_DEPENDS= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 -PORTAUDIO_RUN_DEPENDS= ${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PORTAUDIO_CMAKE_ON= -Denable-portaudio:BOOL=TRUE PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio Modified: head/audio/fmit/Makefile ============================================================================== --- head/audio/fmit/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/fmit/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= fmit PORTVERSION= 0.99.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://download.gna.org/fmit/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source @@ -38,8 +38,7 @@ JACK_LIB_DEPENDS= libjack.so:${PORTSDIR} JACK_CMAKE_ON= -DSOUNDSYSTEM_USE_JACK:BOOL=true JACK_CMAKE_OFF= -DSOUNDSYSTEM_USE_JACK:BOOL=false -PORTAUDIO_BUILD_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 -PORTAUDIO_RUN_DEPENDS= portaudio2>=0:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PORTAUDIO_CMAKE_ON= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true PORTAUDIO_CMAKE_OFF= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false Modified: head/audio/gnaural/Makefile ============================================================================== --- head/audio/gnaural/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/gnaural/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= gnaural PORTVERSION= 1.0.20110606 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/Gnaural/ @@ -13,7 +13,7 @@ COMMENT= Binaural beat generator LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ +LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \ libsndfile.so:${PORTSDIR}/audio/libsndfile GNU_CONFIGURE= yes Modified: head/audio/hydrogen-devel/Makefile ============================================================================== --- head/audio/hydrogen-devel/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/hydrogen-devel/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= hydrogen PORTVERSION= 0.9.6r2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio PKGNAMESUFFIX= -devel @@ -64,11 +64,9 @@ LIBARCHIVE_LIB_DEPENDS= libarchive.so:${ OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF -PORTAUDIO_CMAKE_ON= -DWANT_PORTAUDIO:BOOL=ON \ - -DPORTAUDIO_INCLUDE_DIR:STRING=${LOCALBASE}/include/portaudio2 \ - -DPORTAUDIO_LIBRARIES:STRING=${LOCALBASE}/lib/portaudio2/libportaudio.so +PORTAUDIO_CMAKE_ON= -DWANT_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DWANT_PORTAUDIO:BOOL=OFF -PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio RDF_DESC= RDF File support RDF_CMAKE_ON= -DWANT_LRDF:BOOL=ON Modified: head/audio/listener/Makefile ============================================================================== --- head/audio/listener/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/listener/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,6 +3,7 @@ PORTNAME= listener PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= audio security MASTER_SITES= PACKETSTORM/linux/security \ http://www.vanheusden.com/listener/ @@ -12,13 +13,13 @@ COMMENT= Program to listen for and recor LICENSE= GPLv2 -LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ +LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \ libsndfile.so:${PORTSDIR}/audio/libsndfile USES= ncurses tar:tgz -CPPFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS Modified: head/audio/lmms/Makefile ============================================================================== --- head/audio/lmms/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/lmms/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= lmms PORTVERSION= 0.4.15 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= audio MASTER_SITES= SF Modified: head/audio/lmms/files/patch-CMakeLists.txt ============================================================================== --- head/audio/lmms/files/patch-CMakeLists.txt Sat May 30 20:18:19 2015 (r387981) +++ head/audio/lmms/files/patch-CMakeLists.txt Sat May 30 20:39:12 2015 (r387982) @@ -9,15 +9,6 @@ #SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}") #SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}") -@@ -424,7 +424,7 @@ - ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) - - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) --LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) -+LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib/portaudio2 ${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) - LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES}) - - ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz") @@ -462,7 +462,7 @@ ENDIF(NOT LMMS_BUILD_APPLE) Modified: head/audio/mhwaveedit/Makefile ============================================================================== --- head/audio/mhwaveedit/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/mhwaveedit/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= mhwaveedit PORTVERSION= 1.4.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://download.gna.org/mhwaveedit/ @@ -50,7 +50,7 @@ LADSPA_BUILD_DEPENDS= ladspa>0:${PORTSDI LADSPA_RUN_DEPENDS= ladspa>0:${PORTSDIR}/audio/ladspa LADSPA_CONFIGURE_ENV_OFF= ac_cv_header_ladspa_h=no OSS_CONFIGURE_WITH= oss -PORTAUDIO_LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PORTAUDIO_CONFIGURE_WITH= portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulse Modified: head/audio/mixxx/Makefile ============================================================================== --- head/audio/mixxx/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/mixxx/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -4,7 +4,7 @@ PORTNAME= mixxx PORTVERSION= 1.11.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= audio MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/ @@ -16,7 +16,7 @@ LICENSE= GPLv2 # (or later) LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \ libid3tag.so:${PORTSDIR}/audio/libid3tag \ libmad.so:${PORTSDIR}/audio/libmad \ - libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ + libportaudio.so:${PORTSDIR}/audio/portaudio \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ libtag.so:${PORTSDIR}/audio/taglib \ Modified: head/audio/mixxx/files/patch-build__depends.py ============================================================================== --- head/audio/mixxx/files/patch-build__depends.py Sat May 30 20:18:19 2015 (r387981) +++ head/audio/mixxx/files/patch-build__depends.py Sat May 30 20:39:12 2015 (r387982) @@ -67,7 +67,7 @@ elif build.toolchain_is_msvs: # Validate the specified winlib directory exists mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release') -@@ -851,16 +847,20 @@ +@@ -851,16 +847,19 @@ elif build.platform_is_bsd: build.env.Append(CPPDEFINES='__BSD__') @@ -84,8 +84,7 @@ + build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2', + '%%LOCALBASE%%/lib/qt4', + '%%LOCALBASE%%/lib']) -+ build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/portaudio2/libportaudio.so', -+ '-Wl,-rpath,%%LOCALBASE%%/lib/portaudio2', ++ build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/libportaudio.so', + '-Wl,-rpath,%%LOCALBASE%%/lib/qt4', + '-Wl,-rpath,%%LOCALBASE%%/lib']) # why do we need to do this on OpenBSD and not on Linux? if we Modified: head/audio/musescore/Makefile ============================================================================== --- head/audio/musescore/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/musescore/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= musescore PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF/mscore/mscore/MuseScore-${PORTVERSION}/ DISTNAME= mscore-${PORTVERSION} @@ -38,7 +38,7 @@ JACK_LIB_DEPENDS= libjack.so:${PORTSDIR} JACK_CMAKE_ON= -DBUILD_JACK:BOOL=ON JACK_CMAKE_OFF= -DBUILD_JACK:BOOL=OFF -PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PORTAUDIO_CMAKE_ON= -DBUILD_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DBUILD_PORTAUDIO:BOOL=OFF Modified: head/audio/openal-soft/Makefile ============================================================================== --- head/audio/openal-soft/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/openal-soft/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -2,7 +2,7 @@ PORTNAME= openal-soft PORTVERSION= 1.16.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/openal-releases/ @@ -38,11 +38,9 @@ CONFIG_USE= QT4=gui FLUIDSYNTH_CMAKE_ON= -DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON FLUIDSYNTH_CMAKE_OFF= -DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth -PORTAUDIO_CMAKE_ON= -DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON \ - -DPORTAUDIO_LIBRARY=${LOCALBASE}/lib/portaudio2/libportaudio.so -PORTAUDIO_LDFLAGS= -L${LOCALBASE}/lib/portaudio2 +PORTAUDIO_CMAKE_ON= -DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF -PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PULSEAUDIO_CMAKE_ON= -DALSOFT_REQUIRE_PULSEAUDIO:BOOL=ON PULSEAUDIO_CMAKE_OFF= -DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio @@ -53,7 +51,5 @@ post-patch: ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} 's|share/openal|${ETCDIR}|' \ ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} 's|portaudio.h|portaudio2/portaudio.h|' \ - ${WRKSRC}/Alc/backends/portaudio.c .include <bsd.port.mk> Modified: head/audio/portaudio/Makefile ============================================================================== --- head/audio/portaudio/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/portaudio/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= portaudio -PORTVERSION= 18.1 -PORTREVISION= 4 +DISTVERSION= 19_20140130 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.portaudio.com/archives/ -DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/} +DISTNAME= pa_stable_v${DISTVERSION} MAINTAINER= koalative@gmail.com COMMENT= Portable cross-platform Audio API @@ -14,46 +14,81 @@ COMMENT= Portable cross-platform Audio A LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= gmake dos2unix zip +USES= dos2unix gmake libtool pathfix pkgconfig tar:tgz GNU_CONFIGURE= yes -MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} +CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig \ + --without-alsa USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} -SHLIB_VERSION= 0 +WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * +PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS PATEST -OPTIONS_DEFAULT= PATEST +DOCSRCDIR1= ${WRKSRC} +DOC_FILES1= README.txt index.html + +OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES JACK PATEST +OPTIONS_DEFAULT=PATEST PATEST_DESC= PortAudio Test Programs +DOXYGEN_DESC= Install API documentation (requires DOCS) OPTIONS_SUB= yes +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CONFIGURE_ON= --with-jack +JACK_CONFIGURE_OFF= --without-jack + +EXAMPLES_BIN= pa_d* pa_f* paex_* +PATEST_BIN= pa_m* paqa_* patest* + .include <bsd.port.options.mk> -post-patch: - @${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' \ - ${WRKSRC}/pa_unix_oss/pa_unix.h - @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \ - ${WRKSRC}/pa_unix_oss/pa_unix_oss.c +.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen +.endif -pre-configure: - @${CHMOD} +x ${WRKSRC}/configure +post-patch: + @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \ + ${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript + @${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure + +.if ! ${PORT_OPTIONS:MEXAMPLES} + @${REINPLACE_CMD} -i '' '/EXAMPLES =/,/bin\/paex_write_sine_nonint/s/^/#/' \ + ${WRKSRC}/Makefile.in +.endif post-install: - @${LN} -sf libportaudio.so \ - ${STAGEDIR}${PREFIX}/lib/libportaudio.so.${SHLIB_VERSION} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libportaudio.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libportaudio.so.2 + +.if ${PORT_OPTIONS:MEXAMPLES} +.for f in ${EXAMPLES_BIN} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/ +.endfor +.endif + .if ${PORT_OPTIONS:MPATEST} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin/ +.for f in ${PATEST_BIN} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/ +.endfor .endif + +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} "README.txt index.html \ - docs/*.html docs/*.txt docs/*.pdf" ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} +.endif + +.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS} + @cd ${WRKSRC} && doxygen + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) +.endif + +.if ${PORT_OPTIONS:MEXAMPLES} + @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) +.endif .include <bsd.port.mk> Modified: head/audio/portaudio/distinfo ============================================================================== --- head/audio/portaudio/distinfo Sat May 30 20:18:19 2015 (r387981) +++ head/audio/portaudio/distinfo Sat May 30 20:39:12 2015 (r387982) @@ -1,2 +1,2 @@ -SHA256 (portaudio_v18_1.zip) = 9da7f1ba0b8029f934d5a8300199e29095127e6abfa03dbb3c1ce40e10751f0a -SIZE (portaudio_v18_1.zip) = 550130 +SHA256 (pa_stable_v19_20140130.tgz) = 8fe024a5f0681e112c6979808f684c3516061cc51d3acc0b726af98fc96c8d57 +SIZE (pa_stable_v19_20140130.tgz) = 1504620 Modified: head/audio/portaudio/pkg-plist ============================================================================== --- head/audio/portaudio/pkg-plist Sat May 30 20:18:19 2015 (r387981) +++ head/audio/portaudio/pkg-plist Sat May 30 20:39:12 2015 (r387982) @@ -1,28 +1,49 @@ +%%PORTEXAMPLES%%bin/pa_devs +%%PORTEXAMPLES%%bin/pa_fuzz +%%PATEST%%bin/pa_minlat +%%PORTEXAMPLES%%bin/paex_pink +%%PORTEXAMPLES%%bin/paex_read_write_wire +%%PORTEXAMPLES%%bin/paex_record +%%PORTEXAMPLES%%bin/paex_saw +%%PORTEXAMPLES%%bin/paex_sine +%%PORTEXAMPLES%%bin/paex_write_sine +%%PORTEXAMPLES%%bin/paex_write_sine_nonint +%%PATEST%%bin/paqa_devs +%%PATEST%%bin/paqa_errs +%%PATEST%%bin/paqa_latency +%%PATEST%%bin/patest1 %%PATEST%%bin/patest_buffer +%%PATEST%%bin/patest_callbackstop %%PATEST%%bin/patest_clip %%PATEST%%bin/patest_dither %%PATEST%%bin/patest_hang +%%PATEST%%bin/patest_in_overflow %%PATEST%%bin/patest_latency %%PATEST%%bin/patest_leftright %%PATEST%%bin/patest_longsine %%PATEST%%bin/patest_many %%PATEST%%bin/patest_maxsines +%%PATEST%%bin/patest_mono %%PATEST%%bin/patest_multi_sine -%%PATEST%%bin/patest_pink -%%PATEST%%bin/patest_record +%%PATEST%%bin/patest_out_underflow +%%PATEST%%bin/patest_prime %%PATEST%%bin/patest_ringmix -%%PATEST%%bin/patest_saw -%%PATEST%%bin/patest_sine %%PATEST%%bin/patest_sine8 +%%PATEST%%bin/patest_sine_channelmaps %%PATEST%%bin/patest_sine_formats +%%PATEST%%bin/patest_sine_srate %%PATEST%%bin/patest_sine_time +%%PATEST%%bin/patest_start_stop %%PATEST%%bin/patest_stop -%%PATEST%%bin/patest_sync +%%PATEST%%bin/patest_stop_playout %%PATEST%%bin/patest_toomanysines +%%PATEST%%bin/patest_two_rates %%PATEST%%bin/patest_underflow %%PATEST%%bin/patest_wire +%%JACK%%include/pa_jack.h include/portaudio.h lib/libportaudio.a lib/libportaudio.so -lib/libportaudio.so.0.0.18 -lib/libportaudio.so.%%SHLIB_VERSION%% +lib/libportaudio.so.2 +lib/libportaudio.so.2.0.0 +libdata/pkgconfig/portaudio-2.0.pc Modified: head/audio/pure-audio/Makefile ============================================================================== --- head/audio/pure-audio/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/pure-audio/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= pure-audio PORTVERSION= 0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= https://cdn.bitbucket.org/purelang/pure-lang/downloads/ DIST_SUBDIR= pure @@ -14,19 +14,13 @@ COMMENT= Digital audio interface for the LICENSE= BSD3CLAUSE BROKEN= Unfetchable -LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \ +LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ libfftw3.so:${PORTSDIR}/math/fftw3 USES= pure -post-patch: - @${REINPLACE_CMD} \ - -e "s|-lportaudio|-I${LOCALBASE}/include/portaudio2 -L${LOCALBASE}/lib/portaudio2 -lportaudio|" \ - -e "s|portaudio.h|portaudio2/portaudio.h|g" \ - ${WRKSRC}/Makefile - PORTDOCS= README PORTEXAMPLES= * Modified: head/audio/py-fastaudio/Makefile ============================================================================== --- head/audio/py-fastaudio/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/py-fastaudio/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= fastaudio PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio python MASTER_SITES= http://freenet.mcnabhosting.com/python/pyPortAudio/:site1 \ http://www.portaudio.com/archives/:site2 @@ -15,8 +15,10 @@ DIST_SUBDIR= python MAINTAINER= ninjin@kth.se COMMENT= Python bindings for the PortAudio multi-platform audio library +BROKEN= Does not work with portaudio v19 + BUILD_DEPENDS= pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex -LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio \ +LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \ libsndfile.so:${PORTSDIR}/audio/libsndfile PLIST_FILES= %%PYTHON_SITELIBDIR%%/fastaudio.so Modified: head/audio/py-pyaudio/Makefile ============================================================================== --- head/audio/py-pyaudio/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/py-pyaudio/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,6 +3,7 @@ PORTNAME= pyaudio PORTVERSION= 0.2.8 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= http://people.csail.mit.edu/hubert/pyaudio/packages/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +13,7 @@ COMMENT= Portaudio toolkit bindings for LICENSE= MIT -LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio USES= python USE_PYTHON= distutils autoplist Modified: head/audio/py-pyaudio/files/patch-setup.py ============================================================================== --- head/audio/py-pyaudio/files/patch-setup.py Sat May 30 20:18:19 2015 (r387981) +++ head/audio/py-pyaudio/files/patch-setup.py Sat May 30 20:39:12 2015 (r387982) @@ -6,9 +6,9 @@ +if sys.platform.startswith('dragonfly') or \ + sys.platform.startswith('freebsd'): -+ include_dirs = ['%%LOCALBASE%%/include/portaudio2'] ++ include_dirs = ['%%LOCALBASE%%/include/'] + external_libraries = [] -+ extra_link_args = ['%%LOCALBASE%%/lib/portaudio2/libportaudio.so'] ++ extra_link_args = ['%%LOCALBASE%%/lib/libportaudio.so'] + if sys.platform == 'darwin': defines += [('MACOSX', '1')] Modified: head/audio/rezound/Makefile ============================================================================== --- head/audio/rezound/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/rezound/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= rezound DISTVERSION= 0.12.3beta -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/ReZound/${DISTVERSION} @@ -36,7 +36,7 @@ BROKEN_NLS_DESC= ${NLS_DESC} (broken!) LARGEFILE_CONFIGURE_ON= --enable-largefile JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack AUDIOFILE_LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile -PORTAUDIO_LIB_DEPENDS= libportaudio.so.0:${PORTSDIR}/audio/portaudio +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac @@ -47,6 +47,8 @@ LADSPA_CONFIGURE_OFF= --disable-ladspa LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame CDRDAO_RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao +EXTRA_PATCHES= ${FILESDIR}/050_all_portaudio19.patch:-p1 + .include <bsd.port.options.mk> # NLS support is broken as of recent versions of libstdc++; rezound dies at @@ -59,6 +61,10 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif +.if ${PORT_OPTIONS:MPORTAUDIO} +LIBS+= -lportaudio +.endif + post-patch: .SILENT ${REINPLACE_CMD} -E '/atoll|round|nearbyint/d' \ ${WRKSRC}/config/platform/bsd.h @@ -99,4 +105,9 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's/ install-pkgdocDATA$$//' ${WRKSRC}/Makefile.in .endif +.if ${PORT_OPTIONS:MPORTAUDIO} +post-configure: + ${ECHO_CMD} "#define ENABLE_PORTAUDIO_V19 1" >> ${WRKSRC}/config/config.h +.endif + .include <bsd.port.mk> Added: head/audio/rezound/files/050_all_portaudio19.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/rezound/files/050_all_portaudio19.patch Sat May 30 20:39:12 2015 (r387982) @@ -0,0 +1,196 @@ +Index: rezound-0.12.3beta/configure.ac +=================================================================== +--- rezound-0.12.3beta.orig/configure.ac ++++ rezound-0.12.3beta/configure.ac +@@ -372,13 +372,22 @@ AC_ARG_ENABLE( + + # handle the --enable-portaudio flag + AH_TEMPLATE(ENABLE_PORTAUDIO) ++AH_TEMPLATE(ENABLE_PORTAUDIO_V19) + if test -z "$enable_standalone"; then + AC_ARG_ENABLE( + portaudio, + AC_HELP_STRING([--enable/disable-portaudio],[enable/disable ReZound to use PortAudio for audio I/O]), + [ + if [[ "$enableval" = "yes" ]] +- then ++ then ++ PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:) ++ if test "x$portaudio_v19" = "xyes"; then ++ AC_DEFINE(ENABLE_PORTAUDIO) ++ AC_DEFINE(ENABLE_PORTAUDIO_V19) ++ LIBS="$LIBS $PORTAUDIO_19_LIBS" ++ AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O]) ++ using_portaudio=1 ++ else + # --enable-portaudio was given + # Require that the portaudio library can be found + AC_CHECK_LIB( +@@ -404,12 +413,21 @@ if test -z "$enable_standalone"; then + + AC_MSG_ERROR([***** libportaudio.a not found (http://www.portaudio.com) *****]) + ) ++ fi + else + AC_MSG_RESULT([*** disabling libportaudio for audio I/O]) + fi + ], + [ # action if neither enable or disable flag was given + # if libportaudio and portaudio.h are found, then enable it ++ PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:) ++ if test "x$portaudio_v19" = "xyes"; then ++ AC_DEFINE(ENABLE_PORTAUDIO) ++ AC_DEFINE(ENABLE_PORTAUDIO_V19) ++ LIBS="$LIBS $PORTAUDIO_19_LIBS" ++ AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O]) ++ using_portaudio=1 ++ else + AC_CHECK_LIB( + portaudio, + Pa_Initialize, +@@ -430,6 +448,7 @@ if test -z "$enable_standalone"; then + ] + )] + ) ++ fi + ] + ) + else +Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp +=================================================================== +--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.cpp ++++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp +@@ -70,6 +70,24 @@ void CPortAudioSoundPlayer::initialize() + + + // open a PortAudio stream ++#ifdef ENABLE_PORTAUDIO_V19 ++ PaStreamParameters output = { gPortAudioOutputDevice, ++ gDesiredOutputChannelCount, ++ sampleFormat, ++ Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowOutputLatency , ++ NULL}; ++ ++ err = Pa_OpenStream( ++ &stream, ++ NULL, ++ &output, ++ gDesiredOutputSampleRate, ++ gDesiredOutputBufferSize * gDesiredOutputBufferCount, ++ paClipOff|paDitherOff, ++ CPortAudioSoundPlayer::PortAudioCallback, ++ this); ++ ++#else + err = Pa_OpenStream( + &stream, + paNoDevice, /* recording parameter, we're not recording */ +@@ -86,6 +104,7 @@ void CPortAudioSoundPlayer::initialize() + paClipOff|paDitherOff, + CPortAudioSoundPlayer::PortAudioCallback, + this); ++#endif + + if(err!=paNoError) + throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err)); +@@ -156,7 +175,11 @@ void CPortAudioSoundPlayer::doneRecordin + } + + ++#ifdef ENABLE_PORTAUDIO_V19 ++int CPortAudioSoundPlayer::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData) ++#else + int CPortAudioSoundPlayer::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData) ++#endif + { + try + { +Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h +=================================================================== +--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.h ++++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h +@@ -45,10 +45,14 @@ public: + + private: + bool initialized; +- PortAudioStream *stream; ++ PaStream *stream; + bool supportsFullDuplex; + ++#ifdef ENABLE_PORTAUDIO_V19 ++ static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData); ++#else + static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData); ++#endif + + }; + +Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp +=================================================================== +--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.cpp ++++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp +@@ -65,6 +65,24 @@ void CPortAudioSoundRecorder::initialize + ASoundRecorder::initialize(sound); + + // open a PortAudio stream ++#ifdef ENABLE_PORTAUDIO_V19 ++ PaStreamParameters input = { ++ gPortAudioOutputDevice, ++ sound->getChannelCount(), ++ sampleFormat, ++ Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowInputLatency , ++ NULL}; ++ err = Pa_OpenStream( ++ &stream, ++ &input, ++ NULL, ++ sound->getSampleRate(), ++ BUFFER_SIZE_FRAMES*12, ++ paClipOff|paDitherOff, ++ CPortAudioSoundRecorder::PortAudioCallback, ++ this); ++ ++#else + err = Pa_OpenStream( + &stream, + gPortAudioOutputDevice, +@@ -81,6 +99,7 @@ void CPortAudioSoundRecorder::initialize + paClipOff|paDitherOff, + CPortAudioSoundRecorder::PortAudioCallback, + this); ++#endif + + if(err!=paNoError) + throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err)); +@@ -131,7 +150,11 @@ void CPortAudioSoundRecorder::redo() + Pa_StartStream(stream); + } + ++#ifdef ENABLE_PORTAUDIO_V19 ++int CPortAudioSoundRecorder::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData) ++#else + int CPortAudioSoundRecorder::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData) ++#endif + { + try + { +Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h +=================================================================== +--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.h ++++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h +@@ -42,10 +42,14 @@ public: + void redo(); + + private: +- PortAudioStream *stream; ++ PaStream *stream; + bool initialized; + ++#ifdef ENABLE_PORTAUDIO_V19 ++ static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData); ++#else + static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData); ++#endif + }; + + #endif // ENABLE_PORTAUDIO Modified: head/audio/zynaddsubfx/Makefile ============================================================================== --- head/audio/zynaddsubfx/Makefile Sat May 30 20:18:19 2015 (r387981) +++ head/audio/zynaddsubfx/Makefile Sat May 30 20:39:12 2015 (r387982) @@ -3,7 +3,7 @@ PORTNAME= zynaddsubfx PORTVERSION= 2.4.3 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505302039.t4UKdDuL011091>