summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD24
-rw-r--r--numpy.patch31
3 files changed, 17 insertions, 44 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f17e0745e5a2..d796ff079602 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = friture
pkgdesc = An application to visualize and analyze live audio data in real-time.
pkgver = 0.42
- pkgrel = 1
+ pkgrel = 2
url = http://tlecomte.github.com/friture/
arch = i686
arch = x86_64
@@ -19,8 +19,8 @@ pkgbase = friture
depends = python-rtmixer
depends = python-sounddevice
optdepends = jack: for JACK I/O support
- source = https://github.com/tlecomte/friture/archive/99dd16498888a5fc5f14bb00c380cb5ce2f54c73.tar.gz
- sha256sums = 1a2fc0e6a728c3444a712fc69f14248bae3ebdb526c879bbdb26a2798f1906ae
+ source = https://github.com/tlecomte/friture/archive/v0.42.tar.gz
+ sha256sums = eb241d8f469d7165cda4b5873fb5f7b1629f0b5aedf0f5f094fd1b1bdd390865
pkgname = friture
diff --git a/PKGBUILD b/PKGBUILD
index 81b3e005615b..42688d40f543 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=friture
pkgver=0.42
-pkgrel=1
+pkgrel=2
pkgdesc="An application to visualize and analyze live audio data in real-time."
arch=(i686 x86_64)
url="http://tlecomte.github.com/friture/"
@@ -12,20 +12,24 @@ license=('GPL3')
depends=('python-appdirs' 'python-docutils' 'python-multipledispatch' 'python-numpy' 'python-opengl' 'python-pa-ringbuffer' 'python-pyqt5' 'python-pyrr' 'python-rtmixer' 'python-sounddevice')
optdepends=('jack: for JACK I/O support')
makedepends=('cython' 'python-wheel')
-_commit=99dd16498888a5fc5f14bb00c380cb5ce2f54c73
-source=("https://github.com/tlecomte/$pkgname/archive/${_commit}.tar.gz")
+source=("https://github.com/tlecomte/friture/archive/v${pkgver}.tar.gz")
build() {
- cd "$srcdir/$pkgname-${_commit}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
python setup.py build
}
package() {
- cd "$srcdir/$pkgname-${_commit}"
- python setup.py install --root="$pkgdir/"
- install -Dm644 resources/images/friture.iconset/icon_512x512.png $pkgdir/usr/share/pixmaps/${pkgname}.png
- install -Dm644 appimage/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
- sed -i "s|usr|/usr|g" "$pkgdir"/usr/share/applications/$pkgname.desktop
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ python setup.py install --root="${pkgdir}/"
+
+ install -Dm644 resources/images/friture.iconset/icon_512x512.png \
+ "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ install -Dm644 "appimage/${pkgname}.desktop" \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ sed -i "s|usr|/usr|g" \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
}
-sha256sums=('1a2fc0e6a728c3444a712fc69f14248bae3ebdb526c879bbdb26a2798f1906ae')
+sha256sums=('eb241d8f469d7165cda4b5873fb5f7b1629f0b5aedf0f5f094fd1b1bdd390865')
diff --git a/numpy.patch b/numpy.patch
deleted file mode 100644
index ffd90e7b3cbe..000000000000
--- a/numpy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e5c945a13d6f1d9de1cbb88c2b916fdb0401a5be Mon Sep 17 00:00:00 2001
-From: Joost Timmerman <joost@tmmrman.nl>
-Date: Sat, 1 Feb 2020 22:52:53 +0100
-Subject: [PATCH] Use floor division to get integer values
-
-This resolves an error
-
- File "/usr/bin/friture", line 10, in <module>
- main()
- ...
- File "/usr/lib/python3.8/site-packages/friture/audioproc.py", line 109, in update_freq_cache
- self.freq = linspace(0, SAMPLING_RATE / (2 * self.decimation), self.fft_size / (2 * self.decimation) + 1)
- ...
-TypeError: object of type <class 'float'> cannot be safely interpreted as an integer.
----
- friture/audioproc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/friture/audioproc.py b/friture/audioproc.py
-index dfce022..da36006 100644
---- a/friture/audioproc.py
-+++ b/friture/audioproc.py
-@@ -106,7 +106,7 @@ def update_window(self):
- def update_freq_cache(self):
- if len(self.freq) != self.fft_size / (2 * self.decimation) + 1:
- self.logger.info("audioproc: updating self.freq cache")
-- self.freq = linspace(0, SAMPLING_RATE / (2 * self.decimation), self.fft_size / (2 * self.decimation) + 1)
-+ self.freq = linspace(0, SAMPLING_RATE // (2 * self.decimation), self.fft_size // (2 * self.decimation) + 1)
-
- # compute psychoacoustic weighting. See http://en.wikipedia.org/wiki/A-weighting
- f = self.freq