Hi!
Find attached a patch which makes hydrogen build on kFreeBSD.
Note that this is not intended to be applied as is, I only post it so
Jonas can integrate it when he finds time. Or I'll do after some hours
of sleep, it's half past midnight here at DC10.
Also keep in mind that we want to conditionally disable alsa on
kfreebsd. I'd also vote for ditching port*, at least on non-linux.
(ditching port* on linux would make sense, too, OTOH, it's unnecessarily
limiting)
HTH
--
mail: a...@thur.de http://adi.thur.de PGP/GPG: key via keyserver
Paradox ist, wenn ein Baecker brotlos wird.
diff --git a/Sconstruct b/Sconstruct
index 73d9d92..eeb5ec6 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -47,7 +47,7 @@ def get_platform_flags( opts ):
env = Environment( options = opts )
- if sys.platform[:6] == "linux2" or sys.platform == "darwin":
+ if sys.platform[:6] == "linux2" or sys.platform == "darwin" or sys.platform == "gnukfreebsd8":
if str(env['debug']) == "1":
cppflags += ['-Wall', '-g2', '-ggdb', '-O0']
for flag in env["optflags"].split(" "):
@@ -93,8 +93,6 @@ def get_platform_flags( opts ):
includes.append( '3rdparty\libarchive\include' )
includes.append( 'windows\timeFix' )
includes.append( 'C:\Program Files\GnuWin32\include' )
- else:
- raise Exception( "Platform '%s' not supported" % sys.platform )
return (includes, cppflags, ldflags)
diff --git a/debian/rules b/debian/rules
index eb76202..c27df2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ DEB_UPSTREAM_URL = http://downloads.sourceforge.net/hydrogen
DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^.*\.(flac|png|qm)|\./debian/(changelog|copyright(|_hints|_newhints))$
-DEB_SCONS_OPTIONS = libarchive=1 portaudio=1 portmidi=1 lash=1 prefix=/usr
+DEB_SCONS_OPTIONS = libarchive=1 portaudio=0 portmidi=0 lash=1 alsa=0 prefix=/usr
DEB_SCONS_OPTIONS += optflags="$(CXXFLAGS)"
DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)
diff --git a/qt4.py b/qt4.py
index b062825..ec515ae 100644
--- a/qt4.py
+++ b/qt4.py
@@ -444,7 +444,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
try : self.AppendUnique(CPPDEFINES=moduleDefines[module])
except: pass
debugSuffix = ''
- if sys.platform == "linux2" and not crosscompiling :
+ if (sys.platform == "linux2" or sys.platform =="gnukfreebsd8") and not crosscompiling :
if debug : debugSuffix = '_debug'
for module in modules :
if module not in pclessModules : continue
