Date: Tue, 16 Oct 2012 02:55:48 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172722: audio/linuxsampler: Fix build with clang Message-ID: <20121016025548.13f828b0752996ec2089940d@yahoo.com> Resent-Message-ID: <201210151810.q9FIA2as043600@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172722
>Category: ports
>Synopsis: audio/linuxsampler: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 15 18:10:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
New file:
files/patch-src__common__Pool.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/linuxsampler/Makefile audio/linuxsampler/Makefile
--- /usr/ports/audio/linuxsampler/Makefile 2012-10-10 07:12:13.000000000 +0900
+++ audio/linuxsampler/Makefile 2012-10-13 04:24:07.000000000 +0900
@@ -10,7 +10,7 @@
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 @@
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 @@
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-install:
@${TOUCH} ${PREFIX}/lib/linuxsampler/plugins/.keep_me
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/audio/linuxsampler/files/patch-src__common__Pool.h audio/linuxsampler/files/patch-src__common__Pool.h
--- /usr/ports/audio/linuxsampler/files/patch-src__common__Pool.h 1970-01-01 09:00:00.000000000 +0900
+++ audio/linuxsampler/files/patch-src__common__Pool.h 2012-10-13 04:19:56.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121016025548.13f828b0752996ec2089940d>