Date: Sat, 25 Nov 2017 01:34:25 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454861 - in head/audio/abcde: . files Message-ID: <201711250134.vAP1YP9k036666@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Sat Nov 25 01:34:24 2017 New Revision: 454861 URL: https://svnweb.freebsd.org/changeset/ports/454861 Log: audio/abcde: Add MusicBrainz support - Make MusicBrainz support an on-by-default option - Add pkg-plist file to allow @sample to be clearly used for the config file - Include patch from upstream bug#54 to fix calculating MusicBrainz discid [1] [1] https://abcde.einval.com/bugzilla/show_bug.cgi?id=54 PR: 223346 Approved by: tz (maintainer timeout) Added: head/audio/abcde/files/patch-abcde (contents, props changed) head/audio/abcde/pkg-plist (contents, props changed) Modified: head/audio/abcde/Makefile Modified: head/audio/abcde/Makefile ============================================================================== --- head/audio/abcde/Makefile Sat Nov 25 01:25:36 2017 (r454860) +++ head/audio/abcde/Makefile Sat Nov 25 01:34:24 2017 (r454861) @@ -24,23 +24,26 @@ NO_ARCH= yes NO_BUILD= yes USES= python:run shebangfix -SHEBANG_FILES= abcde cddb-tool +SHEBANG_FILES= abcde abcde-musicbrainz-tool cddb-tool SUB_FILES= pkg-message -PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf.sample \ - man/man1/abcde.1.gz man/man1/cddb-tool.1.gz - OPTIONS_GROUP= CODEC RIPPER OPTIONS_GROUP_CODEC= AAC FLAC MPP OPUS SPEEX OPTIONS_GROUP_RIPPER= CDDA2WAV DAGRAB -OPTIONS_DEFINE= NORMALIZE REPLAYGAIN +OPTIONS_DEFINE= MUSICBRAINZ NORMALIZE REPLAYGAIN +OPTIONS_DEFAULT= MUSICBRAINZ AAC_RUN_DEPENDS= faac:audio/faac CDDA2WAV_RUN_DEPENDS= cdda2wav:sysutils/cdrtools DAGRAB_RUN_DEPENDS= dagrab:audio/dagrab FLAC_RUN_DEPENDS= flac:audio/flac MPP_RUN_DEPENDS= mpcenc:audio/musepack +MUSICBRAINZ_DESC= Enable MusicBrainz DiscID support +MUSICBRAINZ_USES= perl5 +MUSICBRAINZ_USE_PERL5= run +MUSICBRAINZ_RUN_DEPENDS=p5-MusicBrainz-DiscID>=0:audio/p5-MusicBrainz-DiscID \ + p5-WebService-MusicBrainz0>=0:www/p5-WebService-MusicBrainz0 NORMALIZE_DESC= Enable normalize support NORMALIZE_RUN_DEPENDS= normalize:audio/normalize OPUS_RUN_DEPENDS= opusenc:audio/opus-tools @@ -49,9 +52,6 @@ REPLAYGAIN_RUN_DEPENDS= mp3gain:audio/mp3gain \ vorbisgain:audio/vorbisgain SPEEX_RUN_DEPENDS= speexenc:audio/speex -post-extract: - @${LN} -sf abcde.conf ${WRKSRC}/abcde.conf.sample - post-patch: @${REINPLACE_CMD} -e \ 's|\([[:space:]]\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \ @@ -63,9 +63,12 @@ post-patch: do-install: (cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde cddb-tool \ ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf.sample \ - ${STAGEDIR}${PREFIX}/etc) + (cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf \ + ${STAGEDIR}${PREFIX}/etc/abcde.conf.sample) (cd ${WRKSRC} && ${INSTALL_MAN} abcde.1 cddb-tool.1 \ ${STAGEDIR}${MANPREFIX}/man/man1) +post-install-MUSICBRAINZ-on: + (cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde-musicbrainz-tool \ + ${STAGEDIR}${PREFIX}/bin) .include <bsd.port.mk> Added: head/audio/abcde/files/patch-abcde ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/abcde/files/patch-abcde Sat Nov 25 01:34:24 2017 (r454861) @@ -0,0 +1,14 @@ +--- abcde.orig 2017-01-18 13:56:14 UTC ++++ abcde +@@ -2012,7 +2012,10 @@ do_discid () + + LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)" + OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" +- makeids ++ case "$CDDBMETHOD" in ++ cddb) TRACKINFO=$($CDDISCID "$CDROM") ;; ++ musicbrainz) TRACKINFO=$($MUSICBRAINZ --command id --device "$CDROM") ;; ++ esac + ;; + *) + case "$CDDBMETHOD" in Added: head/audio/abcde/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/abcde/pkg-plist Sat Nov 25 01:34:24 2017 (r454861) @@ -0,0 +1,6 @@ +bin/abcde +bin/abcde-musicbrainz-tool +bin/cddb-tool +@sample etc/abcde.conf.sample +man/man1/abcde.1.gz +man/man1/cddb-tool.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711250134.vAP1YP9k036666>