Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Dec 2010 20:44:07 GMT
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/153187: audio/jack: make ALSA support optional
Message-ID:  <201012152044.oBFKi75x023734@red.freebsd.org>
Resent-Message-ID: <201012152050.oBFKoAsL065605@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         153187
>Category:       ports
>Synopsis:       audio/jack: make ALSA support optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 15 20:50:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 8.2-PRERELEASE amd64
>Organization:
>Environment:
FreeBSD luna.dio.ru 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Nov 30 22:58:45 MSK 2010     root@luna.dio.ru:/usr/obj/usr/freebsd/8/src/sys/LUNA  amd64
>Description:
make ALSA support optional and off by default
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/jack/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	6 Dec 2010 03:49:34 -0000	1.57
+++ Makefile	15 Dec 2010 19:55:10 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jackit
 PORTVERSION=	0.118.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://jackaudio.org/downloads/
 DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
@@ -18,7 +18,6 @@
 LIB_DEPENDS=	portaudio.0:${PORTSDIR}/audio/portaudio \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		asound.2:${PORTSDIR}/audio/alsa-lib \
 		celt.0:${PORTSDIR}/audio/celt
 
 LATEST_LINK=	jack
@@ -34,6 +33,8 @@
 
 MAN1=		jackd.1 jackstart.1
 
+OPTIONS=	ALSA "Build with ALSA compatibility library" off
+
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
@@ -46,6 +47,14 @@
 LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
 .endif
 
+.if defined(WITH_ALSA)
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+PLIST_SUB+=	ALSA=""
+.else
+CONFIGURE_ARGS+=--disable-alsa
+PLIST_SUB+=	ALSA="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
 		${WRKSRC}/configure
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/jack/pkg-plist,v
retrieving revision 1.23
diff -u -r1.23 pkg-plist
--- pkg-plist	6 Dec 2010 03:49:34 -0000	1.23
+++ pkg-plist	15 Dec 2010 19:55:34 -0000
@@ -1,5 +1,5 @@
-bin/alsa_in
-bin/alsa_out
+%%ALSA%%bin/alsa_in
+%%ALSA%%bin/alsa_out
 bin/jack_alias
 bin/jack_bufsize
 bin/jack_connect
@@ -36,8 +36,8 @@
 lib/jack/inprocess.so
 lib/jack/intime.la
 lib/jack/intime.so
-lib/jack/jack_alsa.la
-lib/jack/jack_alsa.so
+%%ALSA%%lib/jack/jack_alsa.la
+%%ALSA%%lib/jack/jack_alsa.so
 lib/jack/jack_dummy.la
 lib/jack/jack_dummy.so
 lib/jack/jack_net.la


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012152044.oBFKi75x023734>