Deprecate multimedia/ffmpeg25 in favor of multimedia/ffmpeg26

18 files changed, 40 insertions, 36 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index b5efd220d860..c4df3c77f71d 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -58,7 +58,7 @@
     SUBDIR += emovix
     SUBDIR += ffmpeg
     SUBDIR += ffmpeg0
-    SUBDIR += ffmpeg25
+    SUBDIR += ffmpeg26
     SUBDIR += ffmpeg2theora
     SUBDIR += ffmpegthumbnailer
     SUBDIR += flvmeta
diff --git a/multimedia/ffmpeg25/distinfo b/multimedia/ffmpeg25/distinfo
deleted file mode 100644
index 67961d096dd7..000000000000
--- a/multimedia/ffmpeg25/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ffmpeg-2.5.4.tar.bz2) = cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286
-SIZE (ffmpeg-2.5.4.tar.bz2) = 7677320
diff --git a/multimedia/ffmpeg25/files/patch-libavformat-udp.c b/multimedia/ffmpeg25/files/patch-libavformat-udp.c
deleted file mode 100644
index 0042372ae7b5..000000000000
--- a/multimedia/ffmpeg25/files/patch-libavformat-udp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
-+#define IPPROTO_IPV6 41
-+
- typedef struct {
-     int udp_fd;
-     int ttl;
diff --git a/multimedia/ffmpeg25/Makefile b/multimedia/ffmpeg26/Makefile
index 6eb482c19796..93400bdb7c75 100644
--- a/multimedia/ffmpeg25/Makefile
+++ b/multimedia/ffmpeg26/Makefile
@@ -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${FFMPEG_SUFFIX}
 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 \
diff --git a/multimedia/ffmpeg26/distinfo b/multimedia/ffmpeg26/distinfo
new file mode 100644
index 000000000000..34710fb02388
--- /dev/null
+++ b/multimedia/ffmpeg26/distinfo
@@ -0,0 +1,2 @@
+SHA256 (ffmpeg-2.6.tar.bz2) = 23c38ecc0dd6cae5e9a3c5c2c967b10480dc4f7159d094ade13b0775d1fd4791
+SIZE (ffmpeg-2.6.tar.bz2) = 7799342
diff --git a/multimedia/ffmpeg25/files/ffserver25.in b/multimedia/ffmpeg26/files/ffserver26.in
index 2465fca6b38e..929591744e2c 100644
--- a/multimedia/ffmpeg25/files/ffserver25.in
+++ b/multimedia/ffmpeg26/files/ffserver26.in
@@ -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"
diff --git a/multimedia/ffmpeg25/files/patch-Makefile b/multimedia/ffmpeg26/files/patch-Makefile
index c4b66b0d491d..c4b66b0d491d 100644
--- a/multimedia/ffmpeg25/files/patch-Makefile
+++ b/multimedia/ffmpeg26/files/patch-Makefile
diff --git a/multimedia/ffmpeg25/files/patch-configure b/multimedia/ffmpeg26/files/patch-configure
index a06fd5583612..a06fd5583612 100644
--- a/multimedia/ffmpeg25/files/patch-configure
+++ b/multimedia/ffmpeg26/files/patch-configure
diff --git a/multimedia/ffmpeg25/files/patch-doc-Makefile b/multimedia/ffmpeg26/files/patch-doc-Makefile
index 4b702775a360..4b702775a360 100644
--- a/multimedia/ffmpeg25/files/patch-doc-Makefile
+++ b/multimedia/ffmpeg26/files/patch-doc-Makefile
diff --git a/multimedia/ffmpeg25/files/patch-libavcodec-Makefile b/multimedia/ffmpeg26/files/patch-libavcodec-Makefile
index 0e64d96791f5..3078fdc4f393 100644
--- a/multimedia/ffmpeg25/files/patch-libavcodec-Makefile
+++ b/multimedia/ffmpeg26/files/patch-libavcodec-Makefile
@@ -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
diff --git a/multimedia/ffmpeg25/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg26/files/patch-libavdevice-bktr.c
index c64d1826eb91..c64d1826eb91 100644
--- a/multimedia/ffmpeg25/files/patch-libavdevice-bktr.c
+++ b/multimedia/ffmpeg26/files/patch-libavdevice-bktr.c
diff --git a/multimedia/ffmpeg25/files/patch-libavdevice-oss_audio.c b/multimedia/ffmpeg26/files/patch-libavdevice-oss_audio.c
index d3428dd5cefc..d3428dd5cefc 100644
--- a/multimedia/ffmpeg25/files/patch-libavdevice-oss_audio.c
+++ b/multimedia/ffmpeg26/files/patch-libavdevice-oss_audio.c
diff --git a/multimedia/ffmpeg25/files/patch-libavfilter-vf_libopencv.c b/multimedia/ffmpeg26/files/patch-libavfilter-vf_libopencv.c
index ded99fa94ac4..ded99fa94ac4 100644
--- a/multimedia/ffmpeg25/files/patch-libavfilter-vf_libopencv.c
+++ b/multimedia/ffmpeg26/files/patch-libavfilter-vf_libopencv.c
diff --git a/multimedia/ffmpeg26/files/patch-libavformat-udp.c b/multimedia/ffmpeg26/files/patch-libavformat-udp.c
new file mode 100644
index 000000000000..4ef820b158c2
--- /dev/null
+++ b/multimedia/ffmpeg26/files/patch-libavformat-udp.c
@@ -0,0 +1,11 @@
+--- 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 UDPContext {
+     const AVClass *class;
+     int udp_fd;
diff --git a/multimedia/ffmpeg25/files/patch-libavutil-common.h b/multimedia/ffmpeg26/files/patch-libavutil-common.h
index e4a38622d92e..e4a38622d92e 100644
--- a/multimedia/ffmpeg25/files/patch-libavutil-common.h
+++ b/multimedia/ffmpeg26/files/patch-libavutil-common.h
diff --git a/multimedia/ffmpeg25/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg26/files/patch-libavutil-x86-asm.h
index 52ff6d3247fa..52ff6d3247fa 100644
--- a/multimedia/ffmpeg25/files/patch-libavutil-x86-asm.h
+++ b/multimedia/ffmpeg26/files/patch-libavutil-x86-asm.h
diff --git a/multimedia/ffmpeg25/pkg-descr b/multimedia/ffmpeg26/pkg-descr
index 75f1916e4e02..a4252284283c 100644
--- a/multimedia/ffmpeg25/pkg-descr
+++ b/multimedia/ffmpeg26/pkg-descr
@@ -2,6 +2,6 @@ FFmpeg is a complete, cross-platform solution to record, convert and stream
 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/
diff --git a/multimedia/ffmpeg25/pkg-plist b/multimedia/ffmpeg26/pkg-plist
index 0472076dc3e5..9aa3eb5badd8 100644
--- a/multimedia/ffmpeg25/pkg-plist
+++ b/multimedia/ffmpeg26/pkg-plist
@@ -8,6 +8,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/avfft.h
 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%%/libavutil/blowfish.h
 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%%/libavutil/time.h
 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%%/libswscale/version.h
 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%%/libavresample%%FFMPEG_SUFFIX%%.so.2.1.0
 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