multimedia/libvpx: update to 1.4.0

ABI isn't compatible, so bump PORTREVISION in consumers.

Changes:	https://chromium.googlesource.com/webm/libvpx/+/v1.4.0
Differential Revision:	https://reviews.freebsd.org/D2570
Exp-run by:	antoine
Approved by:	ashish, multimedia (kwm)
Approved by:	maintainer timeout (ale, dinoex; 2 weeks)

18 files changed, 76 insertions, 80 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index dc03461c0998..c88ab62c7038 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	${AVIDEMUX2_VERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
diff --git a/multimedia/avidemux26/Makefile b/multimedia/avidemux26/Makefile
index 99bc7ce324fd..908ea488facb 100644
--- a/multimedia/avidemux26/Makefile
+++ b/multimedia/avidemux26/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f91f42c7f8a8..3eb4ee26d29c 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.3.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index 662a4b3a7892..07411fe47834 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.16
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg26/Makefile b/multimedia/ffmpeg26/Makefile
index ca7d25842cf5..c62a2aed4004 100644
--- a/multimedia/ffmpeg26/Makefile
+++ b/multimedia/ffmpeg26/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	26
diff --git a/multimedia/gstreamer-plugins-bad/files/patch-ext_vp8_gstvp8utils.h b/multimedia/gstreamer-plugins-bad/files/patch-ext_vp8_gstvp8utils.h
new file mode 100644
index 000000000000..d1da05e4f3ed
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bad/files/patch-ext_vp8_gstvp8utils.h
@@ -0,0 +1,40 @@
+commit 130873c
+Author: Aurélien Zanelli <aurelien.zanelli@darkosphere.fr>
+Date:   Sat Nov 1 12:18:02 2014 +0100
+
+    vpx: remove compatibility defines
+    
+    We are guaranteed to have VPX_IMG_FMT_I420, VPX_PLANE_Y,
+    VPX_PLANE_U and VPX_PLANE_V as we require libvpx > 1.1.0.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=739476
+---
+ ext/vpx/gstvp8utils.h | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+--- ext/vp8/gstvp8utils.h.orig	2011-12-11 18:49:11 UTC
++++ ext/vp8/gstvp8utils.h
+@@ -25,23 +25,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-/* Some compatibility defines for older libvpx versions */
+-#ifndef VPX_IMG_FMT_I420
+-#define VPX_IMG_FMT_I420 IMG_FMT_I420
+-#endif
+-
+-#ifndef VPX_PLANE_Y
+-#define VPX_PLANE_Y PLANE_Y
+-#endif
+-
+-#ifndef VPX_PLANE_U
+-#define VPX_PLANE_U PLANE_U
+-#endif
+-
+-#ifndef VPX_PLANE_V
+-#define VPX_PLANE_V PLANE_V
+-#endif
+-
+ const char * gst_vpx_error_name (vpx_codec_err_t status);
+ 
+ G_END_DECLS
diff --git a/multimedia/gstreamer-plugins-vp8/Makefile b/multimedia/gstreamer-plugins-vp8/Makefile
index 53600a868589..2e426494d599 100644
--- a/multimedia/gstreamer-plugins-vp8/Makefile
+++ b/multimedia/gstreamer-plugins-vp8/Makefile
@@ -1,7 +1,7 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer vp8 codec plugin
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 9d4aa2dff23f..e78c4c48189a 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -578,6 +578,7 @@ gst_vorbis_PLIST_FILES=	${GST_LIB_DIR}/libgstvorbis.la \
 gst_vorbis_DIST=	base
 
 # vp8
+gst_vp8_BUILD_DEPENDS+=	libvpx>=1.1.0:${PORTSDIR}/multimedia/libvpx
 gst_vp8_LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 gst_vp8_PLIST_FILES=	${GST_LIB_DIR}/libgstvp8.la \
 			${GST_LIB_DIR}/libgstvp8.so
diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile
index 379ee383b963..626be2af522f 100644
--- a/multimedia/gstreamer1-plugins-vpx/Makefile
+++ b/multimedia/gstreamer1-plugins-vpx/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer vp8 codec plugin
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 22db8e6c7d04..ae0e68fe366c 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	0.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.handbrake.fr/releases/${PORTVERSION}/ \
 		http://download.handbrake.fr/handbrake/contrib/:contrib \
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 4aeb08a0305a..7ab389bae15c 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	11.3
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index fb51d57c11fc..302556cfc9b1 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvpx
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${DISTVERSION}.orig
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 6fe268345525..732957b50b60 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvpx_1.3.0.orig.tar.bz2) = bd5af97b74d53a111b48852dfcd1791b2c758f1fe972833b363fe34a83a7750a
-SIZE (libvpx_1.3.0.orig.tar.bz2) = 2077846
+SHA256 (libvpx_1.4.0.orig.tar.bz2) = f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
+SIZE (libvpx_1.4.0.orig.tar.bz2) = 1807989
diff --git a/multimedia/libvpx/files/patch-build_make_configure.sh b/multimedia/libvpx/files/patch-build_make_configure.sh
index 3744618cef45..6f6705559b47 100644
--- a/multimedia/libvpx/files/patch-build_make_configure.sh
+++ b/multimedia/libvpx/files/patch-build_make_configure.sh
@@ -1,31 +1,18 @@
---- build/make/configure.sh.orig	2014-11-27 18:00:48 UTC
+--- build/make/configure.sh.orig	2015-04-03 18:49:19 UTC
 +++ build/make/configure.sh
-@@ -799,7 +799,6 @@ process_common_toolchain() {
+@@ -379,6 +379,7 @@ write_common_config_banner() {
+   print_webm_license config.mk "##" ""
+   echo '# This file automatically generated by configure. Do not edit!' >> config.mk
+   echo "TOOLCHAIN := ${toolchain}" >> config.mk
++  echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk
  
-         case ${tgt_cc} in
-         gcc)
--            CROSS=${CROSS:-arm-none-linux-gnueabi-}
-             link_with_cc=gcc
-             setup_gnu_toolchain
-             arch_int=${tgt_isa##armv}
-$FreeBSD$
-
---- build/make/configure.sh.orig	2014-12-03 18:11:14.000000000 +0100
-+++ build/make/configure.sh	2014-12-03 20:20:00.000000000 +0100
-@@ -382,6 +382,7 @@
-     print_webm_license config.mk "##" ""
-     echo '# This file automatically generated by configure. Do not edit!' >> config.mk
-     echo "TOOLCHAIN := ${toolchain}" >> config.mk
-+    echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk
+   case ${toolchain} in
+     *-linux-rvct)
+@@ -831,7 +832,6 @@ process_common_toolchain() {
  
-     case ${toolchain} in
-         *-linux-rvct)
-@@ -1019,7 +1019,7 @@ EOF
-         bits=32
-         enabled x86_64 && bits=64
-         check_cpp <<EOF && bits=x32
--#ifndef __ILP32__
-+#if !defined(__ILP32__) || !defined(__x86_64__)
- #error "not x32"
- #endif
- EOF
+       case ${tgt_cc} in
+         gcc)
+-          CROSS=${CROSS:-arm-none-linux-gnueabi-}
+           link_with_cc=gcc
+           setup_gnu_toolchain
+           arch_int=${tgt_isa##armv}
diff --git a/multimedia/libvpx/files/patch-configure b/multimedia/libvpx/files/patch-configure
index ee19d6047367..778cf700f478 100644
--- a/multimedia/libvpx/files/patch-configure
+++ b/multimedia/libvpx/files/patch-configure
@@ -1,9 +1,9 @@
 --- configure.orig
 +++ configure
-@@ -149,6 +149,7 @@
- all_platforms="${all_platforms} universal-darwin11-gcc"
+@@ -164,6 +164,7 @@ all_platforms="${all_platforms} universa
  all_platforms="${all_platforms} universal-darwin12-gcc"
  all_platforms="${all_platforms} universal-darwin13-gcc"
+ all_platforms="${all_platforms} universal-darwin14-gcc"
 +all_platforms="${all_platforms} ia64-linux-gcc"
  all_platforms="${all_platforms} generic-gnu"
  
diff --git a/multimedia/libvpx/files/patch-nestegg_halloc_src b/multimedia/libvpx/files/patch-nestegg_halloc_src
deleted file mode 100644
index cfe19e7c7e36..000000000000
--- a/multimedia/libvpx/files/patch-nestegg_halloc_src
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
-Fix build on modern gcc which defines max_align_t for C11
-It renames the locale definition to avoid the name clash.
-
---- nestegg/halloc/src/align.h.orig
-+++ nestegg/halloc/src/align.h
-@@ -30,7 +30,7 @@
- 	void (*q)(void);
- };
- 
--typedef union max_align max_align_t;
-+typedef union max_align halloc_max_align_t;
- 
- #endif
- 
-
-$FreeBSD$
-
---- nestegg/halloc/src/halloc.c.orig
-+++ nestegg/halloc/src/halloc.c
-@@ -30,7 +30,7 @@
- #endif
- 	hlist_item_t  siblings; /* 2 pointers */
- 	hlist_head_t  children; /* 1 pointer  */
--	max_align_t   data[1];  /* not allocated, see below */
-+	halloc_max_align_t   data[1];  /* not allocated, see below */
- 	
- } hblock_t;
- 
diff --git a/multimedia/libvpx/pkg-plist b/multimedia/libvpx/pkg-plist
index cff948dfe8fa..099df59fd64a 100644
--- a/multimedia/libvpx/pkg-plist
+++ b/multimedia/libvpx/pkg-plist
@@ -1,19 +1,17 @@
 bin/vpxdec
 bin/vpxenc
-bin/vp8_scalable_patterns
-bin/vp9_spatial_scalable_encoder
-include/vpx/svc_context.h
 include/vpx/vp8.h
 include/vpx/vp8cx.h
 include/vpx/vp8dx.h
 include/vpx/vpx_codec.h
 include/vpx/vpx_decoder.h
 include/vpx/vpx_encoder.h
+include/vpx/vpx_frame_buffer.h
 include/vpx/vpx_image.h
 include/vpx/vpx_integer.h
 lib/libvpx.a
-libdata/pkgconfig/vpx.pc
 %%SHARED%%lib/libvpx.so
-%%SHARED%%lib/libvpx.so.1
-%%SHARED%%lib/libvpx.so.1.3
-%%SHARED%%lib/libvpx.so.1.3.0
+%%SHARED%%lib/libvpx.so.2
+%%SHARED%%lib/libvpx.so.2.0
+%%SHARED%%lib/libvpx.so.2.0.0
+libdata/pkgconfig/vpx.pc
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 5725c87ff2a2..1e21b77708b6 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	High performance media player supporting many formats