Date: Mon, 29 Oct 2012 17:57:38 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306626 - in head/audio/linuxsampler: . files Message-ID: <201210291757.q9THvcdR013691@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Oct 29 17:57:38 2012 New Revision: 306626 URL: http://svn.freebsd.org/changeset/ports/306626 Log: - 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 Added: head/audio/linuxsampler/files/patch-src__common__Pool.h (contents, props changed) Modified: head/audio/linuxsampler/Makefile Modified: head/audio/linuxsampler/Makefile ============================================================================== --- head/audio/linuxsampler/Makefile Mon Oct 29 17:49:54 2012 (r306625) +++ head/audio/linuxsampler/Makefile Mon Oct 29 17:57:38 2012 (r306626) @@ -10,7 +10,7 @@ MASTER_SITES= http://download.linuxsampl 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> Added: head/audio/linuxsampler/files/patch-src__common__Pool.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/linuxsampler/files/patch-src__common__Pool.h Mon Oct 29 17:57:38 2012 (r306626) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210291757.q9THvcdR013691>