svn commit: r385177 - in head: audio/dvda-author audio/sox audio/sox/files multimedia/imagination multimedia/mlt

[Thomas Zander]

Author: riggs
Date: Sat May  2 14:02:54 2015
New Revision: 385177
URL: https://svnweb.freebsd.org/changeset/ports/385177

Log:
  - Update to upstream version 14.4.2
  - Bump PORTREVISION on lib-dependent ports
  
  PR:		199567
  Submitted by:	takefu at airport.fm
  Approved by:	dnelson at allantgroup.com (maintainer)

Deleted:
  head/audio/sox/files/
Modified:
  head/audio/dvda-author/Makefile
  head/audio/sox/Makefile
  head/audio/sox/distinfo
  head/audio/sox/pkg-plist
  head/multimedia/imagination/Makefile
  head/multimedia/mlt/Makefile

Modified: head/audio/dvda-author/Makefile
==============================================================================
--- head/audio/dvda-author/Makefile	Sat May  2 12:12:03 2015	(r385176)
+++ head/audio/dvda-author/Makefile	Sat May  2 14:02:54 2015	(r385177)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvda-author
 PORTVERSION=	09.05
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/dvd-audio/${PORTNAME}-core/${PORTNAME}-${PORTVERSION}-core

Modified: head/audio/sox/Makefile
==============================================================================
--- head/audio/sox/Makefile	Sat May  2 12:12:03 2015	(r385176)
+++ head/audio/sox/Makefile	Sat May  2 14:02:54 2015	(r385177)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sox
-PORTVERSION=	14.4.1
-PORTREVISION=	7
+PORTVERSION=	14.4.2
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -21,9 +20,9 @@ GNU_CONFIGURE=	yes
 USES=		autoreconf pkgconfig libtool
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	ALSA AO AMRNB AMRWB FFMPEG FLAC GSM ID3TAG LADSPA LAME \
-		MAD PNG PULSEAUDIO SNDFILE VORBIS WAVPACK
-OPTIONS_DEFAULT=	AO FFMPEG FLAC GSM ID3TAG MAD PNG SNDFILE VORBIS
+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
 # Default LAME to off for packages so we don't end up RESTRICTED
 .if !defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	LAME
@@ -37,8 +36,9 @@ PNG_DESC=	PNG spectrogram creation
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
-CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}" \
-			--with-gsm
+CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
+CONFIGURE_ARGS+=	--with-gsm
+CONFIGURE_ARGS+=	--disable-stack-protector
 
 ALSA_CONFIGURE_WITH=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
@@ -53,9 +53,6 @@ AMRNB_LIB_DEPENDS=	libamrnb.so:${PORTSDI
 AMRWB_CONFIGURE_WITH=	amrwb
 AMRWB_LIB_DEPENDS=	libamrwb.so:${PORTSDIR}/audio/libamrwb
 
-FFMPEG_CONFIGURE_WITH=	ffmpeg
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-
 VORBIS_CONFIGURE_WITH=	oggvorbis
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
@@ -89,6 +86,12 @@ ID3TAG_LIB_DEPENDS=	libid3tag.so:${PORTS
 WAVPACK_CONFIGURE_WITH=	wavpack
 WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
 
+TWOLAME_CONFIGURE_WITH=	twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+
+OPUS_CONFIGURE_WITH=	opus
+OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile
+
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MGSM}
@@ -98,9 +101,6 @@ CONFIGURE_ENV+=	ac_cv_header_gsm_h=no ac
 		ac_cv_lib_gsm_gsm_create=no
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
-		-e 's/ CodecID/ AVCodecID/g' \
-		${WRKSRC}/src/ffmpeg.c
+INSTALL_TARGET=		install-strip
 
 .include <bsd.port.mk>

Modified: head/audio/sox/distinfo
==============================================================================
--- head/audio/sox/distinfo	Sat May  2 12:12:03 2015	(r385176)
+++ head/audio/sox/distinfo	Sat May  2 14:02:54 2015	(r385177)
@@ -1,2 +1,2 @@
-SHA256 (sox-14.4.1.tar.gz) = 9a8c2c6fe51e608da346a157e111508a957af9e3ecf3de26781d36e9a67fa89b
-SIZE (sox-14.4.1.tar.gz) = 1111653
+SHA256 (sox-14.4.2.tar.gz) = b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c
+SIZE (sox-14.4.2.tar.gz) = 1134299

Modified: head/audio/sox/pkg-plist
==============================================================================
--- head/audio/sox/pkg-plist	Sat May  2 12:12:03 2015	(r385176)
+++ head/audio/sox/pkg-plist	Sat May  2 14:02:54 2015	(r385177)
@@ -5,8 +5,8 @@ bin/soxi
 include/sox.h
 lib/libsox.a
 lib/libsox.so
-lib/libsox.so.2
-lib/libsox.so.2.0.1
+lib/libsox.so.3
+lib/libsox.so.3.0.0
 man/man1/play.1.gz
 man/man1/rec.1.gz
 man/man1/sox.1.gz

Modified: head/multimedia/imagination/Makefile
==============================================================================
--- head/multimedia/imagination/Makefile	Sat May  2 12:12:03 2015	(r385176)
+++ head/multimedia/imagination/Makefile	Sat May  2 14:02:54 2015	(r385177)
@@ -3,7 +3,7 @@
 
 PORTNAME=	imagination
 PORTVERSION=	3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 

Modified: head/multimedia/mlt/Makefile
==============================================================================
--- head/multimedia/mlt/Makefile	Sat May  2 12:12:03 2015	(r385176)
+++ head/multimedia/mlt/Makefile	Sat May  2 14:02:54 2015	(r385177)
@@ -2,7 +2,7 @@
 
 PORTNAME=	mlt
 PORTVERSION=	0.9.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}