Date: Wed, 13 Mar 2013 11:19:29 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314072 - in head/audio: mctoolame-decoder mctoolame-encoder Message-ID: <201303131119.r2DBJTC6095840@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Mar 13 11:19:28 2013 New Revision: 314072 URL: http://svnweb.freebsd.org/changeset/ports/314072 Log: Synchronize mctoolame-decoder and mctoolame-encoder. These ports are pretty much mimic each other, so it probably makes sense to merge them into one, or turn into master-slave pair. While here, replace unsafe gets() with fgets(). Modified: head/audio/mctoolame-decoder/Makefile head/audio/mctoolame-decoder/pkg-descr head/audio/mctoolame-encoder/Makefile Modified: head/audio/mctoolame-decoder/Makefile ============================================================================== --- head/audio/mctoolame-decoder/Makefile Wed Mar 13 11:18:58 2013 (r314071) +++ head/audio/mctoolame-decoder/Makefile Wed Mar 13 11:19:28 2013 (r314072) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mctooLAME decoder -# Date created: Thu Mar 27 20:32:42 UTC 2003 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# +# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mctoolame PORTVERSION= 0.1.a @@ -15,51 +11,28 @@ DISTNAME= ${PORTNAME}d-${PORTVERSION:C/\ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A LayerII MPEG Audio decoder which supports multi-channel encoding +COMMENT= MPEG Layer II audio decoder with multi-channel support USE_GMAKE= yes -ALL_TARGET= +ALL_TARGET= # +MAKE_ARGS= CC="${CC}" OPTIM="${CFLAGS}" PLIST_SUB= PKGNAMESUFFIX="${PKGNAMESUFFIX}" -pre-everything:: -.ifndef(WITH_OPTIMIZED_CFLAGS) - @${ECHO_MSG} '>>>' - @${ECHO_MSG} '>>> You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS' - @${ECHO_MSG} ">>> For example, 'make WITH_OPTIMIZED_CFLAGS=yes'" -.endif - @${ECHO_MSG} '>>>' -.ifndef(WITH_PROFILED) - @${ECHO_MSG} ">>> You can enable profiling by defining WITH_PROFILED" -.endif +OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-patch: -.ifndef(WITH_OPTIMIZED_CFLAGS) - @${REINPLACE_CMD} -E \ - -e 's|\$$\(TWEAKS\)||' \ - ${WRKSRC}/Makefile -.endif -.ifndef(WITH_PROFILED) - @${REINPLACE_CMD} -E \ - -e 's|\$$\(PG\)||' \ - ${WRKSRC}/Makefile -.endif - @${REINPLACE_CMD} -E \ - -e 's@\$$\((ARCH|OPTIM|WARNINGS)\)@@g' \ - ${WRKSRC}/Makefile - -post-configure: -# C{C,FLAGS} safeness + @${REINPLACE_CMD} -e 's|$$(ARCH)||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ - -e 's|^(CC[[:space:]]*=).+$$|\1${CC} ${CFLAGS}|' \ - ${WRKSRC}/Makefile + 's|gets *\(([^,)]+)\)|fgets(\1, sizeof(\1), stdin)|' \ + ${WRKSRC}/musicout.c do-install: -.ifndef(NOPORTDOCS) + ${INSTALL_PROGRAM} ${WRKSRC}/mctoolamed ${PREFIX}/bin +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}/html - @${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR}${PKGNAMESUFFIX}/html + ${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR}${PKGNAMESUFFIX}/html .endif - @${INSTALL_PROGRAM} ${WRKSRC}/mctoolamed ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/mctoolame-decoder/pkg-descr ============================================================================== --- head/audio/mctoolame-decoder/pkg-descr Wed Mar 13 11:18:58 2013 (r314071) +++ head/audio/mctoolame-decoder/pkg-descr Wed Mar 13 11:19:28 2013 (r314072) @@ -1,24 +1,22 @@ -[ excerpt from developer's WWW site ] - -A multi-channel MPEG encoder, using the ISO13818 standard and the -dist10 source code. Multi-channel files may have up to 6 defined -channels: Left(L), Right(R), Center(C), Left Surround (LS), Right -Surround (RS) and a Low Frequency Enhancement channel (LFE). - -ISO13818 defines 5 multichannel modes (on top of the normal stereo -mode), each of these modes may have an optional LFE channel: - -3/2: L, R, C, LS, RS -3/1: L, R, C, mono surround -2/2: L, R, LS, RS -2/1: L, R, mono surround -3/0: L, R, C - -The "standard" surround sound encoding of "5.1 channels" is achieved -by using mode 3/2 plus an LFE channel. - -A multi-channel MPEG file should decode OK on any MPEG decoder. If -the decoder doesn't recognize the multi-channel extensions, then -you'll just get a stereo file containing a down mix of the 5 channels. +A multi-channel MPEG encoder, using the ISO13818 standard and the dist10 +source code. Multi-channel files may have up to 6 defined channels: +Left(L), Right(R), Center(C), Left Surround (LS), Right Surround (RS) and +a Low Frequency Enhancement channel (LFE). + +ISO13818 defines 5 multi-channel modes (on top of the normal stereo mode), +each of these modes may have an optional LFE channel: + + 3/2: L, R, C, LS, RS + 3/1: L, R, C, mono surround + 2/2: L, R, LS, RS + 2/1: L, R, mono surround + 3/0: L, R, C + +The "standard" surround sound encoding of "5.1 channels" is achieved by +using mode 3/2 plus an LFE channel. + +A multi-channel MPEG file should decode OK on any MPEG decoder. If the +decoder doesn't recognize the multi-channel extensions, then you'll just +get a stereo file containing a down mix of the 5 channels. WWW: http://mctoolame.sourceforge.net/ Modified: head/audio/mctoolame-encoder/Makefile ============================================================================== --- head/audio/mctoolame-encoder/Makefile Wed Mar 13 11:18:58 2013 (r314071) +++ head/audio/mctoolame-encoder/Makefile Wed Mar 13 11:19:28 2013 (r314072) @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\. EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= MPEG Layer II audio encoder with multi-channel encoding support +COMMENT= MPEG Layer II audio encoder with multi-channel support USE_GMAKE= yes ALL_TARGET= # @@ -24,6 +24,9 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|$$(ARCH)||' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E \ + 's|gets *\(([^,)]+)\)|fgets(\1, sizeof(\1), stdin)|' \ + ${WRKSRC}/config.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mctoolame ${PREFIX}/bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303131119.r2DBJTC6095840>