Index: head/multimedia/libav/Makefile
===================================================================
--- head/multimedia/libav/Makefile	(revision 419534)
+++ head/multimedia/libav/Makefile	(revision 419535)
@@ -1,227 +1,231 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	11.6
-PORTREVISION=	3
+PORTVERSION=	11.7
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dem.procopiou@gmail.com
 COMMENT=	Realtime audio/video conversion library
 
 BUILD_DEPENDS=	yasm:devel/yasm
+LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
+		libgmp.so:math/gmp \
+		libvdpau.so:multimedia/libvdpau \
+		libhogweed.so:security/nettle
 
 USES=		cpe gmake perl5 pkgconfig tar:xz
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+USE_XORG=	x11
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/${PORTNAME}" \
 		--shlibdir="${PREFIX}/lib/${PORTNAME}" \
 		--incdir="${PREFIX}/include/${PORTNAME}" \
 		--mandir="${PREFIX}/man" \
 		--datadir="${DATADIR}" \
 		--extra-ldflags="-L${LOCALBASE}/lib" \
 		--enable-pthreads \
 		--enable-shared \
 		--enable-runtime-cpudetect \
 		--disable-debug \
 		--cc="${CC}"
 
 OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE \
 		FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \
 		OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX THEORA V4L VAAPI \
 		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \
 		X264 XVID ZLIB
 OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \
 		THEORA VAAPI VDPAU VO_AACENC VORBIS VPX X264 XVID ZLIB
 
 FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 ILBC_DESC=	iLBC en/decoding via libilbc
 X11GRAB_DESC=	X11 grabbing
 DC1394_DESC=	IIDC-1394 grabbing using libdc1394
 
 OPTIONS_SUB=	yes
 
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ON=		--enable-indev=alsa --enable-outdev=alsa
 ALSA_CONFIGURE_OFF=		--disable-indev=alsa --disable-outdev=alsa
 
 AMR_NB_LIB_DEPENDS=		libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
 
 AMR_WB_LIB_DEPENDS=		libopencore-amrnb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
 
 BZIP2_CONFIGURE_ENABLE=		bzlib
 
 CDIO_LIB_DEPENDS=		libcdio.so:sysutils/libcdio \
 				libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=		libcdio
 
 DC1394_LIB_DEPENDS=		libdc1394.so:multimedia/libdc1394
 DC1394_CONFIGURE_ENABLE=	libdc1394
 
 DOCS_BUILD_DEPENDS=		texi2html:textproc/texi2html
 
 FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
 FAAC_LIB_DEPENDS=		libfaac.so:audio/faac
 FAAC_CONFIGURE_ENABLE=		libfaac
 
 FDK_AAC_LIB_DEPENDS=		libfdk-aac.so:audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
 GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=		libgsm
 
 ILBC_BUILD_DEPENDS=		${LOCALBASE}/include/ilbc.h:net/libilbc
 ILBC_CONFIGURE_ENABLE=		libilbc
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_ON=		--enable-indev=jack
 JACK_CONFIGURE_OFF=		--disable-indev=jack
 
 LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
 OPENCV_LIB_DEPENDS=		libopencv_gpu.so:graphics/opencv
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 OPENSSL_CONFIGURE_ENABLE=	openssl
-OPENSSL_USE=		OPENSSL=yes
+OPENSSL_USES=			ssl
 
 OPUS_LIB_DEPENDS=		libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=		libopus
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 
 RTMP_LIB_DEPENDS=		librtmp.so:multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=		librtmp
 
 SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
 SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		avplay
 
 SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=		libspeex
 
 THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_ON=		--enable-indev=v4l2
 V4L_CONFIGURE_OFF=		--disable-indev=v4l2
 
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=		vaapi
 
 VDPAU_BUILD_DEPENDS=		${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=		vdpau
 
 VO_AACENC_LIB_DEPENDS=		libvo-aacenc.so:audio/vo-aacenc
 VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
 
 VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 
 VORBIS_LIB_DEPENDS=		libvorbisenc.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 
 VPX_LIB_DEPENDS=		libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=		libvpx
 
 WAVPACK_LIB_DEPENDS=		libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_ENABLE=	libwavpack
 
 WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=		libwebp
 
 X11GRAB_USE=			XORG=x11,xext,xfixes
 
 X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=		libx264
 
 XVID_LIB_DEPENDS=		libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=		libxvid
 
 ZLIB_CONFIGURE_ENABLE=		zlib
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "armv6"
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 .endif
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--extra-cflags=-m32
 .endif
 
 # License definitions
 
 .if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL}
 RESTRICTED=	linking to libfaac or libaacplus or using OpenSSL support restricts redistribution
 CONFIGURE_ARGS+=	--enable-nonfree
 AV_NONFREE=		true
 .endif
 
 .if ${PORT_OPTIONS:MCDIO} || ${PORT_OPTIONS:MX264} || ${PORT_OPTIONS:MXVID} || ${PORT_OPTIONS:MX11GRAB}
 CONFIGURE_ARGS+=	--enable-gpl
 .if !defined(AV_NONFREE)
 LICENSE=		GPLv2+
 AV_ISGPL=		true
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || ${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
 CONFIGURE_ARGS+=	--enable-version3
 .if !defined(AV_NONFREE)
 .if defined(AV_ISGPL)
 LICENSE=	GPLv3+
 .else
 LICENSE=	LGPL3+
 .endif
 .endif
 .endif
 
 .if !defined(AV_NONFREE) && !defined(AV_ISGPL) && !defined(LICENSE)
 LICENSE=	LGPL21+
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \
 		-e 's|-ldc1394 -lraw1394|-ldc1394|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/libavcodec/libgsmdec.c
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/library.mak
 
 post-configure-DOCS-off:
 	@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
 
 post-stage:
 .for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\
 	lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\
 	lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\
 	lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}
 .endfor
 
 .include <bsd.port.mk>
Index: head/multimedia/libav/distinfo
===================================================================
--- head/multimedia/libav/distinfo	(revision 419534)
+++ head/multimedia/libav/distinfo	(revision 419535)
@@ -1,2 +1,3 @@
-SHA256 (libav-11.6.tar.xz) = 542f30e4266d2d2226e681b888bc718c995f5438f2db66a9a27d581243d27aed
-SIZE (libav-11.6.tar.xz) = 4860268
+TIMESTAMP = 1470076400
+SHA256 (libav-11.7.tar.xz) = 8c9a75c89c6df58dd5e3f6f735d1ba5448680e23013fd66a51b50b4f49913c46
+SIZE (libav-11.7.tar.xz) = 4861984
Index: head/multimedia/libav/files/patch-Makefile
===================================================================
--- head/multimedia/libav/files/patch-Makefile	(revision 419534)
+++ head/multimedia/libav/files/patch-Makefile	(revision 419535)
@@ -1,11 +1,11 @@
---- Makefile.orig	2015-01-15 05:50:49.000000000 +0900
-+++ Makefile	2015-01-21 16:21:14.000000000 +0900
-@@ -129,7 +129,7 @@
+--- Makefile.orig	2016-05-25 00:36:32 UTC
++++ Makefile
+@@ -129,7 +129,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)/$(LIBAV_ARCH)/Makefile
  -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
  include $(SRC_PATH)/library.mak
  endef
Index: head/multimedia/libav/files/patch-common.mak
===================================================================
--- head/multimedia/libav/files/patch-common.mak	(revision 419534)
+++ head/multimedia/libav/files/patch-common.mak	(revision 419535)
@@ -1,13 +1,13 @@
---- common.mak.orig	2014-04-08 18:24:04.000000000 +0200
-+++ common.mak	2014-04-08 18:24:45.000000000 +0200
-@@ -28,8 +28,8 @@
+--- common.mak.orig	2016-05-25 00:36:32 UTC
++++ common.mak
+@@ -28,8 +28,8 @@ PATH_LIBNAME = $(foreach NAME,$(1),lib$(
  DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
  
  SRC_DIR    := $(SRC_PATH)/lib$(NAME)
 -ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
 -SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
 +ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(LIBAV_ARCH)/*.h))
 +SKIPHEADERS += $(ARCH_HEADERS:%=$(LIBAV_ARCH)/%) $(SKIPHEADERS-)
  SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
  HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))
  checkheaders: $(HOBJS)
Index: head/multimedia/libav/files/patch-configure
===================================================================
--- head/multimedia/libav/files/patch-configure	(revision 419534)
+++ head/multimedia/libav/files/patch-configure	(revision 419535)
@@ -1,31 +1,31 @@
---- configure.orig	2015-01-15 05:50:49.000000000 +0900
-+++ configure	2015-01-21 16:23:01.000000000 +0900
-@@ -779,8 +779,8 @@
+--- configure.orig	2016-05-25 00:36:32 UTC
++++ configure
+@@ -780,8 +780,8 @@ ld_o(){
  
  check_ld(){
      log check_ld "$@"
 -    flags=$(filter_out '-l*' "$@")
 -    libs=$(filter '-l*' "$@")
 +    flags=$(filter_out '-l*|*.so' "$@")
 +    libs=$(filter '-l*|*.so' "$@")
      check_cc $($cflags_filter $flags) || return
      flags=$($ldflags_filter $flags)
      libs=$($ldflags_filter $libs)
-@@ -4606,7 +4606,7 @@
+@@ -4644,7 +4644,7 @@ DOCDIR=\$(DESTDIR)$docdir
  MANDIR=\$(DESTDIR)$mandir
  SRC_PATH=$source_path
  CC_IDENT=$cc_ident
 -ARCH=$arch
 +LIBAV_ARCH=$arch
  INTRINSICS=$intrinsics
  CC=$cc
  AS=$as
-@@ -4783,7 +4783,7 @@
+@@ -4821,7 +4821,7 @@ pkgconfig_generate(){
      requires=${requires%, }
      enabled ${name#lib} || return 0
      mkdir -p $name
 -    cat <<EOF > $name/$name.pc
 +    cat <<EOF > $name/$name-libav.pc
  prefix=$prefix
  exec_prefix=\${prefix}
  libdir=$libdir
Index: head/multimedia/libav/files/patch-libavcodec-libilbc.c
===================================================================
--- head/multimedia/libav/files/patch-libavcodec-libilbc.c	(revision 419534)
+++ head/multimedia/libav/files/patch-libavcodec-libilbc.c	(revision 419535)
@@ -1,30 +1,30 @@
---- libavcodec/libilbc.c.orig	2015-03-09 02:54:09.000000000 +0100
-+++ libavcodec/libilbc.c	2015-04-03 19:12:02.210836254 +0200
+--- libavcodec/libilbc.c.orig	2016-05-25 00:36:32 UTC
++++ libavcodec/libilbc.c
 @@ -20,6 +20,7 @@
   */
  
  #include <ilbc.h>
 +#include <stdint.h>
  
  #include "libavutil/channel_layout.h"
  #include "libavutil/common.h"
-@@ -95,8 +96,8 @@
+@@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
          return ret;
      }
  
 -    WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
 -                             (const WebRtc_UWord16*) buf, &s->decoder, 1);
 +    WebRtcIlbcfix_DecodeImpl((int16_t*) frame->data[0],
 +                             (const uint16_t*) buf, &s->decoder, 1);
  
      *got_frame_ptr = 1;
  
-@@ -168,7 +169,7 @@
+@@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
          return ret;
      }
  
 -    WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
 +    WebRtcIlbcfix_EncodeImpl((uint16_t*) avpkt->data, (const int16_t*) frame->data[0], &s->encoder);
  
      avpkt->size     = s->encoder.no_of_bytes;
      *got_packet_ptr = 1;
Index: head/multimedia/libav/files/patch-libavcodec_Makefile
===================================================================
--- head/multimedia/libav/files/patch-libavcodec_Makefile	(revision 419534)
+++ head/multimedia/libav/files/patch-libavcodec_Makefile	(revision 419535)
@@ -1,11 +1,11 @@
---- libavcodec/Makefile.orig	2014-04-08 16:36:02.000000000 +0200
-+++ libavcodec/Makefile	2014-04-08 16:36:14.000000000 +0200
-@@ -687,7 +687,7 @@
+--- libavcodec/Makefile.orig	2016-05-25 00:36:32 UTC
++++ libavcodec/Makefile
+@@ -704,7 +704,7 @@ SKIPHEADERS                            +
                                            aac_tablegen_decl.h           \
                                            fft-internal.h                \
                                            tableprint.h                  \
 -                                          $(ARCH)/vp56_arith.h          \
 +                                          $(LIBAV_ARCH)/vp56_arith.h          \
  
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
Index: head/multimedia/libav/files/patch-libavcodec_libvpxenc.c
===================================================================
--- head/multimedia/libav/files/patch-libavcodec_libvpxenc.c	(revision 419534)
+++ head/multimedia/libav/files/patch-libavcodec_libvpxenc.c	(revision 419535)
@@ -1,39 +1,33 @@
 commit 6540fe0
 Author: James Zern <jzern@google.com>
 Date:   Mon Oct 19 22:44:11 2015 -0700
 
     libvpxenc: remove some unused ctrl id mappings
     
     VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
     from libvpx and the remaining values were never used here
     
     Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
     Signed-off-by: James Zern <jzern@google.com>
----
- libavcodec/libvpxenc.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git libavcodec/libvpxenc.c libavcodec/libvpxenc.c
-index 5f39783..992122c 100644
---- libavcodec/libvpxenc.c
+--- libavcodec/libvpxenc.c.orig	2016-05-25 00:36:32 UTC
 +++ libavcodec/libvpxenc.c
-@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+@@ -70,19 +70,11 @@ typedef struct VP8EncoderContext {
  
  /** String mappings for enum vp8e_enc_control_id */
  static const char *const ctlidstr[] = {
 -    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
 -    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
 -    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
 -    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
 -    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
 -    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
      [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
      [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
      [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
 -    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
      [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
      [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
 -    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
      [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
      [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
      [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
Index: head/multimedia/libav/files/patch-libavutil_x86_asm.h
===================================================================
--- head/multimedia/libav/files/patch-libavutil_x86_asm.h	(revision 419534)
+++ head/multimedia/libav/files/patch-libavutil_x86_asm.h	(revision 419535)
@@ -1,11 +1,11 @@
---- libavutil/x86/asm.h.orig	2013-11-07 22:15:35.000000000 +0100
-+++ libavutil/x86/asm.h	2013-11-07 22:15:52.000000000 +0100
-@@ -68,7 +68,7 @@
+--- libavutil/x86/asm.h.orig	2016-05-25 00:36:32 UTC
++++ libavutil/x86/asm.h
+@@ -70,7 +70,7 @@ typedef int32_t x86_reg;
  typedef int x86_reg;
  #endif
  
 -#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
 +#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
  #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
  
  #if ARCH_X86_64 && defined(PIC)
Index: head/multimedia/libav/files/patch-library.mak
===================================================================
--- head/multimedia/libav/files/patch-library.mak	(revision 419534)
+++ head/multimedia/libav/files/patch-library.mak	(revision 419535)
@@ -1,11 +1,11 @@
---- library.mak.orig	2014-04-08 18:27:40.000000000 +0200
-+++ library.mak	2014-03-23 17:47:44.000000000 +0100
-@@ -80,7 +80,7 @@
+--- library.mak.orig	2016-05-25 00:36:32 UTC
++++ library.mak
+@@ -80,7 +80,7 @@ install-lib$(NAME)-headers: $(addprefix 
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
 -install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
 +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)-libav.pc
  	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
  	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"