Skip to content

Commit 8bceb45

Browse files
author
arch
committed
update ubuntu install instructions
1 parent 0589b68 commit 8bceb45

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

docs/app/docs/user-guide/build.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,33 @@ This create the Windows executable in `./dist`.
1818

1919
Finally you can remove the build environment with `conda env remove -n build`
2020

21-
## Ubuntu
21+
## Ubuntu 20.04 LTS
2222

2323
The OpenCV Package in Ubuntu use the GTK Backend for the preview window. This will cause freezes of the UI, because i use Qt threads in my code. The Arch Linux OpenCV library was compiled with QT (see `python3 -c "import cv2; print(cv2.getBuildInformation())"` output) so no problem here. To use the Application on Ubuntu you have to compile `OpenCV + OpenCV contrib` with `-D WITH_QT=ON` flag from source. Or simply use [miniconda](https://docs.conda.io/en/latest/miniconda.html). They include OpenCV compiled with Qt support. After you have setup miniconda simply type the following commands to use Python-Funscript-Editor on Ubuntu:
2424

2525
```bash
26-
sudo apt install -y make git gcc g++ libmpv-dev
26+
sudo apt install -y make git gcc g++ libmpv-dev libatlas-base-dev
2727
sudo add-apt-repository ppa:savoury1/ffmpeg4
2828
sudo apt install -y ffmpeg
2929
git clone https://github.com/michael-mueller-git/Python-Funscript-Editor.git
3030
cd Python-Funscript-Editor
3131
conda env create -f environment_ubuntu.yaml
32-
conda activate funscript-editor
33-
make docs
34-
python3 main.py
3532
```
3633

3734
**NOTE:** The ffmpeg in the Ubuntu 20.04 LTS ppa package is too old, which means that the package does not contain the `v360` filter for VR videos. Therefore we install ffmpeg from savoury1 ppa.
35+
36+
Now you can run the program direct from source code with:
37+
38+
```bash
39+
conda activate funscript-editor
40+
python3 funscript-editor.py
41+
```
42+
43+
Or you can build an executable from current code with:
44+
45+
```bash
46+
conda activate funscript-editor
47+
./build.sh
48+
```
49+
50+
This create the Ubuntu executable in `./dist`.

environment_ubuntu.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ dependencies:
146146
- zlib=1.2.11=h7b6447c_3
147147
- zstd=1.4.9=haebb681_0
148148
- pip:
149+
- altgraph==0.17
149150
- click==8.0.1
150151
- coloredlogs==15.0.1
151152
- cycler==0.10.0
@@ -159,6 +160,8 @@ dependencies:
159160
- matplotlib==3.4.2
160161
- mergedeep==1.3.4
161162
- mkdocs==1.2.1
163+
- pyinstaller==4.3
164+
- pyinstaller-hooks-contrib==2021.2
162165
- pynput==1.7.3
163166
- python-dateutil==2.8.1
164167
- python-mpv==0.5.2

0 commit comments

Comments
 (0)