From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 15:45:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6CFB622; Fri, 27 Jun 2014 15:45:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C2B4B2D37; Fri, 27 Jun 2014 15:45:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RFjNtN049515; Fri, 27 Jun 2014 15:45:23 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RFjMwb049510; Fri, 27 Jun 2014 15:45:22 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201406271545.s5RFjMwb049510@svn.freebsd.org> From: William Grzybowski Date: Fri, 27 Jun 2014 15:45:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359554 - in head/multimedia: bino ffmpeg ffmpeg/files mlt X-SVN-Group: ports-head 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.18 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: Fri, 27 Jun 2014 15:45:23 -0000 Author: wg Date: Fri Jun 27 15:45:22 2014 New Revision: 359554 URL: http://svnweb.freebsd.org/changeset/ports/359554 QAT: https://qat.redports.org/buildarchive/r359554/ Log: multimedia/ffmpeg: update to 2.2.4 - Bump dependent ports of libavutil - USES tar:bzip2 - Use @sample in pkg-plist Deleted: head/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c Modified: head/multimedia/bino/Makefile head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg/distinfo head/multimedia/ffmpeg/pkg-plist head/multimedia/mlt/Makefile Modified: head/multimedia/bino/Makefile ============================================================================== --- head/multimedia/bino/Makefile Fri Jun 27 15:43:38 2014 (r359553) +++ head/multimedia/bino/Makefile Fri Jun 27 15:45:22 2014 (r359554) @@ -3,6 +3,7 @@ PORTNAME= bino PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.savannah.nongnu.org/releases/bino/ http://levsha.me/ports/distfiles/ Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Fri Jun 27 15:43:38 2014 (r359553) +++ head/multimedia/ffmpeg/Makefile Fri Jun 27 15:45:22 2014 (r359554) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 2.1.1 -PORTREVISION= 4 +PORTVERSION= 2.2.4 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -20,9 +19,8 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/ya HAS_CONFIGURE= yes CONFIGURE_LOG= config.err -USES= gmake pkgconfig perl5 +USES= gmake pkgconfig perl5 tar:bzip2 USE_PERL5= build -USE_BZIP2= yes WANT_SDL= yes OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \ @@ -376,7 +374,7 @@ post-install: .endfor .if ${PORT_OPTIONS:MFFSERVER} ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ - ${STAGEDIR}${PREFIX}/etc/ffserver.conf-dist + ${STAGEDIR}${PREFIX}/etc/ffserver.conf.sample .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOC_FILES} Modified: head/multimedia/ffmpeg/distinfo ============================================================================== --- head/multimedia/ffmpeg/distinfo Fri Jun 27 15:43:38 2014 (r359553) +++ head/multimedia/ffmpeg/distinfo Fri Jun 27 15:45:22 2014 (r359554) @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-2.1.1.tar.bz2) = bef95e5b9aac45adec7ef434537504a63b4bbc22a8ce6a96a68e19c5efbadae2 -SIZE (ffmpeg-2.1.1.tar.bz2) = 6641619 +SHA256 (ffmpeg-2.2.4.tar.bz2) = ff18e584d5daca2291f598389c990a0f4ec31c74647d923e73839c336b80b73f +SIZE (ffmpeg-2.2.4.tar.bz2) = 7023865 Modified: head/multimedia/ffmpeg/pkg-plist ============================================================================== --- head/multimedia/ffmpeg/pkg-plist Fri Jun 27 15:43:38 2014 (r359553) +++ head/multimedia/ffmpeg/pkg-plist Fri Jun 27 15:45:22 2014 (r359554) @@ -1,9 +1,7 @@ bin/ffmpeg bin/ffprobe %%FFSERVER%%bin/ffserver -%%FFSERVER%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi -%%FFSERVER%%etc/ffserver.conf-dist -%%FFSERVER%%@exec [ -f %B/ffserver.conf ] || cp %B/%f %B/ffserver.conf +%%FFSERVER%%@sample etc/ffserver.conf.sample include/libavcodec/avcodec.h include/libavcodec/avfft.h include/libavcodec/dxva2.h @@ -46,8 +44,10 @@ include/libavutil/common.h include/libavutil/cpu.h include/libavutil/crc.h include/libavutil/dict.h +include/libavutil/downmix_info.h include/libavutil/error.h include/libavutil/eval.h +include/libavutil/ffversion.h include/libavutil/fifo.h include/libavutil/file.h include/libavutil/frame.h @@ -59,6 +59,7 @@ include/libavutil/intreadwrite.h include/libavutil/lfg.h include/libavutil/log.h include/libavutil/lzo.h +include/libavutil/macros.h include/libavutil/mathematics.h include/libavutil/md5.h include/libavutil/mem.h @@ -74,6 +75,7 @@ include/libavutil/ripemd.h include/libavutil/samplefmt.h include/libavutil/sha.h include/libavutil/sha512.h +include/libavutil/stereo3d.h include/libavutil/time.h include/libavutil/timecode.h include/libavutil/timestamp.h @@ -88,27 +90,27 @@ include/libswscale/version.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.55 -lib/libavcodec.so.55.39.101 +lib/libavcodec.so.55.52.102 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.55 -lib/libavdevice.so.55.5.100 +lib/libavdevice.so.55.10.100 lib/libavfilter.a lib/libavfilter.so -lib/libavfilter.so.3 -lib/libavfilter.so.3.90.100 +lib/libavfilter.so.4 +lib/libavfilter.so.4.2.100 lib/libavformat.a lib/libavformat.so lib/libavformat.so.55 -lib/libavformat.so.55.19.104 +lib/libavformat.so.55.33.100 lib/libavresample.a lib/libavresample.so lib/libavresample.so.1 -lib/libavresample.so.1.1.0 +lib/libavresample.so.1.2.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.52 -lib/libavutil.so.52.48.101 +lib/libavutil.so.52.66.100 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.52 @@ -116,11 +118,11 @@ lib/libpostproc.so.52.3.100 lib/libswresample.a lib/libswresample.so lib/libswresample.so.0 -lib/libswresample.so.0.17.104 +lib/libswresample.so.0.18.100 lib/libswscale.a lib/libswscale.so lib/libswscale.so.2 -lib/libswscale.so.2.5.101 +lib/libswscale.so.2.5.102 libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc @@ -134,14 +136,18 @@ man/man1/ffmpeg.1.gz man/man1/ffprobe.1.gz %%DATADIR%%/examples/Makefile %%DATADIR%%/examples/README -%%DATADIR%%/examples/decoding_encoding.c -%%DATADIR%%/examples/demuxing.c +%%DATADIR%%/examples/avcodec.c +%%DATADIR%%/examples/avio_reading.c +%%DATADIR%%/examples/demuxing_decoding.c +%%DATADIR%%/examples/filter_audio.c %%DATADIR%%/examples/filtering_audio.c %%DATADIR%%/examples/filtering_video.c %%DATADIR%%/examples/metadata.c %%DATADIR%%/examples/muxing.c +%%DATADIR%%/examples/remuxing.c %%DATADIR%%/examples/resampling_audio.c %%DATADIR%%/examples/scaling_video.c +%%DATADIR%%/examples/transcode_aac.c %%DATADIR%%/ffprobe.xsd %%DATADIR%%/libvpx-1080p.ffpreset %%DATADIR%%/libvpx-1080p50_60.ffpreset Modified: head/multimedia/mlt/Makefile ============================================================================== --- head/multimedia/mlt/Makefile Fri Jun 27 15:43:38 2014 (r359553) +++ head/multimedia/mlt/Makefile Fri Jun 27 15:45:22 2014 (r359554) @@ -2,7 +2,7 @@ PORTNAME= mlt PORTVERSION= 0.9.0 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}