diff options
| author | sbd <sbd> | 2012-06-28 07:32:36 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-06-28 07:32:36 +0000 |
| commit | 1880fa67d8e0108674d9ade35cfe8c73130f5893 (patch) | |
| tree | eaee5c12d5bae6f4f2ebc93917d95158c20af55e /audio/hydrogen/patches | |
| parent | 0f92ec816dcf6ca8f31aa0290a22622ed172efb7 (diff) | |
| download | pkgsrc-1880fa67d8e0108674d9ade35cfe8c73130f5893.tar.gz | |
Linux build fixes:
* On Linux only pull in alsa-lib buildlink and enable alsa support.
* In the Sconstruct file move the line setting the include path and ldflags
based on the prefix from the netbsd section to the linux, darwin and netbsd
section.
* When adding to an if/elif/else block _elif_ should be used.
Bump PKGREVISION (because of the earlier libarchive additions).
Diffstat (limited to 'audio/hydrogen/patches')
| -rw-r--r-- | audio/hydrogen/patches/patch-aa | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/audio/hydrogen/patches/patch-aa b/audio/hydrogen/patches/patch-aa index ddad7d9c867..89043cf8420 100644 --- a/audio/hydrogen/patches/patch-aa +++ b/audio/hydrogen/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2012/03/26 13:59:40 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2012/06/28 07:32:37 sbd Exp $ diff -ru Sconstruct.orig Sconstruct ---- Sconstruct.orig 2010-09-19 08:36:25.000000000 -0700 -+++ Sconstruct 2011-03-04 17:40:28.000000000 -0800 -@@ -47,7 +47,7 @@ +--- Sconstruct.orig 2010-09-19 15:36:25.000000000 +0000 ++++ Sconstruct +@@ -47,7 +47,7 @@ def get_platform_flags( opts ): env = Environment( options = opts ) @@ -12,22 +12,29 @@ diff -ru Sconstruct.orig Sconstruct if str(env['debug']) == "1": cppflags += ['-Wall', '-g2', '-ggdb', '-O0'] for flag in env["optflags"].split(" "): -@@ -87,6 +87,14 @@ - if sys.platform == 'linux2': - ldflags.append('-lasound') +@@ -73,6 +73,11 @@ def get_platform_flags( opts ): -+ if sys.platform[:6] == 'netbsd': + cppflags.append('-DLADSPA_SUPPORT') + + includes.append( env['prefix'] + "/include" ) -+ ldflags.append('-lossaudio') + ldflags.append( "-L" + env['prefix'] + "/lib" ) + ldflags.append( "-Wl,-R," + env['prefix'] + "/lib" ) + # XXX: this should go in py4.py but i'm not sure where + ldflags.append( "-Wl,-R," + env['prefix'] + "/qt4/lib" ) + + + if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT') +@@ -87,6 +92,9 @@ def get_platform_flags( opts ): + if sys.platform == 'linux2': + ldflags.append('-lasound') + ++ elif sys.platform[:6] == 'netbsd': ++ ldflags.append('-lossaudio') + elif sys.platform == "win32": includes.append( '3rdparty\libsndfile-1_0_17' ) includes.append( 'build\pthreads\include' ) -@@ -269,7 +277,7 @@ +@@ -269,7 +277,7 @@ def get_hydrogen_gui( lib_hydrogen , opt if str(env['lash']) == "1": env.ParseConfig('pkg-config --cflags --libs lash-1.0') |