Skip to content
This repository has been archived by the owner on Feb 12, 2023. It is now read-only.

Commit

Permalink
feat: disable building with filter_audio by default
Browse files Browse the repository at this point in the history
Given that currently `filter_audio` doesn't help qTox users to improve
quality of their conversations, there's little to no point in making
qTox build with it by default. This might change when (if?)
`filter_audio` support in qTox gets improved/fixed.

BREAKING CHANGE: Disabling of `filter_audio` was done by passing
`DISABLE_FILTER_AUDIO=YES` to `qmake`. With this change `filter_audio`
is disabled by default, and in order to enable it,
`DISABLE_FILTER_AUDIO=NO` has to be passed to `qmake`.
  • Loading branch information
zetok committed Mar 21, 2016
1 parent d1446ae commit 116cc93
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis/build-ubuntu_14_04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ $CC --version
$CXX --version
# first build qTox without support for optional dependencies
echo '*** BUILDING "MINIMAL" VERSION ***'
qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" DISABLE_FILTER_AUDIO=YES ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES
qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES
# ↓ with $(nproc) fails, since travis gives 32 threads, and it leads to OOM
make -j10
# clean it up, and build normal version
make clean
echo '*** BUILDING "FULL" VERSION ***'
qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX"
qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" DISABLE_FILTER_AUDIO=NO
# ↓ with $(nproc) fails, since travis gives 32 threads, and it leads to OOM
make -j10
5 changes: 1 addition & 4 deletions qtox.pro
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ android {
LIBS += -L$$PWD/libs/lib -L$$ANDROID_TOOLCHAIN/lib

DISABLE_PLATFORM_EXT=YES
DISABLE_FILTER_AUDIO=YES

ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
contains(ANDROID_TARGET_ARCH,armeabi) {
Expand Down Expand Up @@ -104,9 +103,7 @@ contains(DISABLE_PLATFORM_EXT, YES) {
DEFINES += QTOX_PLATFORM_EXT
}

contains(DISABLE_FILTER_AUDIO, YES) {

} else {
contains(DISABLE_FILTER_AUDIO, NO) {
DEFINES += QTOX_FILTER_AUDIO
}

Expand Down

0 comments on commit 116cc93

Please sign in to comment.