Index: head/audio/aubio/Makefile =================================================================== --- head/audio/aubio/Makefile (revision 561961) +++ head/audio/aubio/Makefile (revision 561962) @@ -1,76 +1,78 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= aubio -PORTVERSION= 0.4.7 -PORTREVISION?= 5 +PORTVERSION= 0.4.9 +PORTREVISION?= 0 CATEGORIES?= audio -MASTER_SITES= http://aubio.org/pub/ +MASTER_SITES= https://aubio.org/pub/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Library for audio labelling LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING USES+= pkgconfig tar:bzip2 +BINARY_ALIAS= python=${PYTHON_CMD} + .if !defined(SLAVEPORT) USES+= python:build,3.6+ waf USE_LDCONFIG= yes OPTIONS_GROUP= DOCS OPTIONS_GROUP_DOCS= DOCS DOXYGEN MANPAGES OPTIONS_DEFINE= COMPLEX FFMPEG FFTW JACK SAMPLERATE SNDFILE TEST -OPTIONS_DEFAULT= FFTW JACK MANPAGES SAMPLERATE SNDFILE +OPTIONS_DEFAULT= FFMPEG FFTW JACK MANPAGES SAMPLERATE SNDFILE OPTIONS_SUB= yes COMPLEX_DESC= Compile with C99 complex.h COMPLEX_CONFIGURE_ENABLE= complex DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_CONFIGURE_ENABLE= sphinx DOCS_BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_ENABLE= doxygen FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= avcodec JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate FFTW_DESC= Use single precision FFTW3 instead of built-in OOURA FFTW_CONFIGURE_ENABLE= fftw3f FFTW_BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 FFTW_LIB_DEPENDS= libfftw3f.so:math/fftw3-float MANPAGES_BUILD_DEPENDS= txt2man:textproc/txt2man MANPAGES_CONFIGURE_ENABLE= manpages MANPAGES_CONFIGURE_ON= --mandir=${MANPREFIX}/man SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile SNDFILE_CONFIGURE_ENABLE= sndfile TEST_MAKE_ARGS= --enable-tests TEST_MAKE_ARGS_OFF= --disable-tests PORTDOCS= * post-patch: @${REINPLACE_CMD} -e \ '/pkgconfig/s|$${LIBDIR}|&data|' ${WRKSRC}/waflib/TaskGen.py post-install: .for b in mfcc notes onset pitch quiet track @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aubio${b} .endfor @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaubio.so .endif # !defined(SLAVEPORT) .include Index: head/audio/aubio/distinfo =================================================================== --- head/audio/aubio/distinfo (revision 561961) +++ head/audio/aubio/distinfo (revision 561962) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537919656 -SHA256 (aubio-0.4.7.tar.bz2) = cbed4afec5ab3a1a6300c7e3af0a1369379aa94259f5e701a8ca905cdd9fa041 -SIZE (aubio-0.4.7.tar.bz2) = 372173 +TIMESTAMP = 1610896430 +SHA256 (aubio-0.4.9.tar.bz2) = d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da +SIZE (aubio-0.4.9.tar.bz2) = 397604 Index: head/audio/aubio/files/patch-wscript =================================================================== --- head/audio/aubio/files/patch-wscript (revision 561961) +++ head/audio/aubio/files/patch-wscript (revision 561962) @@ -1,65 +1,84 @@ Hunks 1 & 2: Enable manpages, doxygen, and sphinx documentation separately Hunks 3 & 4: Install docs in more standard locations ---- wscript.orig 2018-09-23 08:16:59 UTC +--- wscript.orig 2019-01-09 22:40:04 UTC +++ wscript -@@ -96,9 +96,15 @@ def options(ctx): +@@ -97,9 +97,15 @@ def options(ctx): help_str = 'compile with source_wavwrite (default)', help_disable_str = 'do not compile source_wavwrite') - add_option_enable_disable(ctx, 'docs', default = None, - help_str = 'build documentation (auto)', - help_disable_str = 'do not build documentation') + add_option_enable_disable(ctx, 'manpages', default = None, + help_str = 'build manpages (auto)', + help_disable_str = 'do not build manpages') + add_option_enable_disable(ctx, 'doxygen', default = None, + help_str = 'build API documentation (auto)', + help_disable_str = 'do not build API documentation') + add_option_enable_disable(ctx, 'sphinx', default = None, + help_str = 'build general documentation (auto)', + help_disable_str = 'do not build general documentation') add_option_enable_disable(ctx, 'tests', default = True, help_str = 'build tests (true)', -@@ -462,19 +468,21 @@ def configure(ctx): +@@ -475,19 +481,21 @@ def configure(ctx): if (ctx.options.enable_double == True): ctx.define('HAVE_AUBIO_DOUBLE', 1) - if (ctx.options.enable_docs != False): + if (ctx.options.enable_manpages != False): # check if txt2man is installed, optional try: ctx.find_program('txt2man', var='TXT2MAN') except ctx.errors.ConfigurationError: ctx.to_log('txt2man was not found (ignoring)') + if (ctx.options.enable_doxygen != False): # check if doxygen is installed, optional try: ctx.find_program('doxygen', var='DOXYGEN') except ctx.errors.ConfigurationError: ctx.to_log('doxygen was not found (ignoring)') + if (ctx.options.enable_sphinx != False): # check if sphinx-build is installed, optional try: ctx.find_program('sphinx-build', var='SPHINX') -@@ -536,7 +544,7 @@ def doxygen(bld): - source = 'doc/web.cfg', - target = '../doc/web/html/index.html', - cwd = 'doc') -- bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc', -+ bld.install_files( '${DATAROOTDIR}' + '/doc/aubio', - bld.path.ant_glob('doc/web/html/**'), - cwd = bld.path.find_dir ('doc/web'), - relative_trick = True) -@@ -550,7 +558,7 @@ def sphinx(bld): - rule = '${SPHINX} -b html -D release=${VERSION} -D version=${VERSION} -a -q `dirname ${SRC}` `dirname ${TGT}`', - source = 'doc/conf.py', - target = '../doc/_build/html/index.html') -- bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc/sphinx', -+ bld.install_files( '${DATAROOTDIR}' + '/doc/aubio/sphinx', - bld.path.ant_glob('doc/_build/html/**'), - cwd = bld.path.find_dir('doc/_build/html'), - relative_trick = True) +@@ -557,24 +565,17 @@ def doxygen(bld): + target = bld.path.find_or_declare('api/index.html'), + cwd = bld.path.find_dir('doc')) + # evaluate nodes lazily to prevent build directory traversal warnings +- bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/api', ++ bld.install_files('${DATAROOTDIR}/doc/aubio/api', + bld.path.find_or_declare('api').ant_glob('**/*', + generator=True), cwd=bld.path.find_or_declare('api'), + relative_trick=True) + + def sphinx(bld): + # build documentation from source files using sphinx-build +- try: +- import aubio +- has_aubio = True +- except ImportError: +- from waflib import Logs +- Logs.pprint('YELLOW', "Sphinx manual: install aubio first") +- has_aubio = False +- if bld.env['SPHINX'] and has_aubio: ++ if bld.env['SPHINX']: + bld.env.VERSION = VERSION + rule = '${SPHINX} -b html -D release=${VERSION}' \ +- ' -D version=${VERSION} -W -a -q' \ ++ ' -D version=${VERSION} -a -q' \ + ' -d %s ' % os.path.join(os.path.abspath(out), 'doctrees') + rule += ' . %s' % os.path.join(os.path.abspath(out), 'manual') + bld( name = 'sphinx', rule = rule, +@@ -582,7 +583,7 @@ def sphinx(bld): + source = bld.path.find_dir('doc').ant_glob('*.rst'), + target = bld.path.find_or_declare('manual/index.html')) + # evaluate nodes lazily to prevent build directory traversal warnings +- bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/manual', ++ bld.install_files('${DATAROOTDIR}/doc/aubio/manual', + bld.path.find_or_declare('manual').ant_glob('**/*', + generator=True), cwd=bld.path.find_or_declare('manual'), + relative_trick=True) Index: head/audio/aubio/pkg-plist =================================================================== --- head/audio/aubio/pkg-plist (revision 561961) +++ head/audio/aubio/pkg-plist (revision 561962) @@ -1,72 +1,72 @@ bin/aubiomfcc bin/aubionotes bin/aubioonset bin/aubiopitch bin/aubioquiet bin/aubiotrack include/aubio/aubio.h include/aubio/cvec.h include/aubio/fmat.h include/aubio/fvec.h include/aubio/io/audio_unit.h include/aubio/io/ioutils.h include/aubio/io/sink.h include/aubio/io/sink_apple_audio.h include/aubio/io/sink_sndfile.h include/aubio/io/sink_wavwrite.h include/aubio/io/source.h include/aubio/io/source_apple_audio.h include/aubio/io/source_avcodec.h include/aubio/io/source_sndfile.h include/aubio/io/source_wavread.h include/aubio/lvec.h include/aubio/mathutils.h include/aubio/musicutils.h include/aubio/notes/notes.h include/aubio/onset/onset.h include/aubio/onset/peakpicker.h include/aubio/pitch/pitch.h include/aubio/pitch/pitchfcomb.h include/aubio/pitch/pitchmcomb.h include/aubio/pitch/pitchschmitt.h include/aubio/pitch/pitchspecacf.h include/aubio/pitch/pitchyin.h include/aubio/pitch/pitchyinfast.h include/aubio/pitch/pitchyinfft.h include/aubio/spectral/awhitening.h include/aubio/spectral/dct.h include/aubio/spectral/fft.h include/aubio/spectral/filterbank.h include/aubio/spectral/filterbank_mel.h include/aubio/spectral/mfcc.h include/aubio/spectral/phasevoc.h include/aubio/spectral/specdesc.h include/aubio/spectral/tss.h include/aubio/synth/sampler.h include/aubio/synth/wavetable.h include/aubio/tempo/beattracking.h include/aubio/tempo/tempo.h include/aubio/temporal/a_weighting.h include/aubio/temporal/biquad.h include/aubio/temporal/c_weighting.h include/aubio/temporal/filter.h include/aubio/temporal/resampler.h include/aubio/types.h include/aubio/utils/hist.h include/aubio/utils/log.h include/aubio/utils/parameter.h include/aubio/utils/scale.h include/aubio/vecutils.h lib/libaubio.a lib/libaubio.so lib/libaubio.so.5 -lib/libaubio.so.5.3.7 +lib/libaubio.so.5.4.8 libdata/pkgconfig/aubio.pc %%MANPAGES%%man/man1/aubio.1.gz %%MANPAGES%%man/man1/aubiocut.1.gz %%MANPAGES%%man/man1/aubiomfcc.1.gz %%MANPAGES%%man/man1/aubionotes.1.gz %%MANPAGES%%man/man1/aubioonset.1.gz %%MANPAGES%%man/man1/aubiopitch.1.gz %%MANPAGES%%man/man1/aubioquiet.1.gz %%MANPAGES%%man/man1/aubiotrack.1.gz Index: head/audio/py-aubio/Makefile =================================================================== --- head/audio/py-aubio/Makefile (revision 561961) +++ head/audio/py-aubio/Makefile (revision 561962) @@ -1,33 +1,32 @@ # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= audio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhale@FreeBSD.org COMMENT= Python bindings for aubio music analysis LIB_DEPENDS= libaubio.so:audio/aubio BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} TEST_DEPENDS= sox:audio/sox \ - ${PYTHON_PKGNAMEPREFIX}nose2>=0.6.5:devel/py-nose2@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pytest>=2.9:devel/py-pytest@${PY_FLAVOR} USES+= python:3.6+ USE_PYTHON= autoplist concurrent distutils -TEST_ENV= ${MAKE_ENV} PYTHONPATH=${WRKSRC}/`ls -rtd build/lib.* | head -1` -TEST_TARGET= test -DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYSETUP} +TEST_TARGET= ${WRKSRC}/python +DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/pytest-${PYTHON_VER} MASTERDIR= ${.CURDIR}/../../audio/aubio SLAVEPORT= py PLIST= ${.CURDIR}/pkg-plist pre-test: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} create_test_sounds) post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_aubio*.so .include "${MASTERDIR}/Makefile"