pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/aubio/patches aubio: remove obsolete patches
details: https://anonhg.NetBSD.org/pkgsrc/rev/e6c2abf05355
branches: trunk
changeset: 399073:e6c2abf05355
user: nia <nia%pkgsrc.org@localhost>
date: Fri Aug 02 08:31:56 2019 +0000
description:
aubio: remove obsolete patches
diffstat:
audio/aubio/patches/patch-python_aubio_bench_onset.py | 60 -----------------
audio/aubio/patches/patch-python_aubio_gnuplot.py | 24 ------
audio/aubio/patches/patch-python_aubio_plot_keyboard.py | 17 ----
audio/aubio/patches/patch-python_aubio_task_beat.py | 22 ------
audio/aubio/patches/patch-python_aubio_task_notes.py | 38 ----------
audio/aubio/patches/patch-python_aubio_task_onset.py | 35 ---------
audio/aubio/patches/patch-python_aubio_task_pitch.py | 24 ------
7 files changed, 0 insertions(+), 220 deletions(-)
diffs (248 lines):
diff -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_bench_onset.py
--- a/audio/aubio/patches/patch-python_aubio_bench_onset.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-python_aubio_bench_onset.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/bench/onset.py.orig 2006-07-26 23:27:19.000000000 +0000
-+++ python/aubio/bench/onset.py
-@@ -111,7 +111,7 @@ class benchonset(bench):
- 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 @@ class benchonset(bench):
- 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 @@ class benchonset(bench):
- 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 @@ class benchonset(bench):
- 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 @@ class benchonset(bench):
- 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 @@ class benchonset(bench):
- 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 -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_gnuplot.py
--- a/audio/aubio/patches/patch-python_aubio_gnuplot.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-python_aubio_gnuplot.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/gnuplot.py.orig 2006-08-24 02:13:22.000000000 +0000
-+++ python/aubio/gnuplot.py
-@@ -155,7 +155,7 @@ def make_audio_plot(time,data,maxpoints=
- """ 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 @@ def make_audio_envelope(time,data,maxpoi
- 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 -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_plot_keyboard.py
--- a/audio/aubio/patches/patch-python_aubio_plot_keyboard.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-python_aubio_plot_keyboard.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/plot/keyboard.py.orig 2006-07-26 23:27:19.000000000 +0000
-+++ python/aubio/plot/keyboard.py
-@@ -30,8 +30,8 @@ def draw_keyboard(firstnote = 21, lastno
- yb = [y0+(y1-y0)*2/3. for i in range(len(xb))]
- ybdelta = [(y1-y0)*1/3. for i in range(len(xb))]
-
-- whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with = 'boxxyerrorbars')
-- blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with = 'boxxyerrorbars fill solid')
-+ whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars')
-+ blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid')
-
- return blacks,whites
-
diff -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_task_beat.py
--- a/audio/aubio/patches/patch-python_aubio_task_beat.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-python_aubio_task_beat.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/task/beat.py.orig 2006-09-25 19:26:08.000000000 +0000
-+++ python/aubio/task/beat.py
-@@ -247,7 +247,7 @@ class taskbeat(taskonset):
-
- 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 @@ class taskbeat(taskonset):
- #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 -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_task_notes.py
--- a/audio/aubio/patches/patch-python_aubio_task_notes.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-python_aubio_task_notes.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/task/notes.py.orig 2006-07-26 23:27:19.000000000 +0000
-+++ python/aubio/task/notes.py
-@@ -95,15 +95,15 @@ class tasknotes(task):
- 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 @@ class tasknotes(task):
- # 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 -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_task_onset.py
--- a/audio/aubio/patches/patch-python_aubio_task_onset.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-python_aubio_task_onset.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/task/onset.py.orig 2006-08-11 12:27:47.000000000 +0000
-+++ python/aubio/task/onset.py
-@@ -103,7 +103,7 @@ class taskonset(task):
- 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 @@ class taskonset(task):
- #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 @@ class taskonset(task):
- 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 -r b1a9b60e09d2 -r e6c2abf05355 audio/aubio/patches/patch-python_aubio_task_pitch.py
--- a/audio/aubio/patches/patch-python_aubio_task_pitch.py Fri Aug 02 08:21:05 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-python_aubio_task_pitch.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
-
-* After 2.6, with is reserved and must not be used as variable.
-
---- python/aubio/task/pitch.py.orig 2006-07-26 23:27:19.000000000 +0000
-+++ python/aubio/task/pitch.py
-@@ -156,7 +156,7 @@ class taskpitch(task):
-
- 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 @@ class taskpitch(task):
- 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)
Home |
Main Index |
Thread Index |
Old Index