diff options
| author | pawel <pawel@FreeBSD.org> | 2012-10-30 01:57:38 +0800 |
|---|---|---|
| committer | pawel <pawel@FreeBSD.org> | 2012-10-30 01:57:38 +0800 |
| commit | ece3bec25b989d9c497ffc9bd1da6a2274d89865 (patch) | |
| tree | 70c1da573fe4f9fdaac80d6d2da680c7bc397671 /audio | |
| parent | 203dd5ce915826fdeb066612a719dfd835428fe6 (diff) | |
| download | freebsd-ports-gnome-ece3bec25b989d9c497ffc9bd1da6a2274d89865.tar.gz freebsd-ports-gnome-ece3bec25b989d9c497ffc9bd1da6a2274d89865.tar.zst freebsd-ports-gnome-ece3bec25b989d9c497ffc9bd1da6a2274d89865.zip | |
- Fix build with clang
- Remove ABI version numbers from LID_DEPENDS
- Use proper includes for OptionsNG
PR: ports/172722
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Feature safe: yes
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/linuxsampler/Makefile | 15 | ||||
| -rw-r--r-- | audio/linuxsampler/files/patch-src__common__Pool.h | 11 |
2 files changed, 18 insertions, 8 deletions
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile index 9ccf2592570d..847b057a188b 100644 --- a/audio/linuxsampler/Makefile +++ b/audio/linuxsampler/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://download.linuxsampler.org/packages/ MAINTAINER= ports@FreeBSD.org COMMENT= Modular MIDI sampler -LIB_DEPENDS= gig.10:${PORTSDIR}/audio/libgig +LIB_DEPENDS= gig:${PORTSDIR}/audio/libgig RESTRICTED= no commercial use @@ -23,14 +23,13 @@ DSSI_DESC= Enable DSSI support LV2CORE_DESC= Enable LV2 support USE_BZIP2= yes -USE_GCC= any USE_GNOME= gnomehack USE_SQLITE= 3 +USE_PKGCONFIG= build USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ENV= HAVE_UNIX98=1 USE_LDCONFIG= yes -USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes MAN1= linuxsampler.1 @@ -38,22 +37,22 @@ MAN1= linuxsampler.1 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack .else CONFIGURE_ARGS+=--disable-jack-driver .endif .if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+=--disable-alsa-driver .endif .if ${PORT_OPTIONS:MARTS} -LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts +LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts .else CONFIGURE_ARGS+=--disable-arts-driver .endif @@ -84,4 +83,4 @@ post-patch: post-install: @${TOUCH} ${PREFIX}/lib/linuxsampler/plugins/.keep_me -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/linuxsampler/files/patch-src__common__Pool.h b/audio/linuxsampler/files/patch-src__common__Pool.h new file mode 100644 index 000000000000..540bcccf666b --- /dev/null +++ b/audio/linuxsampler/files/patch-src__common__Pool.h @@ -0,0 +1,11 @@ +--- src/common/Pool.h.orig 2008-12-07 09:18:04.000000000 +0900 ++++ src/common/Pool.h 2012-10-13 04:19:19.000000000 +0900 +@@ -393,7 +393,7 @@ + inline Iterator allocAppend() { + if (pPool->poolIsEmpty()) return RTListBase<T>::begin(); + Iterator element = pPool->alloc(); +- append(element); ++ this->append(element); + #if CONFIG_DEVMODE + element.list = this; + #endif // CONFIG_DEVMODE
\ No newline at end of file |