1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Swap filter_audio/toxcore dependencies order, minor formatting changes

This commit is contained in:
kehugter 2015-10-23 11:47:17 +02:00
parent 9528830415
commit bb045612b7

View File

@ -22,7 +22,6 @@
- [Ubuntu <15.04](#ubuntu14-other-deps)
- [Ubuntu >=15.04](#ubuntu-other-deps)
- [FFmpeg (Ubuntu <15.04)](#ffmpeg)
- [filter_audio](#filter_audio)
- [toxcore dependencies](#toxcore-dependencies)
- [Arch](#arch-toxcore)
- [Debian](#debian-toxcore)
@ -31,6 +30,7 @@
- [Slackware](#slackware-toxcore)
- [Ubuntu <15.04](#ubuntu14-toxcore)
- [Ubuntu >=15.04](#ubuntu-toxcore)
- [filter_audio](#filter_audio)
- [toxcore compiling](#toxcore-compiling)
- [Compile qTox](#compile-qtox)
- [OS X](#osx)
@ -111,7 +111,6 @@ If your distribution is not listed, or you want / need to compile qTox, there ar
Most of the dependencies should be available through your package manger. You may either follow the directions below, or simply run `./simple_make.sh` after cloning this repository, which will attempt to automatically download dependencies followed by compilation.
### Install git
In order to clone the qTox repository you need Git.
@ -136,7 +135,7 @@ sudo dnf install git
```
<a name="opensuse-git" />
### openSUSE:
#### openSUSE:
```bash
sudo zypper install git
```
@ -148,7 +147,6 @@ sudo apt-get install git
```
### Clone qTox
Afterwards open a new Terminal, change to a directory of your choice and clone the repository:
```bash
@ -173,7 +171,7 @@ sudo pacman -S --needed base-devel qt5 openal libxss qrencode ffmpeg
#### Debian:
**Note that only Debian >=8 stable (jessie) is supported.**
If you use stable, you have to add backports to your sources.list for FFmpeg and others. Instructions here: http://backports.debian.org/Instructions/
If you use stable, you have to add backports to your `sources.list` for FFmpeg and others. Instructions here: http://backports.debian.org/Instructions/
```bash
sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libavutil-ffmpeg-dev libswresample-ffmpeg-dev libavcodec-ffmpeg-dev libswscale-ffmpeg-dev libavfilter-ffmpeg-dev libavdevice-ffmpeg-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev
@ -279,29 +277,6 @@ cd ../../
```
### filter_audio
This step is best done before compiling `toxcore`.
Now you can either follow the instructions at https://github.com/irungentoo/toxcore/blob/master/INSTALL.md#unix or use the [`bootstrap.sh`](/bootstrap.sh) script.
The script will automatically download and install `toxcore` and `libfilteraudio`:
```bash
## in qTox directory
./bootstrap.sh # use -h or --help for more information
```
If you've used script, you can skip directly to [compiling qTox](#compile-qtox).
If you want to compile and install it manually:
```bash
git clone https://github.com/irungentoo/filter_audio
cd filter_audio
make -j$(nproc)
sudo make install
```
### toxcore dependencies
Install all of the toxcore dependencies.
@ -362,6 +337,28 @@ sudo apt-get install libtool autotools-dev automake checkinstall check libopus-d
```
### filter_audio
This step is best done before compiling `toxcore`.
Now you can either follow the instructions at https://github.com/irungentoo/toxcore/blob/master/INSTALL.md#unix or use the [`bootstrap.sh`](/bootstrap.sh) script.
The script will automatically download and install `toxcore` and `libfilteraudio`:
```bash
## in qTox directory
./bootstrap.sh # use -h or --help for more information
```
If you've used script, you can skip directly to [compiling qTox](#compile-qtox).
If you want to compile and install it manually:
```bash
git clone https://github.com/irungentoo/filter_audio
cd filter_audio
make -j$(nproc)
sudo make install
```
### toxcore compiling
Provided that you have all required dependencies installed, you can simply run: