StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore: remove all mentions of long-deprecated OpenCV

Browse Source
This commit is contained in:
Zetok Zalbavar 2016-04-16 05:49:12 +01:00
parent 74ce4da48c
commit 95794b4464
No known key found for this signature in database
GPG Key ID: C953D3880212068A
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL.md
View File

@ -553,9 +553,9 @@ Download the Qt online installer for Windows from
to assemble your Qt toolchain. Take the most recent version of Qt compiled with to assemble your Qt toolchain. Take the most recent version of Qt compiled with
MinGW. Although the installer provides its own bundled MinGW compiler toolchain MinGW. Although the installer provides its own bundled MinGW compiler toolchain
its recommend installing it separately because Qt is missing MSYS which is its recommend installing it separately because Qt is missing MSYS which is
needed to compile and install OpenCV and OpenAL. Thus you can - if needed - needed to compile and install OpenAL. Thus you can - if needed - deselect the
deselect the tab `Tools`. The following steps assume that Qt is installed at tab `Tools`. The following steps assume that Qt is installed at `C:\Qt`. If you
`C:\Qt`. If you decided to choose another location, replace corresponding parts. decided to choose another location, replace corresponding parts.
### MinGW ### MinGW

14
simple_make.sh
View File

@ -3,24 +3,22 @@
if which apt-get; then if which apt-get; then
sudo apt-get install \ sudo apt-get install \
git build-essential qt5-qmake qt5-default qttools5-dev-tools \ git build-essential qt5-qmake qt5-default qttools5-dev-tools \
libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev \ libqt5opengl5-dev libqt5svg5-dev libopenal-dev libavdevice-dev \
libavdevice-dev \
libxss-dev qrencode libqrencode-dev libtool autotools-dev \ libxss-dev qrencode libqrencode-dev libtool autotools-dev \
automake checkinstall check libopus-dev libvpx-dev libsodium-dev \ automake checkinstall check libopus-dev libvpx-dev libsodium-dev \
libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev \ libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev \
libsqlcipher-dev libsqlcipher-dev
elif which pacman; then elif which pacman; then
sudo pacman -S --needed \ sudo pacman -S --needed \
git base-devel qt5 opencv openal libxss qrencode opus libvpx \ git base-devel qt5 openal libxss qrencode opus libvpx libsodium
libsodium
elif which dnf; then elif which dnf; then
sudo dnf group install \ sudo dnf group install \
"Development Tools" "Development Tools"
sudo dnf install \ sudo dnf install \
git qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel \ git qt-devel qt-doc qt-creator qt5-qtsvg openal-soft-devel \
openal-soft-devel libXScrnSaver-devel qrencode-devel \ libXScrnSaver-devel qrencode-devel opus-devel libvpx-devel \
opus-devel libvpx-devel qt5-qttools-devel glib2-devel \ qt5-qttools-devel glib2-devel gdk-pixbuf2-devel gtk2-devel \
gdk-pixbuf2-devel gtk2-devel libsodium-devel libsodium-devel
elif which zypper; then elif which zypper; then
sudo zypper in \ sudo zypper in \
git patterns-openSUSE-devel_basis libqt5-qtbase-common-devel \ git patterns-openSUSE-devel_basis libqt5-qtbase-common-devel \

4
tools/buildPackages.sh
View File

@ -66,9 +66,9 @@ fi
if [[ $OPT_APT = "true" ]]; then if [[ $OPT_APT = "true" ]]; then
echo "Installing missing dependencies (if any)..." echo "Installing missing dependencies (if any)..."
if [[ $EUID -ne 0 && $OPT_SUDO = "true" ]]; then if [[ $EUID -ne 0 && $OPT_SUDO = "true" ]]; then
sudo apt-get install qt5-qmake libopenal-dev libopencv-dev libopus-dev -y sudo apt-get install qt5-qmake libopenal-dev libopus-dev -y
else else
apt-get install qt5-qmake libopenal-dev libopencv-dev libopus-dev -y apt-get install qt5-qmake libopenal-dev libopus-dev -y
fi fi
fi fi