Date: Sat, 14 Mar 2015 10:35:41 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381257 - in head: . multimedia multimedia/ffmpeg25 multimedia/ffmpeg26 multimedia/ffmpeg26/files Message-ID: <201503141035.t2EAZfe6087881@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Mar 14 10:35:40 2015 New Revision: 381257 URL: https://svnweb.freebsd.org/changeset/ports/381257 QAT: https://qat.redports.org/buildarchive/r381257/ Log: Deprecate multimedia/ffmpeg25 in favor of multimedia/ffmpeg26 Added: head/multimedia/ffmpeg26/ - copied from r381250, head/multimedia/ffmpeg25/ head/multimedia/ffmpeg26/files/ffserver26.in - copied, changed from r381250, head/multimedia/ffmpeg25/files/ffserver25.in Deleted: head/multimedia/ffmpeg25/ head/multimedia/ffmpeg26/files/ffserver25.in Modified: head/MOVED head/multimedia/Makefile head/multimedia/ffmpeg26/Makefile head/multimedia/ffmpeg26/distinfo head/multimedia/ffmpeg26/files/patch-libavcodec-Makefile head/multimedia/ffmpeg26/files/patch-libavformat-udp.c head/multimedia/ffmpeg26/pkg-descr head/multimedia/ffmpeg26/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Mar 14 10:27:54 2015 (r381256) +++ head/MOVED Sat Mar 14 10:35:40 2015 (r381257) @@ -7439,3 +7439,4 @@ math/isabelle||2015-03-01|Has expired: B net/rubygem-openid|net/rubygem-ruby-openid|2015-03-07|Rename to match our rubygems naming devel/p5-Errno||2015-03-09|Errno is part of Perl devel/p5-Class-XSAccessor-Array||2015-03-09|Has been a part of devel/p5-Class-XSAccessor for >5 years. Use that port instead +multimedia/ffmpeg25|multimedia/ffmpeg26|2015-03-14|ffmpeg upstream now points to 2.6.x series Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Sat Mar 14 10:27:54 2015 (r381256) +++ head/multimedia/Makefile Sat Mar 14 10:35:40 2015 (r381257) @@ -58,7 +58,7 @@ SUBDIR += emovix SUBDIR += ffmpeg SUBDIR += ffmpeg0 - SUBDIR += ffmpeg25 + SUBDIR += ffmpeg26 SUBDIR += ffmpeg2theora SUBDIR += ffmpegthumbnailer SUBDIR += flvmeta Modified: head/multimedia/ffmpeg26/Makefile ============================================================================== --- head/multimedia/ffmpeg25/Makefile Sat Mar 14 06:05:49 2015 (r381250) +++ head/multimedia/ffmpeg26/Makefile Sat Mar 14 10:35:40 2015 (r381257) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 2.5.4 -PORTREVISION= 1 +PORTVERSION= 2.6 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ -PKGNAMESUFFIX= 25 +PKGNAMESUFFIX= 26 MAINTAINER= riggs@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server @@ -27,7 +26,7 @@ USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMP USE_PERL5= build WANT_SDL= yes -FFMPEG_SUFFIX= 25 +FFMPEG_SUFFIX= 26 PLIST_SUB+= FFMPEG_SUFFIX="${FFMPEG_SUFFIX}" CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" @@ -269,6 +268,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-avresample \ --enable-pthreads \ --enable-memalign-hack \ + --disable-libmfx \ --disable-libstagefright-h264 \ --disable-libutvideo \ --disable-libsoxr \ Modified: head/multimedia/ffmpeg26/distinfo ============================================================================== --- head/multimedia/ffmpeg25/distinfo Sat Mar 14 06:05:49 2015 (r381250) +++ head/multimedia/ffmpeg26/distinfo Sat Mar 14 10:35:40 2015 (r381257) @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-2.5.4.tar.bz2) = cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286 -SIZE (ffmpeg-2.5.4.tar.bz2) = 7677320 +SHA256 (ffmpeg-2.6.tar.bz2) = 23c38ecc0dd6cae5e9a3c5c2c967b10480dc4f7159d094ade13b0775d1fd4791 +SIZE (ffmpeg-2.6.tar.bz2) = 7799342 Copied and modified: head/multimedia/ffmpeg26/files/ffserver26.in (from r381250, head/multimedia/ffmpeg25/files/ffserver25.in) ============================================================================== --- head/multimedia/ffmpeg25/files/ffserver25.in Sat Mar 14 06:05:49 2015 (r381250, copy source) +++ head/multimedia/ffmpeg26/files/ffserver26.in Sat Mar 14 10:35:40 2015 (r381257) @@ -3,25 +3,25 @@ # $FreeBSD$ # -# PROVIDE: ffserver25 +# PROVIDE: ffserver26 # REQUIRE: NETWORKING # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable ffserver: # -#ffserver25_enable="YES" +#ffserver26_enable="YES" # -ffserver25_enable="${ffserver_enable-NO}" +ffserver26_enable="${ffserver_enable-NO}" . /etc/rc.subr -name=ffserver25 -rcvar=ffserver25_enable +name=ffserver26 +rcvar=ffserver26_enable command="%%PREFIX%%/bin/${name}" command_args="&" -required_files=%%PREFIX%%/etc/ffserver25.conf +required_files=%%PREFIX%%/etc/ffserver26.conf load_rc_config ${name} run_rc_command "$1" Modified: head/multimedia/ffmpeg26/files/patch-libavcodec-Makefile ============================================================================== --- head/multimedia/ffmpeg25/files/patch-libavcodec-Makefile Sat Mar 14 06:05:49 2015 (r381250) +++ head/multimedia/ffmpeg26/files/patch-libavcodec-Makefile Sat Mar 14 10:35:40 2015 (r381257) @@ -1,11 +1,11 @@ ---- libavcodec/Makefile.orig 2012-08-06 10:06:26.000000000 +0200 -+++ libavcodec/Makefile 2012-08-06 10:36:33.478505808 +0200 -@@ -793,7 +793,7 @@ - codec_names.h \ - fft-internal.h \ +--- libavcodec/Makefile.orig 2015-03-06 23:35:30.000000000 +0100 ++++ libavcodec/Makefile 2015-03-14 07:48:50.358320304 +0100 +@@ -858,7 +858,7 @@ + old_codec_ids.h \ tableprint.h \ + tableprint_vlc.h \ - $(ARCH)/vp56_arith.h \ -+ $(FFMPEG_ARCH)/vp56_arith.h \ ++ $(FFMPEG_ARCH)/vp56_arith.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h Modified: head/multimedia/ffmpeg26/files/patch-libavformat-udp.c ============================================================================== --- head/multimedia/ffmpeg25/files/patch-libavformat-udp.c Sat Mar 14 06:05:49 2015 (r381250) +++ head/multimedia/ffmpeg26/files/patch-libavformat-udp.c Sat Mar 14 10:35:40 2015 (r381257) @@ -1,11 +1,11 @@ ---- libavformat/udp.c.orig 2009-05-15 17:24:45.000000000 +0200 -+++ libavformat/udp.c 2009-05-15 17:27:17.000000000 +0200 -@@ -45,6 +45,8 @@ - #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff) - #endif +--- libavformat/udp.c.orig 2015-03-06 23:35:33.000000000 +0100 ++++ libavformat/udp.c 2015-03-14 07:54:42.860295960 +0100 +@@ -71,6 +71,8 @@ + #define UDP_MAX_PKT_SIZE 65536 + #define UDP_HEADER_SIZE 8 +#define IPPROTO_IPV6 41 + - typedef struct { + typedef struct UDPContext { + const AVClass *class; int udp_fd; - int ttl; Modified: head/multimedia/ffmpeg26/pkg-descr ============================================================================== --- head/multimedia/ffmpeg25/pkg-descr Sat Mar 14 06:05:49 2015 (r381250) +++ head/multimedia/ffmpeg26/pkg-descr Sat Mar 14 10:35:40 2015 (r381257) @@ -2,6 +2,6 @@ FFmpeg is a complete, cross-platform sol audio and video. It includes libavcodec - the leading audio/video codec library. -This version is from the 2.0 release branch. +This version is from the 2.6 release branch. WWW: http://ffmpeg.org/ Modified: head/multimedia/ffmpeg26/pkg-plist ============================================================================== --- head/multimedia/ffmpeg25/pkg-plist Sat Mar 14 06:05:49 2015 (r381250) +++ head/multimedia/ffmpeg26/pkg-plist Sat Mar 14 10:35:40 2015 (r381257) @@ -8,6 +8,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavcod include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/dv_profile.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/dxva2.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/old_codec_ids.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/qsv.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vaapi.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vda.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vdpau.h @@ -43,6 +44,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavuti include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/bprint.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/bswap.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/buffer.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/camellia.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/channel_layout.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/common.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/cpu.h @@ -88,6 +90,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavuti include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/timecode.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/timestamp.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/threadmessage.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/twofish.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/version.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/xtea.h include/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc/postprocess.h @@ -99,19 +102,19 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libswsca lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56.13.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56.26.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56.3.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56.4.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5.2.103 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5.11.102 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56.15.102 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56.25.101 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so.2 @@ -119,7 +122,7 @@ lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresampl lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54.15.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54.20.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53 @@ -156,6 +159,7 @@ man/man1/ffprobe%%FFMPEG_SUFFIX%%.1.gz %%DATADIR%%/examples/filtering_video.c %%DATADIR%%/examples/metadata.c %%DATADIR%%/examples/muxing.c +%%DATADIR%%/examples/qsvdec.c %%DATADIR%%/examples/remuxing.c %%DATADIR%%/examples/resampling_audio.c %%DATADIR%%/examples/scaling_video.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503141035.t2EAZfe6087881>