From owner-svn-ports-all@freebsd.org Wed Dec 4 20:10:19 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D8041ADA4D; Wed, 4 Dec 2019 20:10:19 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Sqhq0JwRz4JX1; Wed, 4 Dec 2019 20:10:19 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF1FC58A7; Wed, 4 Dec 2019 20:10:18 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB4KAIt7064853; Wed, 4 Dec 2019 20:10:18 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB4KAIPO064852; Wed, 4 Dec 2019 20:10:18 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201912042010.xB4KAIPO064852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 4 Dec 2019 20:10:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519043 - head/audio/siren X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/audio/siren X-SVN-Commit-Revision: 519043 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2019 20:10:19 -0000 Author: tcberner Date: Wed Dec 4 20:10:18 2019 New Revision: 519043 URL: https://svnweb.freebsd.org/changeset/ports/519043 Log: audio/siren: Use FFmpeg by default, make plugins optional - ffmpeg already handles all the other inputs. PR: 241819 Submitted by: daniel.engberg.lists@pyret.net Modified: head/audio/siren/Makefile head/audio/siren/pkg-plist Modified: head/audio/siren/Makefile ============================================================================== --- head/audio/siren/Makefile Wed Dec 4 18:58:39 2019 (r519042) +++ head/audio/siren/Makefile Wed Dec 4 20:10:18 2019 (r519043) @@ -3,7 +3,7 @@ PORTNAME= siren PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.kariliq.nl/${PORTNAME}/dist/ @@ -13,24 +13,17 @@ COMMENT= Text-based audio player LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE -LIB_DEPENDS= libFLAC.so:audio/flac \ - libid3tag.so:audio/libid3tag \ - libmad.so:audio/libmad \ - libvorbis.so:audio/libvorbis \ - libwavpack.so:audio/wavpack \ - libopusfile.so:audio/opusfile - BROKEN_mips= fails to configure: cannot find program /nxb-bin/usr/bin/cc BROKEN_mips64= fails to configure: cannot find program /nxb-bin/usr/bin/cc -USES= ncurses pkgconfig +USES= localbase:ldflags ncurses pkgconfig HAS_CONFIGURE= yes USE_CSTD= c99 -OPTIONS_DEFINE= FFMPEG MPG123 +OPTIONS_DEFINE= FAAD FFMPEG FLAC MAD MPG123 OPUS SNDFILE VORBIS WAVPACK OPTIONS_MULTI= SOUND OPTIONS_MULTI_SOUND= OSS PULSEAUDIO SNDIO -OPTIONS_DEFAULT= OSS +OPTIONS_DEFAULT= FFMPEG OSS OSS_CONFIGURE_ON= oss=yes OSS_CONFIGURE_OFF= oss=no PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio @@ -40,20 +33,41 @@ SNDIO_CONFIGURE_ON= sndio=yes SNDIO_CONFIGURE_OFF= sndio=no SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_USES= localbase:ldflags +FAAD_CONFIGURE_ON= aac=yes +FAAD_CONFIGURE_OFF= aac=no +FAAD_LIB_DEPENDS= libfaad.so:audio/faad \ + libmp4v2.so:multimedia/mp4v2 FFMPEG_CONFIGURE_ON= ffmpeg=yes FFMPEG_CONFIGURE_OFF= ffmpeg=no FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg +FLAC_CONFIGURE_ON= flac=yes +FLAC_CONFIGURE_OFF= flac=no +FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +MAD_CONFIGURE_ON= mad=yes +MAD_CONFIGURE_OFF= mad=no +MAD_LIB_DEPENDS= libmad.so:audio/libmad \ + libid3tag.so:audio/libid3tag MPG123_CONFIGURE_ON= mpg123=yes MPG123_CONFIGURE_OFF= mpg123=no MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 +OPUS_CONFIGURE_ON= opus=yes +OPUS_CONFIGURE_OFF= opus=no +OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile +SNDFILE_CONFIGURE_ON= sndfile=yes +SNDFILE_CONFIGURE_OFF= sndfile=no +SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile +VORBIS_CONFIGURE_ON= vorbis=yes +VORBIS_CONFIGURE_OFF= vorbis=no +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis +WAVPACK_CONFIGURE_ON= wavpack=yes +WAVPACK_CONFIGURE_OFF= wavpack=no +WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack OPTIONS_SUB= yes -CONFIGURE_ARGS= sndfile=no \ - alsa=no \ +CONFIGURE_ARGS= alsa=no \ ao=no \ sun=no \ - portaudio=no \ - aac=no + portaudio=no post-patch: @${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure Modified: head/audio/siren/pkg-plist ============================================================================== --- head/audio/siren/pkg-plist Wed Dec 4 18:58:39 2019 (r519042) +++ head/audio/siren/pkg-plist Wed Dec 4 20:10:18 2019 (r519043) @@ -1,12 +1,14 @@ bin/siren -lib/siren/ip/flac.so -lib/siren/ip/mad.so -lib/siren/ip/opus.so -lib/siren/ip/vorbis.so -lib/siren/ip/wavpack.so +%%FAAD%%lib/siren/ip/aac.so %%FFMPEG%%lib/siren/ip/ffmpeg.so +%%FLAC%%lib/siren/ip/flac.so +%%MAD%%lib/siren/ip/mad.so %%MPG123%%lib/siren/ip/mpg123.so +%%OPUS%%lib/siren/ip/opus.so %%OSS%%lib/siren/op/oss.so %%PULSEAUDIO%%lib/siren/op/pulse.so +%%SNDFILE%%lib/siren/ip/sndfile.so %%SNDIO%%lib/siren/op/sndio.so +%%VORBIS%%lib/siren/ip/vorbis.so +%%WAVPACK%%lib/siren/ip/wavpack.so man/man1/siren.1.gz