Page MenuHomeFreeBSD
Differential D15178 Diff 49541 mixxx/files/patch-build_features.py

Changeset View

Standalone View

View Options

mixxx/files/patch-build_features.py

--- build/features.py.orig 2015-12-29 16:10:41 UTC --- build/features.py 2018-04-15 13:30:27.000000000 -0500
+++ build/features.py +++ build/features.py 2018-04-22 00:57:02.590575000 -0500
@@ -87,6 +87,9 @@ class HID(Feature): @@ -112,6 +112,9 @@
raise Exception('Did not find the setupapi library, exiting.') raise Exception('Did not find the setupapi library, exiting.')
elif build.platform_is_osx: elif build.platform_is_osx:
build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation']) build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
+ elif build.platform_is_bsd: + elif build.platform_is_bsd:
+ conf.CheckLib(['usb', 'libusb']) + conf.CheckLib(['usb', 'libusb'])
+ conf.CheckLib(['usbhid', 'libusbhid']) + conf.CheckLib(['usbhid', 'libusbhid'])
build.env.Append(CPPDEFINES='__HID__') build.env.Append(CPPDEFINES='__HID__')
if self.INTERNAL_LINK:
@@ -100,7 +103,7 @@ class HID(Feature): @@ -129,7 +132,7 @@
# setupapi. # setupapi.
sources.append( sources.append(
os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c")) os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
- elif build.platform_is_linux: - elif build.platform_is_linux:
+ elif build.platform_is_linux or build.platform_is_bsd: + elif build.platform_is_linux or build.platform_is_bsd:
# hidapi compiles the libusb implementation by default on Linux # hidapi compiles the libusb implementation by default on Linux
sources.append( sources.append(
os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c')) os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
@@ -117,14 +120,14 @@ class Bulk(Feature): @@ -147,14 +150,14 @@
def enabled(self, build): def enabled(self, build):
# For now only make Bulk default on Linux only. Turn on for all # For now only make Bulk default on Linux only. Turn on for all
# platforms after the 1.11.0 release. # platforms after the 1.11.0 release.
- is_default = 1 if build.platform_is_linux else 0 - is_default = 1 if build.platform_is_linux else 0
+ is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0 + is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0
build.flags['bulk'] = util.get_flags(build.env, 'bulk', is_default) build.flags['bulk'] = util.get_flags(build.env, 'bulk', is_default)
if int(build.flags['bulk']): if int(build.flags['bulk']):
return True return True
return False return False
def add_options(self, build, vars): def add_options(self, build, vars):
- is_default = 1 if build.platform_is_linux else 0 - is_default = 1 if build.platform_is_linux else 0
+ is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0 + is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0
vars.Add('bulk', vars.Add('bulk',
'Set to 1 to enable USB Bulk controller support.', is_default) 'Set to 1 to enable USB Bulk controller support.', is_default)
@@ -132,12 +135,15 @@ class Bulk(Feature): @@ -162,12 +165,15 @@
if not self.enabled(build): if not self.enabled(build):
return return
- build.env.ParseConfig( - build.env.ParseConfig(
- 'pkg-config libusb-1.0 --silence-errors --cflags --libs') - 'pkg-config libusb-1.0 --silence-errors --cflags --libs')
- if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or - if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
- not conf.CheckHeader('libusb-1.0/libusb.h')): - not conf.CheckHeader('libusb-1.0/libusb.h')):
- raise Exception( - raise Exception(
- 'Did not find the libusb 1.0 development library or its header file, exiting!') - 'Did not find the libusb 1.0 development library or its header file, exiting!')
+ if build.platform_is_linux: + if build.platform_is_linux:
+ build.env.ParseConfig( + build.env.ParseConfig(
+ 'pkg-config libusb-1.0 --silence-errors --cflags --libs') + 'pkg-config libusb-1.0 --silence-errors --cflags --libs')
+ if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or + if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
+ not conf.CheckHeader('libusb-1.0/libusb.h')): + not conf.CheckHeader('libusb-1.0/libusb.h')):
+ raise Exception( + raise Exception(
+ 'Did not find the libusb 1.0 development library or its header file, exiting!') + 'Did not find the libusb 1.0 development library or its header file, exiting!')
+ elif build.platform_is_bsd: + elif build.platform_is_bsd:
+ conf.CheckLib(['usb', 'libusb']) + conf.CheckLib(['usb', 'libusb'])
build.env.Append(CPPDEFINES='__BULK__') build.env.Append(CPPDEFINES='__BULK__')
@@ -409,7 +415,7 @@
# FFTW3 support
have_fftw3_h = conf.CheckHeader('fftw3.h')
have_fftw3 = conf.CheckLib('fftw3', autoadd=False)
- if have_fftw3_h and have_fftw3 and build.platform_is_linux:
+ if have_fftw3_h and have_fftw3 and (build.platform_is_linux or build.platform_is_bsd) :
build.env.Append(CPPDEFINES='HAVE_FFTW3')
build.env.ParseConfig(
'pkg-config fftw3 --silence-errors --cflags --libs')
@@ -1295,7 +1301,7 @@
return ["util/battery/batterywindows.cpp"]
elif build.platform_is_osx:
return ["util/battery/batterymac.cpp"]
- elif build.platform_is_linux:
+ elif build.platform_is_linux or build.platform_is_bsd:
return ["util/battery/batterylinux.cpp"]
else:
raise Exception('Battery support is not implemented for the target platform.')