diff --git a/.gitignore b/.gitignore index d44e3f2..1095610 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ __pycache__ .py[cod] build/* +dist/* env/* .vscode/* *.mkv diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..a0c51f7 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,2 @@ +# file GENERATED by distutils, do NOT edit +freeze.py diff --git a/README.md b/README.md index acf36d0..b82f3b4 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,19 @@ Installation ------------ ### Manual installation on Ubuntu 16.04 * Install pip: `sudo apt-get install python3-pip` -* Install dependencies: `sudo pip3 install pyqt5 numpy pillow-simd` -* Install `ffmpeg` from the [website](http://ffmpeg.org/) or from a PPA (e.g. [https://launchpad.net/~jonathonf/+archive/ubuntu/ffmpeg-3](https://launchpad.net/~jonathonf/+archive/ubuntu/ffmpeg-3). NOTE: `ffmpeg` in the standard repos is too old (v2.8). Old versions and `avconv` may be used but full functionality is only guaranteed with `ffmpeg` 3.3 or higher. +* Install [prerequisites to compile Pillow](http://pillow.readthedocs.io/en/3.1.x/installation.html#building-on-linux):`sudo apt-get install python3-dev python3-setuptools libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk` +* Prerequisites on **Fedora**:`sudo dnf install python3-devel redhat-rpm-config libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel` +* Install dependencies from PyPI: `sudo pip3 install pyqt5 numpy pillow-simd` +* Install `ffmpeg` from the [website](http://ffmpeg.org/) or from a PPA (e.g. [https://launchpad.net/~jonathonf/+archive/ubuntu/ffmpeg-3](https://launchpad.net/~jonathonf/+archive/ubuntu/ffmpeg-3)). NOTE: `ffmpeg` in the standard repos is too old (v2.8). Old versions and `avconv` may be used but full functionality is only guaranteed with `ffmpeg` 3.3 or higher. Download audio-visualizer-python from this repository and run it with `python3 main.py`. ### Manual installation on Windows +* **Not Recommended.** [Compiling Pillow is difficult on Windows](http://pillow.readthedocs.io/en/3.1.x/installation.html#building-on-windows) and required for a manual installation. * Download and install Python 3.6 from [https://www.python.org/downloads/windows/](https://www.python.org/downloads/windows/) * Add Python to your system PATH (it will ask during the installation process). +* Brave treacherous valley of getting prerequisites to [compile Pillow on Windows](https://www.pypkg.com/pypi/pillow-simd/f/winbuild/README.md). This is necessary because binary builds for Pillow-SIMD are not available. +* **Alternative:** install Pillow instead of Pillow-SIMD, for which binaries *are* available. However this will result in much slower video export times. * Open command prompt and run: `pip install pyqt5 numpy pillow-simd` * Download and install ffmpeg from [https://www.ffmpeg.org/download.html](https://www.ffmpeg.org/download.html). You can use the static builds. * Add ffmpeg to your system PATH, too. [How to edit the PATH on Windows.](https://www.java.com/en/download/help/path.xml) diff --git a/freeze.py b/freeze.py index 3266f45..c9b7918 100644 --- a/freeze.py +++ b/freeze.py @@ -18,7 +18,8 @@ buildOptions = dict( "html", "http", "xmlrpc", - "nose" + "nose", + 'tkinter', ], includes=[ "encodings",