* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/
@ 2015-11-01 10:37 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2015-11-01 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 14bbc6a2259790692bec61a3d886a887e4752a02
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 10:17:23 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 10:17:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bbc6a2
media-libs/aubio: remove old.
Package-Manager: portage-2.2.23
media-libs/aubio/Manifest | 2 -
media-libs/aubio/aubio-0.3.2-r2.ebuild | 96 ------
media-libs/aubio/aubio-0.4.0-r1.ebuild | 104 -------
media-libs/aubio/files/aubio-0.3.2-multilib.patch | 11 -
.../aubio/files/aubio-0.3.2-numarray-gnuplot.patch | 332 ---------------------
5 files changed, 545 deletions(-)
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 158e49c..d8ae92a 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,3 +1 @@
-DIST aubio-0.3.2.tar.gz 609006 SHA256 dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd SHA512 b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc WHIRLPOOL eeb732702bbb1682d32fde5cce4d17ae402292e1c19dac2e45600b268c955310683712952be8a1f72c08255c8c75c5beff9a127ab5b296883a64a4b5d9cb949a
-DIST aubio-0.4.0.tar.bz2 277613 SHA256 49de9a06c819d4c4e0a9198a95eac374a1650083aef16c397004258bac2d33a2 SHA512 4f04ca8a873e45b6cdf84e3fb6028d9ad0abc0300daf83b1f7b08021355b1449f9c8d3a9b617bd479668e6b2c0c63c3ce69d61baeb6b0f621a84e850dedce8b6 WHIRLPOOL 432c0f555d21190838b573b90a68f625b267a399380ac79cb8687e8d2de53db1dff8c9ab235db446b315a98d9df729d45db7360b825e0ad37d6924b09788b1b9
DIST aubio-0.4.1.tar.bz2 288136 SHA256 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695 SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c WHIRLPOOL ea410de8ca5d81c8b6ff2f98a2353601a48435649e3c5931e41f9e7f4ccb8f9a8faf2156a3632de223638f1e91d608c5a77660fa00633a591488498c5e37fec6
diff --git a/media-libs/aubio/aubio-0.3.2-r2.ebuild b/media-libs/aubio/aubio-0.3.2-r2.ebuild
deleted file mode 100644
index 539474b..0000000
--- a/media-libs/aubio/aubio-0.3.2-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-
-inherit autotools eutils python
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="http://aubio.piem.org"
-SRC_URI="http://aubio.piem.org/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="alsa doc examples jack lash static-libs"
-
-RDEPEND="sci-libs/fftw:3.0
- media-libs/libsndfile
- media-libs/libsamplerate
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
- >=dev-lang/swig-1.3.0
- virtual/pkgconfig
- doc? ( app-doc/doxygen virtual/latex-base )"
-
-pkg_setup() {
- DOCS=( AUTHORS ChangeLog README TODO )
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # disable automagic puredata wrt #369835
- sed -i -e '/AC_CHECK_HEADER/s:m_pd.h:dIsAbLe&:' configure.ac || die
-
- epatch \
- "${FILESDIR}"/${P}-multilib.patch \
- "${FILESDIR}"/${P}-numarray-gnuplot.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable jack) \
- $(use_enable alsa) \
- $(use_enable lash)
-}
-
-src_compile() {
- default
-
- if use doc; then
- export VARTEXFONTS="${T}/fonts"
- cd "${S}"/doc
- doxygen user.cfg
- doxygen devel.cfg
- doxygen examples.cfg
- fi
-}
-
-src_install() {
- # `default` would be enough here if python.eclass supported EAPI=4
- emake DESTDIR="${D}" install || die
- dodoc "${DOCS[@]}"
-
- doman doc/*.1
- if use doc; then
- mv doc/user/html doc/user/user
- dohtml -r doc/user/user
- mv doc/devel/html doc/devel/devel
- dohtml -r doc/devel/devel
- mv doc/examples/html doc/examples/examples
- dohtml -r doc/examples/examples
- fi
-
- if use examples; then
- # install dist_noinst_SCRIPTS from Makefile.am
- insinto /usr/share/doc/${PF}/examples
- doins python/aubio{compare-onset,plot-notes,filter-notes,web.py} || die
- docinto examples
- newdoc python/README README.examples
- fi
-
- find "${ED}"usr -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() { python_mod_optimize aubio; }
-pkg_postrm() { python_mod_cleanup aubio; }
diff --git a/media-libs/aubio/aubio-0.4.0-r1.ebuild b/media-libs/aubio/aubio-0.4.0-r1.ebuild
deleted file mode 100644
index 669b939..0000000
--- a/media-libs/aubio/aubio-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 waf-utils multilib
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="http://aubio.org/"
-SRC_URI="http://aubio.org//pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python"
-
-RDEPEND="
- ffmpeg? ( virtual/ffmpeg )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- libsamplerate? ( media-libs/libsamplerate )
- python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
- sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- app-text/txt2man
- doc? ( app-doc/doxygen )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}/python"
-
-src_prepare() {
- sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die
- sed -i -e "s:doxygen:doxygen_disabled:" wscript || die
-}
-
-src_configure() {
- python_setup
- waf-utils_src_configure \
- --enable-complex \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable double-precision double) \
- $(use_enable fftw fftw3f) \
- $(use_enable fftw fftw3) \
- $(use_enable ffmpeg avcodec) \
- $(use_enable jack) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable sndfile)
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- waf-utils_src_compile --notests
-
- if use doc; then
- cd "${S}"/doc || die
- doxygen full.cfg || die
- fi
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_compile
- fi
-}
-
-src_test() {
- waf-utils_src_compile --alltests
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_test
- fi
-}
-
-src_install() {
- waf-utils_src_install
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- DOCS="" distutils-r1_src_install
- newdoc README README.python
- fi
-
- if use doc; then
- dohtml -r doc/full/html/.
- dodoc doc/*.txt
- fi
-
- if use examples; then
- # install dist_noinst_SCRIPTS from Makefile.am
- dodoc -r examples
- fi
-}
diff --git a/media-libs/aubio/files/aubio-0.3.2-multilib.patch b/media-libs/aubio/files/aubio-0.3.2-multilib.patch
deleted file mode 100644
index 7464fad..0000000
--- a/media-libs/aubio/files/aubio-0.3.2-multilib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python/aubio/Makefile.am
-+++ python/aubio/Makefile.am
-@@ -68,7 +68,7 @@
- -L$(top_builddir)/ext -laubioext \
- -L$(top_builddir)/src -laubio
-
--pkgpython_LTLIBRARIES = _aubiowrapper.la
-+pkgpyexec_LTLIBRARIES = _aubiowrapper.la
-
- _aubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS)
- _aubiowrapper_la_SOURCES = aubio_wrap.c
diff --git a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch b/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch
deleted file mode 100644
index 48d1e76..0000000
--- a/media-libs/aubio/files/aubio-0.3.2-numarray-gnuplot.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=aubio.git;a=tree
-
---- python/aubio/aubioclass.py
-+++ python/aubio/aubioclass.py
-@@ -42,8 +42,10 @@
- self.file = new_aubio_sndfile_wo(model.file,filename)
- else:
- self.file = new_aubio_sndfile_ro(filename)
-+ if self.file == None:
-+ raise(ValueError, "failed opening file %s" % filename)
- def __del__(self):
-- del_aubio_sndfile(self.file)
-+ if self.file != None: del_aubio_sndfile(self.file)
- def info(self):
- aubio_sndfile_info(self.file)
- def samplerate(self):
-@@ -126,7 +128,7 @@
- channels=1,samplerate=44100.,omode=aubio_pitchm_freq,yinthresh=0.1):
- self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels,
- samplerate,mode,omode)
-- aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh)
-+ aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh)
- #self.filt = filter(srate,"adsgn")
- def __del__(self):
- del_aubio_pitchdetection(self.pitchp)
---- python/aubio/bench/onset.py
-+++ python/aubio/bench/onset.py
-@@ -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))
---- python/aubio/gnuplot.py
-+++ python/aubio/gnuplot.py
-@@ -23,7 +23,7 @@
-
- def audio_to_array(filename):
- import aubio.aubioclass
-- import numarray
-+ from numpy import arange
- hopsize = 2048
- filei = aubio.aubioclass.sndfile(filename)
- framestep = 1/(filei.samplerate()+0.)
-@@ -39,7 +39,7 @@
- while (curpos < readsize):
- data.append(myvec.get(curpos,i))
- curpos+=1
-- time = numarray.arange(len(data))*framestep
-+ time = arange(len(data))*framestep
- return time,data
-
- def plot_audio(filenames, g, options):
-@@ -143,29 +143,29 @@
-
- def downsample_audio(time,data,maxpoints=10000):
- """ resample audio data to last only maxpoints """
-- import numarray
-+ from numpy import array, resize
- length = len(time)
- downsample = length/maxpoints
- if downsample == 0: downsample = 1
-- x = numarray.array(time).resize(length)[0:-1:downsample]
-- y = numarray.array(data).resize(length)[0:-1:downsample]
-+ x = resize(array(time),length)[0:-1:downsample]
-+ y = resize(array(data),length)[0:-1:downsample]
- return x,y
-
- def make_audio_plot(time,data,maxpoints=10000):
- """ 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 """
-- import numarray
-+ from numpy import array
- import Gnuplot, Gnuplot.funcutils
- bufsize = 500
-- 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 = [i.mean() for i in resize(array(time), (len(time)/bufsize,bufsize))]
-+ y = [i.mean() for i in resize(array(data), (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 """
---- python/aubio/onsetcompare.py
-+++ python/aubio/onsetcompare.py
-@@ -106,7 +106,7 @@
- return orig, missed, merged, expc, bad, doubled, l, labs
-
- def notes_roc (la, lb, eps):
-- from numarray import transpose, add, resize
-+ from numpy import transpose, add, resize
- """ creates a matrix of size len(la)*len(lb) then look for hit and miss
- in it within eps tolerance windows """
- gdn,fpw,fpg,fpa,fdo,fdp = 0,0,0,0,0,0
---- python/aubio/task/beat.py
-+++ python/aubio/task/beat.py
-@@ -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)
---- python/aubio/task/notes.py
-+++ python/aubio/task/notes.py
-@@ -92,18 +92,17 @@
- return now, onset, freq, ifreq
-
- def plot(self,now,onset,freq,ifreq,oplots):
-- 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 +116,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)))
---- python/aubio/task/onset.py
-+++ python/aubio/task/onset.py
-@@ -92,7 +92,7 @@
- import Gnuplot, Gnuplot.funcutils
- import aubio.txtfile
- import os.path
-- import numarray
-+ from numpy import arange, array, ones
- from aubio.onsetcompare import onset_roc
-
- x1,y1,y1p = [],[],[]
-@@ -102,8 +102,8 @@
- self.lenofunc = len(ofunc)
- 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))
-+ downtime = arange(len(ofunc))*self.params.step
-+ oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode))
-
- # detected onsets
- if not nplot:
-@@ -111,11 +111,11 @@
- x1.append(i[0]*self.params.step)
- y1.append(self.maxofunc)
- y1p.append(-self.maxofunc)
-- #x1 = numarray.array(onsets)*self.params.step
-- #y1 = self.maxofunc*numarray.ones(len(onsets))
-+ #x1 = array(onsets)*self.params.step
-+ #y1 = self.maxofunc*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))
-
-@@ -126,9 +126,9 @@
- self.title = "" #"(no ground truth)"
- else:
- 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'))
-+ x2 = array(t_onsets).resize(len(t_onsets))
-+ y2 = self.maxofunc*ones(len(t_onsets))
-+ wplot.append(Gnuplot.Data(x2,y2,with_='impulses'))
-
- tol = 0.050
-
---- python/aubio/task/pitch.py
-+++ python/aubio/task/pitch.py
-@@ -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)
---- python/aubiofilter-notes
-+++ python/aubiofilter-notes
-@@ -78,7 +78,7 @@
-
- from aubio import notefilter,txtfile,gnuplot
- """ load midi and raw data """
-- from numarray import array
-+ from numpy import array
- notelist = array(txtfile.read_datafile(input))
- """ filter it out """
- notelist_filtered = notefilter.segraw_onsets4(notelist,winlength,eps)
---- python/aubionotes
-+++ python/aubionotes
-@@ -4,7 +4,6 @@
-
- import aubio.aubioclass
- import aubio.median
-- #from numarray import around
- from math import floor
- hopsize = 512
- bufsize = 4096
---- python/aubioplot-notes
-+++ python/aubioplot-notes
-@@ -18,7 +18,7 @@
- def main (sysargs) :
- from aubio.txtfile import read_datafile
- from aubio.gnuplot import plotnote,plotnote_do
-- from numarray import array
-+ from numpy import array
- filein,fileout = parse_args(sysargs)
- #print 'checking', fileerr, 'against', fileorg
- """ load midi and raw data """
---- python/aubioweb.py
-+++ python/aubioweb.py
-@@ -11,7 +11,7 @@
- sndfile-programs (sndfile-info)
- vorbis-tools (oggenc)
- python-gnuplot
--python-numarray
-+python-numpy
-
- Try the command line tools in aubio/python to test your installation.
-
---- python/aubio/plot/keyboard.py
-+++ python/aubio/plot/keyboard.py
-@@ -30,8 +30,8 @@
- 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
-
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/
@ 2018-04-20 18:12 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2018-04-20 18:12 UTC (permalink / raw
To: gentoo-commits
commit: cc722585c1aa2e0d59093d53c8f466e51ae8aa60
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 14:51:11 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 18:11:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc722585
media-libs/aubio: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-libs/aubio/aubio-0.4.6.ebuild | 3 ++-
media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/media-libs/aubio/aubio-0.4.6.ebuild b/media-libs/aubio/aubio-0.4.6.ebuild
index c02467cd6e7..9c6af6537ba 100644
--- a/media-libs/aubio/aubio-0.4.6.ebuild
+++ b/media-libs/aubio/aubio-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -40,6 +40,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DOCS=( AUTHORS ChangeLog README.md )
PYTHON_SRC_DIR="${S}"
+PATCHES=( "${FILESDIR}/${PN}-0.4.6-ffmpeg4.patch" )
src_prepare() {
default
diff --git a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
new file mode 100644
index 00000000000..7df4665655b
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch
@@ -0,0 +1,13 @@
+Index: aubio-0.4.6/src/io/source_avcodec.c
+===================================================================
+--- aubio-0.4.6.orig/src/io/source_avcodec.c
++++ aubio-0.4.6/src/io/source_avcodec.c
+@@ -58,7 +58,7 @@
+ #include "fmat.h"
+ #include "source_avcodec.h"
+
+-#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+
+ struct _aubio_source_avcodec_t {
+ uint_t hop_size;
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/
@ 2020-07-16 1:06 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-07-16 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 3fada402b4218b1e0e6e731900d6f889f1939d82
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 00:29:08 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 01:01:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fada402
media-libs/aubio: security cleanup
Bug: https://bugs.gentoo.org/711226
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/aubio/Manifest | 2 -
media-libs/aubio/aubio-0.4.7-r1.ebuild | 123 -----------------------
media-libs/aubio/aubio-0.4.8.ebuild | 124 ------------------------
media-libs/aubio/files/aubio-0.4.8-docdir.patch | 20 ----
4 files changed, 269 deletions(-)
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 77196db1fd3..cafe77d9791 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,3 +1 @@
-DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
-DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
diff --git a/media-libs/aubio/aubio-0.4.7-r1.ebuild b/media-libs/aubio/aubio-0.4.7-r1.ebuild
deleted file mode 100644
index 977ee51acd4..00000000000
--- a/media-libs/aubio/aubio-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 waf-utils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- libsamplerate? ( media-libs/libsamplerate )
- python? (
- ${PYTHON_DEPS}
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- )
- sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-text/txt2man
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( double-precision libsamplerate )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}"
-
-src_prepare() {
- default
- sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
-
- if ! use test; then
- sed -e "/bld.*tests/d" -i wscript || die
- fi
-}
-
-src_configure() {
- python_setup
- local mywafconfargs=(
- --enable-complex
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable double-precision double)
- $(use_enable fftw fftw3)
- $(use_enable ffmpeg avcodec)
- $(use_enable jack)
- $(use_enable libsamplerate samplerate)
- $(use_enable sndfile)
- )
- use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
-
- waf-utils_src_configure "${mywafconfargs[@]}"
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- waf-utils_src_compile --notests
-
- if use doc; then
- cd "${S}"/doc || die
- emake dirhtml
- fi
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_compile
- fi
-}
-
-src_test() {
- waf-utils_src_compile --alltests
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_test
- fi
-}
-
-src_install() {
- waf-utils_src_install
-
- if use examples; then
- # install dist_noinst_SCRIPTS from Makefile.am
- dodoc -r examples
- fi
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- DOCS="" distutils-r1_src_install
- newdoc python/README.md README.python
- fi
-
- if use doc; then
- dodoc doc/*.txt
- docinto html
- dodoc -r doc/_build/dirhtml/.
- fi
-
- find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
deleted file mode 100644
index cb37129ec5c..00000000000
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 waf-utils
-
-DESCRIPTION="Library for audio labelling"
-HOMEPAGE="https://aubio.org/"
-SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
- fftw? ( sci-libs/fftw:3.0= )
- jack? ( virtual/jack )
- libsamplerate? ( media-libs/libsamplerate )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-text/txt2man
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( double-precision libsamplerate )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-PYTHON_SRC_DIR="${S}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.4.8-docdir.patch
-)
-
-src_prepare() {
- default
- sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
-
- if ! use test; then
- sed -e "/bld.*tests/d" -i wscript || die
- fi
-}
-
-src_configure() {
- python_setup
- local mywafconfargs=(
- --enable-complex
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable double-precision double)
- $(use_enable fftw fftw3)
- $(use_enable ffmpeg avcodec)
- $(use_enable jack)
- $(use_enable libsamplerate samplerate)
- $(use_enable sndfile)
- )
- use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
-
- waf-utils_src_configure "${mywafconfargs[@]}"
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_configure
- fi
-}
-
-src_compile() {
- waf-utils_src_compile --notests
-
- if use doc; then
- cd "${S}"/doc || die
- emake dirhtml
- fi
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_compile
- fi
-}
-
-src_test() {
- waf-utils_src_compile --alltests
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- distutils-r1_src_test
- fi
-}
-
-src_install() {
- waf-utils_src_install
-
- if use examples; then
- # install dist_noinst_SCRIPTS from Makefile.am
- dodoc -r examples
- fi
-
- if use python ; then
- cd "${PYTHON_SRC_DIR}" || die
- DOCS="" distutils-r1_src_install
- newdoc python/README.md README.python
- fi
-
- if use doc; then
- dodoc doc/*.txt
- docinto html
- dodoc -r doc/_build/dirhtml/.
- fi
-
- find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/aubio/files/aubio-0.4.8-docdir.patch b/media-libs/aubio/files/aubio-0.4.8-docdir.patch
deleted file mode 100644
index 58797995e3a..00000000000
--- a/media-libs/aubio/files/aubio-0.4.8-docdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aubio-0.4.8/wscript
-+++ aubio-0.4.8/wscript
-@@ -548,7 +548,7 @@
- source = 'doc/web.cfg',
- target = '../doc/web/html/index.html',
- cwd = 'doc')
-- bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc',
-+ bld.install_files( '${DATAROOTDIR}' + '/doc/' + os.environ['PF'] + '/libaubio-doc',
- bld.path.ant_glob('doc/web/html/**'),
- cwd = bld.path.find_dir ('doc/web'),
- relative_trick = True)
-@@ -564,7 +564,7 @@
- ' `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/' + os.environ['PF'] + '/libaubio-doc/sphinx',
- bld.path.ant_glob('doc/_build/html/**'),
- cwd = bld.path.find_dir('doc/_build/html'),
- relative_trick = True)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/
@ 2022-02-28 10:05 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2022-02-28 10:05 UTC (permalink / raw
To: gentoo-commits
commit: af459c88b6c5fdef8fca4d3c5a33aed8d0ff16a5
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 09:55:25 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 10:05:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af459c88
media-libs/aubio: ffmpeg5 fix
from upstream
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-libs/aubio/aubio-0.4.9-r1.ebuild | 1 +
media-libs/aubio/files/ffmpeg5.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/media-libs/aubio/aubio-0.4.9-r1.ebuild b/media-libs/aubio/aubio-0.4.9-r1.ebuild
index 579361fe63c9..48d70ea69fd3 100644
--- a/media-libs/aubio/aubio-0.4.9-r1.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r1.ebuild
@@ -51,6 +51,7 @@ PYTHON_SRC_DIR="${S}"
PATCHES=(
"${FILESDIR}"/${PN}-0.4.9-docdir.patch
+ "${FILESDIR}"/ffmpeg5.patch
)
src_prepare() {
diff --git a/media-libs/aubio/files/ffmpeg5.patch b/media-libs/aubio/files/ffmpeg5.patch
new file mode 100644
index 000000000000..e4901ad69c01
--- /dev/null
+++ b/media-libs/aubio/files/ffmpeg5.patch
@@ -0,0 +1,28 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+Date: Tue, 25 Jan 2022 18:30:27 +0100
+Subject: [PATCH 1/1] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec
+ > 59, thx @berolinux (closes gh-353)
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
+index e0ae93b5..1421bd9a 100644
+--- a/src/io/source_avcodec.c
++++ b/src/io/source_avcodec.c
+@@ -68,6 +68,10 @@
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+ #endif
+
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++#define FF_API_LAVF_AVCTX 1
++#endif
++
+ struct _aubio_source_avcodec_t {
+ uint_t hop_size;
+ uint_t samplerate;
+--
+2.11.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/
@ 2023-03-14 6:36 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2023-03-14 6:36 UTC (permalink / raw
To: gentoo-commits
commit: 50c8da202c029804b80186af5997e85317035f51
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Mon Mar 13 19:08:12 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 06:35:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c8da20
media-libs/aubio: enable py3.11
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/30093
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/aubio/aubio-0.4.9-r2.ebuild | 3 ++-
.../aubio-0.4.9-remove-universal-newlines.patch | 31 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/media-libs/aubio/aubio-0.4.9-r2.ebuild b/media-libs/aubio/aubio-0.4.9-r2.ebuild
index d352834990c5..8cd665ace6bd 100644
--- a/media-libs/aubio/aubio-0.4.9-r2.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 waf-utils
@@ -52,6 +52,7 @@ PYTHON_SRC_DIR="${S}"
PATCHES=(
"${FILESDIR}"/${PN}-0.4.9-docdir.patch
"${FILESDIR}"/ffmpeg5.patch
+ "${FILESDIR}"/${PN}-0.4.9-remove-universal-newlines.patch
)
src_prepare() {
diff --git a/media-libs/aubio/files/aubio-0.4.9-remove-universal-newlines.patch b/media-libs/aubio/files/aubio-0.4.9-remove-universal-newlines.patch
new file mode 100644
index 000000000000..304dae7afc5b
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-remove-universal-newlines.patch
@@ -0,0 +1,31 @@
+--- aubio-0.4.9/waflib/ConfigSet.py 2023-03-07 16:02:26.109510883 -0500
++++ aubio-0.4.9/waflib/ConfigSet.py 2023-03-07 16:05:12.892415156 -0500
+@@ -146,7 +146,7 @@ class ConfigSet(object):
+ Utils.writef(filename,''.join(buf))
+ def load(self,filename):
+ tbl=self.table
+- code=Utils.readf(filename,m='rU')
++ code=Utils.readf(filename,m='r')
+ for m in re_imp.finditer(code):
+ g=m.group
+ tbl[g(2)]=eval(g(3))
+--- aubio-0.4.9/waflib/Context.py 2023-03-07 16:02:26.109510883 -0500
++++ aubio-0.4.9/waflib/Context.py 2023-03-07 16:05:20.764245554 -0500
+@@ -106,7 +106,7 @@ class Context(ctx):
+ cache[node]=True
+ self.pre_recurse(node)
+ try:
+- function_code=node.read('rU',encoding)
++ function_code=node.read('r',encoding)
+ exec(compile(function_code,node.abspath(),'exec'),self.exec_dict)
+ finally:
+ self.post_recurse(node)
+@@ -346,7 +346,7 @@ def load_module(path,encoding=None):
+ pass
+ module=imp.new_module(WSCRIPT_FILE)
+ try:
+- code=Utils.readf(path,m='rU',encoding=encoding)
++ code=Utils.readf(path,m='r',encoding=encoding)
+ except EnvironmentError:
+ raise Errors.WafError('Could not read the file %r'%path)
+ module_dir=os.path.dirname(path)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/
@ 2024-06-25 2:09 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-06-25 2:09 UTC (permalink / raw
To: gentoo-commits
commit: 765cbe9e259d277abfaa186a9d5cb2d7725b211a
Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Wed Jun 19 00:59:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 02:08:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765cbe9e
media-libs/aubio: revbump to 0.4.9-r4
These changes fix:
- compile with python-exec[-native-symlinks]
- GCC 14 compatibility
- NumPy 2 compatibility
- documentation issues:
* partially missing docs on the first install
* duplicated docs on reinstalls
- missing blas USE flag
- missing pytest dependency
[sam: Drop the changes to -r2.]
Closes: https://bugs.gentoo.org/933405
Closes: https://bugs.gentoo.org/925102
Bug: https://bugs.gentoo.org/589262
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36988
Signed-off-by: Sam James <sam <AT> gentoo.org>
...aubio-0.4.9-r3.ebuild => aubio-0.4.9-r4.ebuild} | 32 +++++++++++++------
media-libs/aubio/files/aubio-0.4.9-gcc-14.patch | 37 ++++++++++++++++++++++
media-libs/aubio/files/aubio-0.4.9-numpy-2.patch | 13 ++++++++
3 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/media-libs/aubio/aubio-0.4.9-r3.ebuild b/media-libs/aubio/aubio-0.4.9-r4.ebuild
similarity index 77%
rename from media-libs/aubio/aubio-0.4.9-r3.ebuild
rename to media-libs/aubio/aubio-0.4.9-r4.ebuild
index 4a910ed12d2e..0c8533c51c66 100644
--- a/media-libs/aubio/aubio-0.4.9-r3.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_EXT=1
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 waf-utils
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0/5"
KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
+IUSE="blas doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( double-precision libsamplerate )
@@ -32,6 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
RDEPEND="
+ blas? ( virtual/cblas )
ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
fftw? ( sci-libs/fftw:3.0= )
jack? ( virtual/jack )
@@ -47,10 +48,8 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-text/txt2man
virtual/pkgconfig
- doc? (
- app-text/doxygen
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
BDEPEND="${DISTUTILS_DEPS}"
@@ -59,13 +58,23 @@ PYTHON_SRC_DIR="${S}"
PATCHES=(
"${FILESDIR}"/${P}-docdir.patch
+ "${FILESDIR}"/${P}-gcc-14.patch
+ "${FILESDIR}"/${P}-numpy-2.patch
"${FILESDIR}"/ffmpeg5.patch
)
src_prepare() {
default
- sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
+ # In case when aubio is already installed, calling of the
+ # `sphinx` function at the wscript causes a python interpreter
+ # crash on `import aubio` if aubio was built with <numpy-2,
+ # but current version of numpy is >=2.
+ # Additionally, it causes duplication of the documentation.
+ sed \
+ -e '/\(doxygen\|sphinx\)(bld)$/d' \
+ -e "s/package = 'blas'/package = 'cblas'/" \
+ -i wscript || die
sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
@@ -77,7 +86,9 @@ src_prepare() {
fi
# update waf to fix Python 3.12 compatibility
+ python_setup
sed -r \
+ -e "s:python:${PYTHON}:" \
-e "s:(WAFVERSION=).*:\1${WAFVERSION}:" \
-e "s:(WAFURL=).*:\1'${DISTDIR}/${WAFTARBALL}':" \
-e 's:^fetchwaf$:cp "${WAFURL}" "${WAFTARBALL}":' \
@@ -91,6 +102,7 @@ src_configure() {
local mywafconfargs=(
--enable-complex
--docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable blas)
$(use_enable doc docs)
$(use_enable double-precision double)
$(use_enable fftw fftw3)
@@ -122,8 +134,8 @@ src_compile() {
pushd "${S}"/doc &>/dev/null || die
python_setup
LD_LIBRARY_PATH="${S}/build/src:${LD_LIBRARY_PATH}" \
- PYTHONPATH="${S%%/}-${EPYTHON/./_}/lib${PYTHONPATH:+:${PYTHONPATH}}" \
- emake dirhtml
+ PYTHONPATH="${S%%/}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" \
+ emake html
fi
cd "${S}" || die
@@ -160,7 +172,7 @@ src_install() {
if use doc; then
dodoc doc/*.txt
docinto html
- dodoc -r doc/_build/dirhtml/.
+ dodoc -r doc/_build/html/.
fi
find "${ED}" -name "*.a" -delete || die
diff --git a/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch b/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch
new file mode 100644
index 000000000000..658ca9e2ffcf
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch
@@ -0,0 +1,37 @@
+# https://bugs.gentoo.org/925102
+# https://github.com/aubio/aubio/commit/95ff046c
+
+From: Paul Brossier <piem@piem.org>
+Date: Thu, 2 Jul 2020 11:16:13 +0200
+Subject: [PATCH] [py] add const qualifiers to ufuncs prototypes for latest numpy
+
+---
+ python/ext/ufuncs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/python/ext/ufuncs.c b/python/ext/ufuncs.c
+index d373d7258..e5641342e 100644
+--- a/python/ext/ufuncs.c
++++ b/python/ext/ufuncs.c
+@@ -3,8 +3,8 @@
+
+ typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
+
+-static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
+- npy_intp* steps, void* data)
++static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions,
++ const npy_intp* steps, void* data)
+ {
+ npy_intp i;
+ npy_intp n = dimensions[0];
+@@ -22,8 +22,8 @@ static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
+ }
+ }
+
+-static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,
+- npy_intp* steps, void* data)
++static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions,
++ const npy_intp* steps, void* data)
+ {
+ npy_intp i;
+ npy_intp n = dimensions[0];
diff --git a/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch b/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch
new file mode 100644
index 000000000000..be51e88fc6a4
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch
@@ -0,0 +1,13 @@
+diff --git a/python/tests/test_cvec.py b/python/tests/test_cvec.py
+index 73ee6549..e21418fc 100755
+--- a/python/tests/test_cvec.py
++++ b/python/tests/test_cvec.py
+@@ -43,7 +43,7 @@ class aubio_cvec_test_case(TestCase):
+ spec = cvec(1024)
+ spec.phas[39:-1] = -np.pi
+ assert_equal(spec.phas[0:39], 0)
+- assert_equal(spec.phas[39:-1], -np.pi)
++ assert_equal(spec.phas[39:-1], np.asanyarray(-np.pi, spec.phas.dtype))
+ assert_equal(spec.norm, 0)
+
+ def test_assign_cvec_with_other_cvec(self):
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-25 2:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-01 10:37 [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/files/, media-libs/aubio/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2018-04-20 18:12 Alexis Ballier
2020-07-16 1:06 Sam James
2022-02-28 10:05 Alexis Ballier
2023-03-14 6:36 Miroslav Šulc
2024-06-25 2:09 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox