diff options
author | sbd <sbd@pkgsrc.org> | 2012-06-28 07:32:36 +0000 |
---|---|---|
committer | sbd <sbd@pkgsrc.org> | 2012-06-28 07:32:36 +0000 |
commit | 619c2b6b844da8041b7112da8b0268752be77c8f (patch) | |
tree | eaee5c12d5bae6f4f2ebc93917d95158c20af55e | |
parent | 32b0d22345f1e875b4c049905b2fa13986e6d84a (diff) | |
download | pkgsrc-619c2b6b844da8041b7112da8b0268752be77c8f.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).
-rw-r--r-- | audio/hydrogen/Makefile | 18 | ||||
-rw-r--r-- | audio/hydrogen/distinfo | 4 | ||||
-rw-r--r-- | audio/hydrogen/patches/patch-aa | 27 |
3 files changed, 33 insertions, 16 deletions
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index 67fab9534b4..aa7eeed629a 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2012/06/28 03:23:43 sbd Exp $ +# $NetBSD: Makefile,v 1.27 2012/06/28 07:32:36 sbd Exp $ DISTNAME= hydrogen-0.9.4.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/} @@ -19,7 +19,15 @@ BUILD_DEPENDS+= scons>=0.98:../../devel/scons BUILD_DEPENDS+= subversion-base>=1.0:../../devel/subversion-base MAKE_ENV+= QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin -SCONS_ARGS= libarchive=1 jack=0 lrdf=0 alsa=0 QTDIR=${QTDIR} +SCONS_ARGS= libarchive=1 jack=0 lrdf=0 QTDIR=${QTDIR} + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Linux" +SCONS_ARGS+= alsa=1 +.else +SCONS_ARGS+= alsa=0 +.endif do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons DESTDIR=${DESTDIR} prefix=${PREFIX} ${SCONS_ARGS} @@ -27,9 +35,11 @@ do-build: do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons DESTDIR=${DESTDIR} prefix=${PREFIX} ${SCONS_ARGS} install -.include "../../mk/bsd.prefs.mk" .include "../../archivers/libarchive/buildlink3.mk" +.if ${OPSYS} == "Linux" +. include "../../audio/alsa-lib/buildlink3.mk" +.endif .include "../../audio/libsndfile/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo index 5683b00fe57..6d71609ac45 100644 --- a/audio/hydrogen/distinfo +++ b/audio/hydrogen/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2012/03/26 13:59:40 joerg Exp $ +$NetBSD: distinfo,v 1.5 2012/06/28 07:32:36 sbd Exp $ SHA1 (hydrogen-0.9.4.2.tar.gz) = 7b20e40e90c4c1abdda8900109a5983a314719a9 RMD160 (hydrogen-0.9.4.2.tar.gz) = cebf63fb851aa61f149fee75145e59a091cba551 Size (hydrogen-0.9.4.2.tar.gz) = 3860898 bytes -SHA1 (patch-aa) = 764847a51846616b2d62c64b902e9cc0e333b47c +SHA1 (patch-aa) = 7717b25ab65d90d5f185034fc76d1b80a19daf20 SHA1 (patch-ab) = 41cfbf8b72661381e1ecf04cec09e85e0c7e3288 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') |