diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2020-01-17 23:46:12 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2020-01-17 23:48:30 +0100 |
commit | caed8186bcdcb7a13b1c1ead46f9d84f3cdb17d2 (patch) | |
tree | fb80d1902cb5d4c2846ea5d961a5c61b7fda30b9 /build | |
parent | 170f27476562525ddeeea844233d844896c987c6 (diff) |
Dispose shoutcast_internal because it was confusing without a real use case
Diffstat (limited to 'build')
-rw-r--r-- | build/features.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/build/features.py b/build/features.py index 048189a6ac..a72130b4f5 100644 --- a/build/features.py +++ b/build/features.py @@ -814,6 +814,8 @@ class TestSuite(Feature): class LiveBroadcasting(Feature): + INTERNAL_LINK = False + def description(self): return "Live Broadcasting Support" @@ -825,42 +827,39 @@ class LiveBroadcasting(Feature): def add_options(self, build, vars): vars.Add('shoutcast', 'Set to 1 to enable live broadcasting support', 1) - vars.Add('shoutcast_internal', 'Set to 1 to use internal libshout', 0) def configure(self, build, conf): - build.flags['shoutcast_internal'] = util.get_flags(build.env, 'shoutcast_internal', 0) if not self.enabled(build): return build.env.Append(CPPDEFINES='__BROADCAST__') - if build.platform_is_linux and not int(build.flags['shoutcast_internal']): + if build.platform_is_linux: # Check if system lib is lower 2.4.2 or at least 2.4.4 and not suffering bug # https://bugs.launchpad.net/mixxx/+bug/1833225 if not conf.CheckForPKG('shout', '2.4.4'): if conf.CheckForPKG('shout', '2.4.2'): print("System's libshout suffers lp1833225, using internal shout_mixxx") - build.flags['shoutcast_internal'] = 1 + self.INTERNAL_LINK = True else: - print("(no) here is fine here we just don't want 2.4.2") + print("(no) here is fine here we just don't want 2.4.2 or 2.4.3") + + if not self.INTERNAL_LINK: + self.INTERNAL_LINK = not conf.CheckLib(['libshout', 'shout']) - if int(build.flags['shoutcast_internal']): + if self.INTERNAL_LINK: + print("Using internal shout_mixxx from lib/libshout") build.env.Append(CPPPATH='include') build.env.Append(CPPPATH='src') return - libshout_found = conf.CheckLib(['libshout', 'shout']) - - if not libshout_found: - raise Exception('Could not find libshout or its development headers. Please install it or compile Mixxx without Shoutcast support using the shoutcast=0 flag.') - if build.platform_is_windows and build.static_dependencies: conf.CheckLib('winmm') conf.CheckLib('ws2_32') conf.CheckLib('gdi32') def sources(self, build): - if int(build.flags['shoutcast_internal']): + if self.INTERNAL_LINK: # Clone our main environment so we don't change any settings in the # Mixxx environment libshout_env = build.env.Clone() |