<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121872] trunk/dports/audio/aubio</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121872">121872</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-09 16:10:05 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>aubio: update to version 0.4.1 (#42524).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudioaubioPortfile">trunk/dports/audio/aubio/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaudioaubiofilespatchwscriptdiff">trunk/dports/audio/aubio/files/patch-wscript.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaudioaubiofilespatchconfigurediff">trunk/dports/audio/aubio/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsaudioaubiofilespatchpythonaubioMakefileindiff">trunk/dports/audio/aubio/files/patch-python-aubio-Makefile.in.diff</a></li>
<li><a href="#trunkdportsaudioaubiofilespatchpythonaubiopython26diff">trunk/dports/audio/aubio/files/patch-python-aubio-python26.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudioaubioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/aubio/Portfile (121871 => 121872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/aubio/Portfile 2014-07-09 21:42:08 UTC (rev 121871)
+++ trunk/dports/audio/aubio/Portfile 2014-07-09 23:10:05 UTC (rev 121872)
</span><span class="lines">@@ -2,16 +2,14 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup waf 1.0
</ins><span class="cx">
</span><span class="cx"> name aubio
</span><del>-version 0.3.2
-revision 4
</del><ins>+version 0.4.1
</ins><span class="cx"> license GPL-2
</span><span class="cx"> categories audio
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> platforms darwin
</span><del>-use_parallel_build yes
-homepage http://aubio.org/
</del><span class="cx">
</span><span class="cx"> description audio labeling library
</span><span class="cx"> long_description \
</span><span class="lines">@@ -20,44 +18,35 @@
</span><span class="cx"> performing pitch detection, \
</span><span class="cx"> tapping the beat and producing MIDI streams from live audio.
</span><span class="cx">
</span><ins>+homepage http://aubio.org/
</ins><span class="cx"> master_sites ${homepage}pub/
</span><del>-checksums md5 ffc3e5e4880fec67064f043252263a44
-depends_build port:pkgconfig
-depends_lib port:fftw-3 \
</del><ins>+
+use_bzip2 yes
+
+checksums rmd160 830a1ca49964a550f41419538a734c48466da633 \
+ sha256 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695
+
+depends_build port:pkgconfig \
+ port:txt2man
+
+depends_skip_archcheck txt2man
+
+depends_lib port:ffmpeg \
+ port:fftw-3-single \
+ port:libsndfile \
</ins><span class="cx"> port:libsamplerate
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-python-aubio-python26.diff \
- patch-python-aubio-Makefile.in.diff
</del><ins>+patchfiles patch-wscript.diff
</ins><span class="cx">
</span><del>-configure.args --disable-alsa \
</del><ins>+configure.args-append --enable-fftw3f \
</ins><span class="cx"> --disable-jack \
</span><del>- --disable-lash
</del><ins>+ --notests
</ins><span class="cx">
</span><del>-post-build {
- # aubio's includedir is ${prefix}/include/aubio but aubio's file fft.h
- # includes fftw-3's fftw3.h but fftw3.h is in ${prefix}/include.
- reinplace {s%-I${includedir}%-I${includedir} -I${prefix}/include%} ${worksrcpath}/${name}.pc
-}
-
</del><span class="cx"> variant jack description {Enable jack support} {
</span><span class="cx"> configure.args-delete --disable-jack
</span><span class="cx"> depends_lib-append port:jack
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python26 conflicts python25 description {Build bindings for Python 2.6 and Gnuplot} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-numarray \
- port:swig-python
- depends_run-append port:py26-gnuplot
- post-patch {
- reinplace "s| -Wno-long-double||g" ${worksrcpath}/configure
- reinplace "s|__MP_PYTHON_INCLUDE_PREFIX__|${frameworks_dir}/Python.framework/Versions/2.6|" ${worksrcpath}/python/aubio/Makefile.in
- }
-}
-
-default_variants +python26
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span></span></pre></div>
<a id="trunkdportsaudioaubiofilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/aubio/files/patch-configure.diff (121871 => 121872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/aubio/files/patch-configure.diff 2014-07-09 21:42:08 UTC (rev 121871)
+++ trunk/dports/audio/aubio/files/patch-configure.diff 2014-07-09 23:10:05 UTC (rev 121872)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- configure.orig 2006-10-08 16:22:01.000000000 -0700
-+++ configure 2011-10-30 07:21:52.000000000 -0700
-@@ -22328,9 +22328,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
-
-
-
</del></span></pre></div>
<a id="trunkdportsaudioaubiofilespatchpythonaubioMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/aubio/files/patch-python-aubio-Makefile.in.diff (121871 => 121872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/aubio/files/patch-python-aubio-Makefile.in.diff 2014-07-09 21:42:08 UTC (rev 121871)
+++ trunk/dports/audio/aubio/files/patch-python-aubio-Makefile.in.diff 2014-07-09 23:10:05 UTC (rev 121872)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>---- python/aubio/Makefile.in.orig 2006-10-10 07:41:06.000000000 -0700
-+++ python/aubio/Makefile.in 2011-10-31 09:23:53.000000000 -0700
-@@ -263,7 +263,7 @@
-
- nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
- @DARWIN_FALSE@@MINGW_FALSE@SWLDFLAGS = -shared
--@DARWIN_TRUE@@MINGW_FALSE@SWLDFLAGS = -bundle -framework Python
-+@DARWIN_TRUE@@MINGW_FALSE@SWLDFLAGS = -bundle -lpython${PYTHON_VERSION}
- @MINGW_TRUE@SWLDFLAGS = -L${prefix}/bin -lpython${PYTHON_VERSION}
- CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py
- NOWARN_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations \
-@@ -271,9 +271,7 @@
-
- AM_CFLAGS = @AUBIO_CFLAGS@ $(NOWARN_CFLAGS) $(SWCFLAGS) \
- -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/ext \
-- -I/usr/include/python${PYTHON_VERSION} \
-- -I${prefix}/include/python${PYTHON_VERSION} \
-- -I/usr/include \
-+ -I__MP_PYTHON_INCLUDE_PREFIX__/include/python${PYTHON_VERSION} \
- -I${prefix}/include
-
- AUBIO_LDFLAGS = $(SWLDFLAGS) \
</del></span></pre></div>
<a id="trunkdportsaudioaubiofilespatchpythonaubiopython26diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/audio/aubio/files/patch-python-aubio-python26.diff (121871 => 121872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/aubio/files/patch-python-aubio-python26.diff 2014-07-09 21:42:08 UTC (rev 121871)
+++ trunk/dports/audio/aubio/files/patch-python-aubio-python26.diff 2014-07-09 23:10:05 UTC (rev 121872)
</span><span class="lines">@@ -1,185 +0,0 @@
</span><del>-diff -ur python/aubio.orig/bench/onset.py python/aubio/bench/onset.py
---- python/aubio.orig/bench/onset.py 2011-10-31 10:52:53.000000000 -0700
-+++ python/aubio/bench/onset.py 2011-10-31 10:54:20.000000000 -0700
-@@ -111,7 +111,7 @@
- for i in self.vlist:
- gd.append(i['GD'])
- fp.append(i['FP'])
-- d.append(Gnuplot.Data(fp, gd, with='linespoints',
-+ d.append(Gnuplot.Data(fp, gd, _with='linespoints',
- title="%s %s" % (plottitle,i['mode']) ))
-
- def plotplotroc(self,d,outplot=0,extension='ps'):
-@@ -147,7 +147,7 @@
- for i in self.vlist:
- x.append(i['prec'])
- y.append(i['recl'])
-- d.append(Gnuplot.Data(x, y, with='linespoints',
-+ d.append(Gnuplot.Data(x, y, _with='linespoints',
- title="%s %s" % (plottitle,i['mode']) ))
-
- def plotplotpr(self,d,outplot=0,extension='ps'):
-@@ -172,7 +172,7 @@
- for i in self.vlist:
- x.append(i['thres'])
- y.append(i['dist'])
-- d.append(Gnuplot.Data(x, y, with='linespoints',
-+ d.append(Gnuplot.Data(x, y, _with='linespoints',
- title="%s %s" % (plottitle,i['mode']) ))
-
- def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"):
-@@ -205,7 +205,7 @@
- for i in self.vlist:
- x.append(i[var])
- y.append(i['dist'])
-- d.append(Gnuplot.Data(x, y, with='linespoints',
-+ d.append(Gnuplot.Data(x, y, _with='linespoints',
- title="%s %s" % (plottitle,i['mode']) ))
-
- def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"):
-@@ -244,7 +244,7 @@
- total = v['Torig']
- for i in range(len(per)): per[i] /= total/100.
-
-- d.append(Gnuplot.Data(val, per, with='fsteps',
-+ d.append(Gnuplot.Data(val, per, _with='fsteps',
- title="%s %s" % (plottitle,v['mode']) ))
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))
-@@ -275,7 +275,7 @@
- total = v['Torig']
- for i in range(len(per)): per[i] /= total/100.
-
-- d.append(Gnuplot.Data(val, per, with='fsteps',
-+ d.append(Gnuplot.Data(val, per, _with='fsteps',
- title="%s %s" % (plottitle,v['mode']) ))
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
- #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))
-diff -ur python/aubio.orig/gnuplot.py python/aubio/gnuplot.py
---- python/aubio.orig/gnuplot.py 2011-10-31 10:52:53.000000000 -0700
-+++ python/aubio/gnuplot.py 2011-10-31 10:55:35.000000000 -0700
-@@ -155,7 +155,7 @@
- """ create gnuplot plot from an audio file """
- import Gnuplot, Gnuplot.funcutils
- x,y = downsample_audio(time,data,maxpoints=maxpoints)
-- return Gnuplot.Data(x,y,with='lines')
-+ return Gnuplot.Data(x,y,_with='lines')
-
- def make_audio_envelope(time,data,maxpoints=10000):
- """ create gnuplot plot from an audio file """
-@@ -165,7 +165,7 @@
- x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)]
- y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)]
- x,y = downsample_audio(x,y,maxpoints=maxpoints)
-- return Gnuplot.Data(x,y,with='lines')
-+ return Gnuplot.Data(x,y,_with='lines')
-
- def gnuplot_addargs(parser):
- """ add common gnuplot argument to OptParser object """
-diff -ur python/aubio.orig/task/beat.py python/aubio/task/beat.py
---- python/aubio.orig/task/beat.py 2011-10-31 10:52:53.000000000 -0700
-+++ python/aubio/task/beat.py 2011-10-31 10:56:25.000000000 -0700
-@@ -247,7 +247,7 @@
-
- def plot(self,oplots,results):
- import Gnuplot
-- oplots.append(Gnuplot.Data(results,with='linespoints',title="auto"))
-+ oplots.append(Gnuplot.Data(results,_with='linespoints',title="auto"))
-
- def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False):
- import Gnuplot
-@@ -258,5 +258,5 @@
- #f = make_audio_plot(time,data)
-
- g = gnuplot_create(outplot=outplot, extension=extension)
-- oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots
-+ oplots = [Gnuplot.Data(self.gettruth(),_with='linespoints',title="orig")] + oplots
- g.plot(*oplots)
-diff -ur python/aubio.orig/task/notes.py python/aubio/task/notes.py
---- python/aubio.orig/task/notes.py 2011-10-31 10:52:53.000000000 -0700
-+++ python/aubio/task/notes.py 2011-10-31 10:57:15.000000000 -0700
-@@ -95,15 +95,15 @@
- import numarray
- import Gnuplot
-
-- oplots.append(Gnuplot.Data(now,freq,with='lines',
-+ oplots.append(Gnuplot.Data(now,freq,_with='lines',
- title=self.params.pitchmode))
-- oplots.append(Gnuplot.Data(now,ifreq,with='lines',
-+ oplots.append(Gnuplot.Data(now,ifreq,_with='lines',
- title=self.params.pitchmode))
-
- temponsets = []
- for i in onset:
- temponsets.append(i*1000)
-- oplots.append(Gnuplot.Data(now,temponsets,with='impulses',
-+ oplots.append(Gnuplot.Data(now,temponsets,_with='impulses',
- title=self.params.pitchmode))
-
- def plotplot(self,wplot,oplots,outplot=None,multiplot = 0):
-@@ -117,10 +117,10 @@
- # check if ground truth exists
- #timet,pitcht = self.gettruth()
- #if timet and pitcht:
-- # oplots = [Gnuplot.Data(timet,pitcht,with='lines',
-+ # oplots = [Gnuplot.Data(timet,pitcht,_with='lines',
- # title='ground truth')] + oplots
-
-- t = Gnuplot.Data(0,0,with='impulses')
-+ t = Gnuplot.Data(0,0,_with='impulses')
-
- g = gnuplot_init(outplot)
- g('set title \'%s\'' % (re.sub('.*/','',self.input)))
-diff -ur python/aubio.orig/task/onset.py python/aubio/task/onset.py
---- python/aubio.orig/task/onset.py 2011-10-31 10:52:53.000000000 -0700
-+++ python/aubio/task/onset.py 2011-10-31 10:57:49.000000000 -0700
-@@ -103,7 +103,7 @@
- self.maxofunc = max(ofunc)
- # onset detection function
- downtime = numarray.arange(len(ofunc))*self.params.step
-- oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode))
-+ oplot.append(Gnuplot.Data(downtime,ofunc,_with='lines',title=self.params.onsetmode))
-
- # detected onsets
- if not nplot:
-@@ -114,8 +114,8 @@
- #x1 = numarray.array(onsets)*self.params.step
- #y1 = self.maxofunc*numarray.ones(len(onsets))
- if x1:
-- oplot.append(Gnuplot.Data(x1,y1,with='impulses'))
-- wplot.append(Gnuplot.Data(x1,y1p,with='impulses'))
-+ oplot.append(Gnuplot.Data(x1,y1,_with='impulses'))
-+ wplot.append(Gnuplot.Data(x1,y1p,_with='impulses'))
-
- oplots.append((oplot,self.params.onsetmode,self.maxofunc))
-
-@@ -128,7 +128,7 @@
- t_onsets = aubio.txtfile.read_datafile(datafile)
- x2 = numarray.array(t_onsets).resize(len(t_onsets))
- y2 = self.maxofunc*numarray.ones(len(t_onsets))
-- wplot.append(Gnuplot.Data(x2,y2,with='impulses'))
-+ wplot.append(Gnuplot.Data(x2,y2,_with='impulses'))
-
- tol = 0.050
-
-diff -ur python/aubio.orig/task/pitch.py python/aubio/task/pitch.py
---- python/aubio.orig/task/pitch.py 2011-10-31 10:52:53.000000000 -0700
-+++ python/aubio/task/pitch.py 2011-10-31 10:59:25.000000000 -0700
-@@ -156,7 +156,7 @@
-
- time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ]
- pitch = [aubio_freqtomidi(i) for i in pitch]
-- oplots.append(Gnuplot.Data(time,pitch,with='lines',
-+ oplots.append(Gnuplot.Data(time,pitch,_with='lines',
- title=self.params.pitchmode))
- titles.append(self.params.pitchmode)
-
-@@ -170,7 +170,7 @@
- if truth:
- timet,pitcht = self.gettruth()
- if timet and pitcht:
-- oplots = [Gnuplot.Data(timet,pitcht,with='lines',
-+ oplots = [Gnuplot.Data(timet,pitcht,_with='lines',
- title='ground truth')] + oplots
-
- g = gnuplot_create(outplot=outplot, extension=extension)
</del></span></pre></div>
<a id="trunkdportsaudioaubiofilespatchwscriptdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/aubio/files/patch-wscript.diff (0 => 121872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/aubio/files/patch-wscript.diff (rev 0)
+++ trunk/dports/audio/aubio/files/patch-wscript.diff 2014-07-09 23:10:05 UTC (rev 121872)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- wscript.orig 2014-03-12 08:19:28.000000000 -0700
++++ wscript 2014-05-05 01:32:00.000000000 -0700
+@@ -103,8 +103,6 @@
+ ctx.env['cshlib_PATTERN'] = 'lib%s.dll'
+
+ if target_platform == 'darwin':
+- ctx.env.CFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
+- ctx.env.LINKFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
+ ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
+ ctx.define('HAVE_ACCELERATE', 1)
+
</ins></span></pre>
</div>
</div>
</body>
</html>