Use virtualenv and switch to samplerate package

stackp · Nov 1, 2017 · e10221a · e10221a
1 parent 303947e
commit e10221a
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 448 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 *~
 *.c
 *so
-pyalsaaudio*
+pyalsaaudio*
+venv/
diff --git a/build.sh b/build.sh
@@ -6,33 +6,23 @@ log () {
     echo -e "${ORANGE}${*}${NC}"
 }
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
 
-if [ ! -d pyalsaaudio-0.8.4/ ]; then
-    log "\n→ Downloading pyalsaaudio..."
-    wget https://pypi.python.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83/pyalsaaudio-0.8.4.tar.gz#md5=b46f69561bc85fc52e698b2440ca251e
-    tar xzf pyalsaaudio-0.8.4.tar.gz
-fi
-
-log "\n→ Building pyalsaaudio..."
-pushd pyalsaaudio-0.8.4/
-python2 setup.py build
-cp build/lib.*/*.so ../gum/alsaaudio.so
-rm -rf pyalsaaudio*
-popd
-
-log "\n→ Building scikits.samplerate..."
-pushd gum/scikits/samplerate
-make
-popd
+log "\n→ Creating virtualenv..."
+rm -rf venv
+virtualenv -p python2 --system-site-packages venv
+source venv/bin/activate
+pip install -r requirements.txt
 
 log "\n→ Building fast waveform display..."
 pushd gum/fast
-make
+make clean && make
 popd
 
 log "\n→ Building fast waveform display..."
 pushd gum/fx
-make
+make clean && make
 popd
 
 log "\n✓ Build completed with success"
diff --git a/gum/lib/edit.py b/gum/lib/edit.py
@@ -1,5 +1,5 @@
 import numpy
-from scikits import samplerate
+import samplerate
 
 
 def resample(frames, ratio):

diff --git a/gum/scikits/__init__.py b/gum/scikits/__init__.py
diff --git a/gum/scikits/samplerate/Makefile b/gum/scikits/samplerate/Makefile
diff --git a/gum/scikits/samplerate/__init__.py b/gum/scikits/samplerate/__init__.py
diff --git a/gum/scikits/samplerate/_samplerate.pyx b/gum/scikits/samplerate/_samplerate.pyx
diff --git a/gum/scikits/samplerate/info.py b/gum/scikits/samplerate/info.py
diff --git a/gum/scikits/samplerate/samplerate.pxd b/gum/scikits/samplerate/samplerate.pxd
diff --git a/gum/scikits/samplerate/setup.py b/gum/scikits/samplerate/setup.py