svn commit: r561962 - in head/audio: aubio aubio/files py-aubio
Jason E. Hale
jhale at FreeBSD.org
Mon Jan 18 19:40:33 UTC 2021
Author: jhale
Date: Mon Jan 18 19:40:32 2021
New Revision: 561962
URL: https://svnweb.freebsd.org/changeset/ports/561962
Log:
audio/[py-]aubio: Update to 0.4.9
Enable FFMPEG option by default. This considerably expands the file formats
aubio can handle and most users of this probably already have ffmpeg installed.
Modified:
head/audio/aubio/Makefile
head/audio/aubio/distinfo
head/audio/aubio/files/patch-wscript
head/audio/aubio/pkg-plist
head/audio/py-aubio/Makefile
Modified: head/audio/aubio/Makefile
==============================================================================
--- head/audio/aubio/Makefile Mon Jan 18 19:19:52 2021 (r561961)
+++ head/audio/aubio/Makefile Mon Jan 18 19:40:32 2021 (r561962)
@@ -2,10 +2,10 @@
# $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 at FreeBSD.org
COMMENT?= Library for audio labelling
@@ -15,6 +15,8 @@ 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
@@ -22,7 +24,7 @@ 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
Modified: head/audio/aubio/distinfo
==============================================================================
--- head/audio/aubio/distinfo Mon Jan 18 19:19:52 2021 (r561961)
+++ head/audio/aubio/distinfo Mon Jan 18 19:40:32 2021 (r561962)
@@ -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
Modified: head/audio/aubio/files/patch-wscript
==============================================================================
--- head/audio/aubio/files/patch-wscript Mon Jan 18 19:19:52 2021 (r561961)
+++ head/audio/aubio/files/patch-wscript Mon Jan 18 19:40:32 2021 (r561962)
@@ -1,9 +1,9 @@
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')
@@ -22,7 +22,7 @@ Hunks 3 & 4: Install docs in more standard locations
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)
@@ -45,21 +45,40 @@ Hunks 3 & 4: Install docs in more standard locations
# 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)
Modified: head/audio/aubio/pkg-plist
==============================================================================
--- head/audio/aubio/pkg-plist Mon Jan 18 19:19:52 2021 (r561961)
+++ head/audio/aubio/pkg-plist Mon Jan 18 19:40:32 2021 (r561962)
@@ -60,7 +60,7 @@ 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
Modified: head/audio/py-aubio/Makefile
==============================================================================
--- head/audio/py-aubio/Makefile Mon Jan 18 19:19:52 2021 (r561961)
+++ head/audio/py-aubio/Makefile Mon Jan 18 19:40:32 2021 (r561962)
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 0
CATEGORIES= audio python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,14 +11,13 @@ 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
More information about the svn-ports-all
mailing list