- Update multimdedia/ffmpeg to latest upstrem version 2.7.1

- Mark ports BROKEN that were discovered not to work with
  this update; discovered by exp-run in bug 201181
- Note the need for manual upgrade of dependent ports in
  UPDATING

10 files changed, 51 insertions, 51 deletions

diff --git a/multimedia/ffmpeg/files/patch-Makefile b/multimedia/ffmpeg/files/patch-Makefile
index ccbef27e5dd8..0b2343d83469 100644
--- a/multimedia/ffmpeg/files/patch-Makefile
+++ b/multimedia/ffmpeg/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2012-05-04 12:24:34.447846798 +0200
-+++ Makefile	2012-05-04 12:24:42.471850113 +0200
-@@ -79,7 +79,7 @@
+--- Makefile.orig	2015-06-19 20:44:35 UTC
++++ Makefile
+@@ -92,7 +92,7 @@ define DOSUBDIR
  $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
  SUBDIR := $(1)/
  include $(SRC_PATH)/$(1)/Makefile
 --include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
 +-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
  include $(SRC_PATH)/library.mak
  endef
- 
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 81c455bece4f..a6b39003bb3c 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2014-08-17 15:33:04.000000000 +0200
-+++ configure	2014-09-12 15:07:50.647439045 +0200
-@@ -2649,12 +2649,7 @@
+--- configure.orig	2015-06-19 20:47:55 UTC
++++ configure
+@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
  host_os=$target_os_default
  
  # machine
@@ -12,18 +12,18 @@
 -fi
 +arch_default=$(uname -p)
  cpu="generic"
+ intrinsics="none"
  
- # configurable options
-@@ -5381,7 +5376,7 @@
+@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
 -ARCH=$arch
 +FFMPEG_ARCH=$arch
+ INTRINSICS=$intrinsics
  CC=$cc
  CXX=$cxx
- AS=$as
-@@ -5590,7 +5585,7 @@
+@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
  libdir=$libdir
  includedir=$incdir
  
@@ -32,7 +32,7 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -5604,10 +5599,10 @@
+@@ -6049,10 +6044,10 @@ EOF
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
diff --git a/multimedia/ffmpeg/files/patch-doc-Makefile b/multimedia/ffmpeg/files/patch-doc-Makefile
index 4b702775a360..52ab4033ad98 100644
--- a/multimedia/ffmpeg/files/patch-doc-Makefile
+++ b/multimedia/ffmpeg/files/patch-doc-Makefile
@@ -1,7 +1,7 @@
---- doc/Makefile.orig	2012-09-28 03:37:35.000000000 +0200
-+++ doc/Makefile	2012-10-12 21:36:56.461440175 +0200
-@@ -57,7 +57,7 @@
- install-man:
+--- doc/Makefile.orig	2015-06-19 20:44:35 UTC
++++ doc/Makefile
+@@ -145,7 +145,7 @@ install-html: $(HTMLPAGES)
+ endif
  
  ifdef CONFIG_MANPAGES
 -install-progs-$(CONFIG_DOC): install-man
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-Makefile b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
index 0e64d96791f5..32f70f0b34f2 100644
--- a/multimedia/ffmpeg/files/patch-libavcodec-Makefile
+++ b/multimedia/ffmpeg/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-06-19 20:44:36 UTC
++++ libavcodec/Makefile
+@@ -877,7 +877,7 @@ SKIPHEADERS                            +
+                                           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_D3D11VA)          += d3d11va.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
index c64d1826eb91..325d4b620f40 100644
--- a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
+++ b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
@@ -1,5 +1,5 @@
---- libavdevice/bktr.c.orig	2012-01-22 14:41:15.000000000 +0100
-+++ libavdevice/bktr.c	2012-01-22 16:07:07.873280412 +0100
+--- libavdevice/bktr.c.orig	2015-06-19 20:44:50 UTC
++++ libavdevice/bktr.c
 @@ -24,6 +24,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
@@ -10,5 +10,5 @@
 +typedef unsigned long u_long;
 +
  #include "libavformat/internal.h"
+ #include "libavutil/internal.h"
  #include "libavutil/log.h"
- #include "libavutil/opt.h"
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c b/multimedia/ffmpeg/files/patch-libavdevice-oss.c
index d3428dd5cefc..863b590854e6 100644
--- a/multimedia/ffmpeg/files/patch-libavdevice-oss_audio.c
+++ b/multimedia/ffmpeg/files/patch-libavdevice-oss.c
@@ -1,5 +1,5 @@
---- libavdevice/oss_audio.c.orig	2009-05-15 17:38:35.000000000 +0200
-+++ libavdevice/oss_audio.c	2009-05-15 17:41:27.000000000 +0200
+--- libavdevice/oss.c.orig	2015-06-19 20:44:50 UTC
++++ libavdevice/oss.c
 @@ -19,6 +19,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
@@ -10,5 +10,5 @@
 +typedef unsigned long	u_long;
 +
  #include "config.h"
- #include <stdlib.h>
- #include <stdio.h>
+ 
+ #include <string.h>
diff --git a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
index ded99fa94ac4..815ef144c894 100644
--- a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
+++ b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
@@ -1,12 +1,12 @@
---- libavfilter/vf_libopencv.c.orig	2012-08-05 14:09:37.882506740 +0200
-+++ libavfilter/vf_libopencv.c	2012-08-05 14:10:24.508510133 +0200
-@@ -25,8 +25,7 @@
- 
- /* #define DEBUG */
+--- libavfilter/vf_libopencv.c.orig	2015-06-19 20:44:50 UTC
++++ libavfilter/vf_libopencv.c
+@@ -23,8 +23,7 @@
+  * libopencv wrapper functions
+  */
  
 -#include <opencv/cv.h>
 -#include <opencv/cxcore.h>
 +#include <opencv2/imgproc/imgproc_c.h>
  #include "libavutil/avstring.h"
+ #include "libavutil/common.h"
  #include "libavutil/file.h"
- #include "avfilter.h"
diff --git a/multimedia/ffmpeg/files/patch-libavformat-udp.c b/multimedia/ffmpeg/files/patch-libavformat-udp.c
index 0042372ae7b5..5f8746cfc0f9 100644
--- a/multimedia/ffmpeg/files/patch-libavformat-udp.c
+++ b/multimedia/ffmpeg/files/patch-libavformat-udp.c
@@ -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-06-19 20:44:53 UTC
++++ libavformat/udp.c
+@@ -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;
diff --git a/multimedia/ffmpeg/files/patch-libavutil-common.h b/multimedia/ffmpeg/files/patch-libavutil-common.h
index e4a38622d92e..2c8c84e6d372 100644
--- a/multimedia/ffmpeg/files/patch-libavutil-common.h
+++ b/multimedia/ffmpeg/files/patch-libavutil-common.h
@@ -1,8 +1,8 @@
---- libavutil/common.h.orig	2010-07-07 19:27:45.000000000 +0200
-+++ libavutil/common.h	2010-08-01 22:27:42.964629491 +0200
-@@ -36,6 +36,10 @@
- #include <string.h>
- #include "attributes.h"
+--- libavutil/common.h.orig	2015-06-19 20:44:53 UTC
++++ libavutil/common.h
+@@ -49,6 +49,10 @@
+ #   define AV_NE(be, le) (le)
+ #endif
  
 +#ifndef	UINT64_C
 +#define	UINT64_C(c)	(c ## UL)
diff --git a/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
index 52ff6d3247fa..71e31a029955 100644
--- a/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
+++ b/multimedia/ffmpeg/files/patch-libavutil-x86-asm.h
@@ -1,6 +1,6 @@
---- ./libavutil/x86/asm.h.orig	2013-11-01 13:02:26.000000000 -0400
-+++ ./libavutil/x86/asm.h	2013-11-01 13:03:00.000000000 -0400
-@@ -70,7 +70,7 @@
+--- libavutil/x86/asm.h.orig	2015-06-19 20:44:54 UTC
++++ libavutil/x86/asm.h
+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
  typedef int x86_reg;
  #endif