Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lp1840537: Enable (lib)modplug support on Linux by default #2244

Merged
merged 1 commit into from
Aug 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Mixxx has the following dependencies:
- libvorbis
- libvorbisfile
- libsndfile
- libmodplug
- libflac
- libopus
- libshout
Expand Down
3 changes: 2 additions & 1 deletion build/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ Build-Depends: debhelper (>= 9),
libsoundtouch-dev,
libhidapi-dev,
libupower-glib-dev,
liblilv-dev
liblilv-dev,
libmodplug-dev
Standards-Version: 3.9.8
Homepage: http://www.mixxx.org/

Expand Down
8 changes: 6 additions & 2 deletions build/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,15 +441,19 @@ class ModPlug(Feature):
def description(self):
return "Modplug module decoder plugin"

def default(self, build):
return 1 if build.platform_is_linux else 0

def enabled(self, build):
build.flags['modplug'] = util.get_flags(build.env, 'modplug', 0)
build.flags['modplug'] = util.get_flags(build.env, 'modplug', self.default(build))
if int(build.flags['modplug']):
return True
return False

def add_options(self, build, vars):
vars.Add('modplug',
'Set to 1 to enable libmodplug based module tracker support.', 0)
'Set to 1 to enable libmodplug based module tracker support.',
self.default(build))

def configure(self, build, conf):
if not self.enabled(build):
Expand Down