diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-06-20 15:31:13 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2020-06-20 15:50:23 +0200 |
| commit | f15ef7b2c7b1abdb84b8c2f56723fca387c6d26e (patch) | |
| tree | 21d7a2f730424b86e43df24ba7f634a86441bafa /build | |
| parent | 802f65435a0f8b9032008d33d8e6649f82b5676c (diff) | |
| parent | c1b119aeecd449e1e68b984d1a05d5835ec9301a (diff) | |
Merge remote-tracking branch 'upstream/2.3' into wtrackwidgetgroup
Diffstat (limited to 'build')
| -rw-r--r-- | build/debian/changelog | 2 | ||||
| -rw-r--r-- | build/depends.py | 6 | ||||
| -rw-r--r-- | build/features.py | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/build/debian/changelog b/build/debian/changelog index f0ac68b858..fbfc06ea56 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -mixxx (2.2.3-0ubuntu1) bionic; urgency=medium +mixxx (2.2.4-0ubuntu3) bionic; urgency=medium * Bugfix release diff --git a/build/depends.py b/build/depends.py index bf7d5b95e9..3e86495fe3 100644 --- a/build/depends.py +++ b/build/depends.py @@ -557,7 +557,7 @@ class SoundTouch(Dependence): if build.platform_is_linux or build.platform_is_bsd: # Try using system lib - if conf.CheckForPKG('soundtouch', '2.0.0'): + if conf.CheckForPKG('soundtouch', '2.1.1'): # System Lib found if not conf.CheckLib(['SoundTouch']): raise Exception( @@ -566,7 +566,9 @@ class SoundTouch(Dependence): self.INTERNAL_LINK = False if self.INTERNAL_LINK: - env.Append(CPPPATH=['#' + self.SOUNDTOUCH_INTERNAL_PATH]) + # The system includes all start with <soundtouch/...>, i.e. + # we must omit the "soundtouch" path component here! + env.Append(CPPPATH=['#/lib']) # Prevents circular import. from .features import Optimize diff --git a/build/features.py b/build/features.py index 60f75dbb2d..31d38dd187 100644 --- a/build/features.py +++ b/build/features.py @@ -157,7 +157,8 @@ class Bulk(Feature): 'src/controllers/bulk/bulkenumerator.cpp'] if not int(build.flags['hid']): sources.append( - 'src/controllers/hid/hidcontrollerpresetfilehandler.cpp') + ['src/controllers/hid/hidcontrollerpresetfilehandler.cpp', + 'src/controllers/hid/hidcontrollerpreset.cpp']) return sources @@ -1212,7 +1213,7 @@ class QtKeychain(Feature): return "Secure credentials storage support for Live Broadcasting profiles" def enabled(self, build): - build.flags['qtkeychain'] = util.get_flags(build.env, 'qtkeychain', 0) + build.flags['qtkeychain'] = util.get_flags(build.env, 'qtkeychain', 1) if int(build.flags['qtkeychain']): return True return False |