From owner-svn-ports-head@freebsd.org Fri Jun 16 15:29:11 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC452C31889; Fri, 16 Jun 2017 15:29:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C721845EA; Fri, 16 Jun 2017 15:29:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5GFTAHs024811; Fri, 16 Jun 2017 15:29:10 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5GFTAvA024810; Fri, 16 Jun 2017 15:29:10 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201706161529.v5GFTAvA024810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 16 Jun 2017 15:29:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443710 - head/audio/sox X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jun 2017 15:29:11 -0000 Author: tobik Date: Fri Jun 16 15:29:10 2017 New Revision: 443710 URL: https://svnweb.freebsd.org/changeset/ports/443710 Log: - Add SNDIO option and make enabling the sndio backend explicit. It's currently automatically enabled when sndio is available in the build environment. - Add a OSS default option, so that the OSS backend can be turned off if desired. - Since there are a lot of audio backend options, group them to make the config dialog more readable. - USES=localbase:ldflags PR: 219998 Approved by: mat (mentor), Dan Nelson (maintainer) Differential Revision: https://reviews.freebsd.org/D11227 Modified: head/audio/sox/Makefile Modified: head/audio/sox/Makefile ============================================================================== --- head/audio/sox/Makefile Fri Jun 16 14:59:39 2017 (r443709) +++ head/audio/sox/Makefile Fri Jun 16 15:29:10 2017 (r443710) @@ -3,7 +3,7 @@ PORTNAME= sox PORTVERSION= 14.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF @@ -21,12 +21,14 @@ LIB_DEPENDS= libltdl.so:devel/libltdl CONFLICTS= play-[0-9]* GNU_CONFIGURE= yes -USES= autoreconf pkgconfig libtool +USES= autoreconf libtool localbase:ldflags pkgconfig USE_LDCONFIG= yes -OPTIONS_DEFINE= ALSA AO AMRNB AMRWB FLAC GSM ID3TAG LADSPA LAME \ - MAD OPUS PNG PULSEAUDIO SNDFILE TWOLAME VORBIS WAVPACK -OPTIONS_DEFAULT= AO FLAC GSM ID3TAG MAD OPUS PNG SNDFILE VORBIS +OPTIONS_DEFINE= AMRNB AMRWB FLAC GSM ID3TAG LADSPA LAME MAD OPUS PNG \ + SNDFILE TWOLAME VORBIS WAVPACK +OPTIONS_DEFAULT= AO FLAC GSM ID3TAG MAD OPUS OSS PNG SNDFILE VORBIS +OPTIONS_GROUP= SOUND +OPTIONS_GROUP_SOUND= ALSA AO OSS PULSEAUDIO SNDIO # Default LAME to off for packages so we don't end up RESTRICTED .if !defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= LAME @@ -37,8 +39,7 @@ AMRWB_DESC= AMR Speech Codec (Wideband) GSM_DESC= Use libgsm from ports (else use bundled lib) PNG_DESC= PNG spectrogram creation -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LDFLAGS+= -lpthread CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}" CONFIGURE_ARGS+= --with-gsm @@ -76,11 +77,16 @@ FLAC_LIB_DEPENDS= libFLAC.so:audio/flac MAD_CONFIGURE_WITH= mad MAD_LIB_DEPENDS= libmad.so:audio/libmad +OSS_CONFIGURE_WITH= oss + PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:graphics/png PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + +SNDIO_CONFIGURE_WITH= sndio +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio GSM_LIB_DEPENDS= libgsm.so:audio/gsm