sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with clang

Browse source 
- 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
This commit is contained in:
Pawel Pekala 2012-10-29 17:57:38 +00:00
parent 8f9eac46fe
commit ff9a188681
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=306626
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
audio/linuxsampler/Makefile
View file

@ -10,7 +10,7 @@ MASTER_SITES= http://download.linuxsampler.org/packages/
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Modular MIDI sampler COMMENT= Modular MIDI sampler
LIB_DEPENDS= gig.10:${PORTSDIR}/audio/libgig LIB_DEPENDS= gig:${PORTSDIR}/audio/libgig
RESTRICTED= no commercial use RESTRICTED= no commercial use
@ -23,14 +23,13 @@ DSSI_DESC= Enable DSSI support
LV2CORE_DESC= Enable LV2 support LV2CORE_DESC= Enable LV2 support
USE_BZIP2= yes USE_BZIP2= yes
USE_GCC= any
USE_GNOME= gnomehack USE_GNOME= gnomehack
USE_SQLITE= 3 USE_SQLITE= 3
USE_PKGCONFIG= build
USE_GMAKE= yes USE_GMAKE= yes
USE_AUTOTOOLS= libtool USE_AUTOTOOLS= libtool
CONFIGURE_ENV= HAVE_UNIX98=1 CONFIGURE_ENV= HAVE_UNIX98=1
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_PKGCONFIG= build
MAKE_JOBS_SAFE= yes MAKE_JOBS_SAFE= yes
MAN1= linuxsampler.1 MAN1= linuxsampler.1
@ -38,22 +37,22 @@ MAN1= linuxsampler.1
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MJACK} .if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
.else .else
CONFIGURE_ARGS+=--disable-jack-driver CONFIGURE_ARGS+=--disable-jack-driver
.endif .endif
.if ${PORT_OPTIONS:MALSA} .if ${PORT_OPTIONS:MALSA}
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
.else .else
CONFIGURE_ARGS+=--disable-alsa-driver CONFIGURE_ARGS+=--disable-alsa-driver
.endif .endif
.if ${PORT_OPTIONS:MARTS} .if ${PORT_OPTIONS:MARTS}
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts
.else .else
CONFIGURE_ARGS+=--disable-arts-driver CONFIGURE_ARGS+=--disable-arts-driver
.endif .endif
@ -84,4 +83,4 @@ post-patch:
post-install: post-install:
@${TOUCH} ${PREFIX}/lib/linuxsampler/plugins/.keep_me @${TOUCH} ${PREFIX}/lib/linuxsampler/plugins/.keep_me
.include <bsd.port.post.mk> .include <bsd.port.mk>

11
audio/linuxsampler/files/patch-src__common__Pool.h Normal file
View file

@ -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