- Update to version 10

- Unbreak on all supported FreeBSD versions (package builders)
- Enable support for wavpack and webp en/decoding
- Enable parallel installation with multimedia/ffmpeg by installing the shared
  libraries, headers and .pc files within separate directories (libav/) or
  using an own suffix (-libav)

Changelog for version 10: http://git.libav.org/?p=libav.git;a=blob;f=Changelog;hb=refs/tags/v10

9 files changed, 225 insertions, 137 deletions

diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 8ecc6a08f5eb..29e1d2c8bbc9 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	9.10
-PORTREVISION=	3
+PORTVERSION=	10
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Realtime audio/video conversion library
 
-CONFLICTS=	ffmpeg-[0-9]*
+BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		texi2html:${PORTSDIR}/textproc/texi2html
-
-USES=		pkgconfig:build gmake
-USE_LDCONFIG=	yes
+USES=		pkgconfig:build gmake compiler:features perl5
+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 HAS_CONFIGURE=	yes
 WANT_SDL=	yes
+USE_PERL5=	build
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 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 \
@@ -31,10 +31,11 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
 			--cc="${CC}" \
 			--disable-avserver
 
-OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \
-		GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL OPUS \
-		PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L VAAPI VDPAU \
-		VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID ZLIB
+OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DOCS FREETYPE \
+		FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \
+		OPUS PULSEAUDIO RTMP SCHROEDINGER 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 VO_AACENC VORBIS VPX X264 XVID ZLIB
@@ -137,6 +138,12 @@ VORBIS_CONFIGURE_ENABLE=	libvorbis
 VPX_LIB_DEPENDS=		libvpx.so:${PORTSDIR}/multimedia/libvpx
 VPX_CONFIGURE_ENABLE=		libvpx
 
+WAVPACK_LIB_DEPENDS=		libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_ENABLE=	libwavpack
+
+WEBP_LIB_DEPENDS=		libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE=		libwebp
+
 X11GRAB_USE=			XORG=x11,xext,xfixes
 
 X264_LIB_DEPENDS=		libx264.so:${PORTSDIR}/multimedia/x264
@@ -149,6 +156,10 @@ ZLIB_CONFIGURE_ENABLE=		zlib
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=		texi2html:${PORTSDIR}/textproc/texi2html
+.endif
+
 .if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 .endif
@@ -159,7 +170,7 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--extra-cflags=-m32
 .endif
 
-.if ${OSVERSION} < 900000
+.if ${OSVERSION} < 900000 || ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
 .endif
 
@@ -213,4 +224,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/library.mak
 
+post-configure:
+.if !${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/libav/distinfo b/multimedia/libav/distinfo
index ccce8958d6d0..a1082e7d454f 100644
--- a/multimedia/libav/distinfo
+++ b/multimedia/libav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libav-9.10.tar.gz) = bfac4148b2f168c5644f486f463b971588edd87a49dceea7b137da3f2ccaa1dc
-SIZE (libav-9.10.tar.gz) = 5790226
+SHA256 (libav-10.tar.gz) = 174e930d422a0260193bf476f6f87e2f794ad33f32b5f328e39aefd5c5724882
+SIZE (libav-10.tar.gz) = 6589234
diff --git a/multimedia/libav/files/patch-Makefile b/multimedia/libav/files/patch-Makefile
new file mode 100644
index 000000000000..9e820ff1c1ab
--- /dev/null
+++ b/multimedia/libav/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile.orig	2014-04-08 18:24:52.000000000 +0200
++++ Makefile	2014-04-08 18:25:08.000000000 +0200
+@@ -128,7 +128,7 @@
+ $(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)/library.mak
+ endef
diff --git a/multimedia/libav/files/patch-common.mak b/multimedia/libav/files/patch-common.mak
new file mode 100644
index 000000000000..6efba48274ed
--- /dev/null
+++ b/multimedia/libav/files/patch-common.mak
@@ -0,0 +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 @@
+ 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)
diff --git a/multimedia/libav/files/patch-configure b/multimedia/libav/files/patch-configure
index c82d551e4060..d19796be006d 100644
--- a/multimedia/libav/files/patch-configure
+++ b/multimedia/libav/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-12-17 19:12:24.000000000 +0100
-+++ configure	2013-12-17 19:12:49.000000000 +0100
-@@ -730,8 +730,8 @@
+--- configure.orig	2014-03-23 17:47:44.000000000 +0100
++++ configure	2014-04-08 18:30:31.000000000 +0200
+@@ -757,8 +757,8 @@
  
  check_ld(){
      log check_ld "$@"
@@ -11,3 +11,21 @@
      check_cc $($cflags_filter $flags) || return
      flags=$($ldflags_filter $flags)
      libs=$($ldflags_filter $libs)
+@@ -4356,7 +4356,7 @@
+ MANDIR=\$(DESTDIR)$mandir
+ SRC_PATH=$source_path
+ CC_IDENT=$cc_ident
+-ARCH=$arch
++LIBAV_ARCH=$arch
+ CC=$cc
+ AS=$as
+ LD=$ld
+@@ -4524,7 +4524,7 @@
+     requires=$5
+     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
diff --git a/multimedia/libav/files/patch-libavcodec_Makefile b/multimedia/libav/files/patch-libavcodec_Makefile
new file mode 100644
index 000000000000..60d3a853e6e8
--- /dev/null
+++ b/multimedia/libav/files/patch-libavcodec_Makefile
@@ -0,0 +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 @@
+                                           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
diff --git a/multimedia/libav/files/patch-libavfilter_vf_drawtext.c b/multimedia/libav/files/patch-libavfilter_vf_drawtext.c
deleted file mode 100644
index 69514ebbeca1..000000000000
--- a/multimedia/libav/files/patch-libavfilter_vf_drawtext.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libavfilter/vf_drawtext.c.orig	2014-01-01 12:39:17.000000000 +0100
-+++ libavfilter/vf_drawtext.c	2014-01-01 12:39:32.000000000 +0100
-@@ -47,7 +47,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- 
diff --git a/multimedia/libav/files/patch-library.mak b/multimedia/libav/files/patch-library.mak
new file mode 100644
index 000000000000..a588d0b5b436
--- /dev/null
+++ b/multimedia/libav/files/patch-library.mak
@@ -0,0 +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 @@
+ 	$(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"
+ 
diff --git a/multimedia/libav/pkg-plist b/multimedia/libav/pkg-plist
index 2dd851a69bea..8ecac3b250c7 100644
--- a/multimedia/libav/pkg-plist
+++ b/multimedia/libav/pkg-plist
@@ -1,108 +1,113 @@
 bin/avconv
 %%AVPLAY%%bin/avplay
 bin/avprobe
-include/libavcodec/avcodec.h
-include/libavcodec/avfft.h
-include/libavcodec/dxva2.h
-include/libavcodec/old_codec_ids.h
-include/libavcodec/vaapi.h
-include/libavcodec/vda.h
-include/libavcodec/vdpau.h
-include/libavcodec/version.h
-include/libavcodec/xvmc.h
-include/libavdevice/avdevice.h
-include/libavdevice/version.h
-include/libavfilter/avfilter.h
-include/libavfilter/avfiltergraph.h
-include/libavfilter/buffersink.h
-include/libavfilter/buffersrc.h
-include/libavfilter/version.h
-include/libavformat/avformat.h
-include/libavformat/avio.h
-include/libavformat/version.h
-include/libavresample/avresample.h
-include/libavresample/version.h
-include/libavutil/adler32.h
-include/libavutil/aes.h
-include/libavutil/attributes.h
-include/libavutil/audio_fifo.h
-include/libavutil/audioconvert.h
-include/libavutil/avassert.h
-include/libavutil/avconfig.h
-include/libavutil/avstring.h
-include/libavutil/avutil.h
-include/libavutil/base64.h
-include/libavutil/blowfish.h
-include/libavutil/bswap.h
-include/libavutil/channel_layout.h
-include/libavutil/common.h
-include/libavutil/cpu.h
-include/libavutil/crc.h
-include/libavutil/dict.h
-include/libavutil/error.h
-include/libavutil/eval.h
-include/libavutil/fifo.h
-include/libavutil/file.h
-include/libavutil/imgutils.h
-include/libavutil/intfloat.h
-include/libavutil/intfloat_readwrite.h
-include/libavutil/intreadwrite.h
-include/libavutil/lfg.h
-include/libavutil/log.h
-include/libavutil/lzo.h
-include/libavutil/mathematics.h
-include/libavutil/md5.h
-include/libavutil/mem.h
-include/libavutil/old_pix_fmts.h
-include/libavutil/opt.h
-include/libavutil/parseutils.h
-include/libavutil/pixdesc.h
-include/libavutil/pixfmt.h
-include/libavutil/random_seed.h
-include/libavutil/rational.h
-include/libavutil/samplefmt.h
-include/libavutil/sha.h
-include/libavutil/time.h
-include/libavutil/version.h
-include/libavutil/xtea.h
-include/libswscale/swscale.h
-include/libswscale/version.h
-lib/libavcodec.a
-lib/libavcodec.so
-lib/libavcodec.so.54
-lib/libavcodec.so.54.35.0
-lib/libavdevice.a
-lib/libavdevice.so
-lib/libavdevice.so.53
-lib/libavdevice.so.53.2.0
-lib/libavfilter.a
-lib/libavfilter.so
-lib/libavfilter.so.3
-lib/libavfilter.so.3.3.0
-lib/libavformat.a
-lib/libavformat.so
-lib/libavformat.so.54
-lib/libavformat.so.54.20.3
-lib/libavresample.a
-lib/libavresample.so
-lib/libavresample.so.1
-lib/libavresample.so.1.0.1
-lib/libavutil.a
-lib/libavutil.so
-lib/libavutil.so.52
-lib/libavutil.so.52.3.0
-lib/libswscale.a
-lib/libswscale.so
-lib/libswscale.so.2
-lib/libswscale.so.2.1.1
-libdata/pkgconfig/libavcodec.pc
-libdata/pkgconfig/libavdevice.pc
-libdata/pkgconfig/libavfilter.pc
-libdata/pkgconfig/libavformat.pc
-libdata/pkgconfig/libavresample.pc
-libdata/pkgconfig/libavutil.pc
-libdata/pkgconfig/libswscale.pc
+include/libav/libavcodec/avcodec.h
+include/libav/libavcodec/avfft.h
+include/libav/libavcodec/dxva2.h
+include/libav/libavcodec/vaapi.h
+include/libav/libavcodec/vda.h
+include/libav/libavcodec/vdpau.h
+include/libav/libavcodec/version.h
+include/libav/libavcodec/xvmc.h
+include/libav/libavdevice/avdevice.h
+include/libav/libavdevice/version.h
+include/libav/libavfilter/avfilter.h
+include/libav/libavfilter/avfiltergraph.h
+include/libav/libavfilter/buffersink.h
+include/libav/libavfilter/buffersrc.h
+include/libav/libavfilter/version.h
+include/libav/libavformat/avformat.h
+include/libav/libavformat/avio.h
+include/libav/libavformat/version.h
+include/libav/libavresample/avresample.h
+include/libav/libavresample/version.h
+include/libav/libavutil/adler32.h
+include/libav/libavutil/aes.h
+include/libav/libavutil/attributes.h
+include/libav/libavutil/audio_fifo.h
+include/libav/libavutil/audioconvert.h
+include/libav/libavutil/avassert.h
+include/libav/libavutil/avconfig.h
+include/libav/libavutil/avstring.h
+include/libav/libavutil/avutil.h
+include/libav/libavutil/base64.h
+include/libav/libavutil/blowfish.h
+include/libav/libavutil/bswap.h
+include/libav/libavutil/buffer.h
+include/libav/libavutil/channel_layout.h
+include/libav/libavutil/common.h
+include/libav/libavutil/cpu.h
+include/libav/libavutil/crc.h
+include/libav/libavutil/dict.h
+include/libav/libavutil/downmix_info.h
+include/libav/libavutil/error.h
+include/libav/libavutil/eval.h
+include/libav/libavutil/fifo.h
+include/libav/libavutil/file.h
+include/libav/libavutil/frame.h
+include/libav/libavutil/hmac.h
+include/libav/libavutil/imgutils.h
+include/libav/libavutil/intfloat.h
+include/libav/libavutil/intreadwrite.h
+include/libav/libavutil/lfg.h
+include/libav/libavutil/log.h
+include/libav/libavutil/lzo.h
+include/libav/libavutil/macros.h
+include/libav/libavutil/mathematics.h
+include/libav/libavutil/md5.h
+include/libav/libavutil/mem.h
+include/libav/libavutil/old_pix_fmts.h
+include/libav/libavutil/opt.h
+include/libav/libavutil/parseutils.h
+include/libav/libavutil/pixdesc.h
+include/libav/libavutil/pixfmt.h
+include/libav/libavutil/random_seed.h
+include/libav/libavutil/rational.h
+include/libav/libavutil/samplefmt.h
+include/libav/libavutil/sha.h
+include/libav/libavutil/stereo3d.h
+include/libav/libavutil/time.h
+include/libav/libavutil/version.h
+include/libav/libavutil/xtea.h
+include/libav/libswscale/swscale.h
+include/libav/libswscale/version.h
+lib/libav/libavcodec.a
+lib/libav/libavcodec.so
+lib/libav/libavcodec.so.55
+lib/libav/libavcodec.so.55.34.1
+lib/libav/libavdevice.a
+lib/libav/libavdevice.so
+lib/libav/libavdevice.so.54
+lib/libav/libavdevice.so.54.0.0
+lib/libav/libavfilter.a
+lib/libav/libavfilter.so
+lib/libav/libavfilter.so.4
+lib/libav/libavfilter.so.4.2.0
+lib/libav/libavformat.a
+lib/libav/libavformat.so
+lib/libav/libavformat.so.55
+lib/libav/libavformat.so.55.12.0
+lib/libav/libavresample.a
+lib/libav/libavresample.so
+lib/libav/libavresample.so.1
+lib/libav/libavresample.so.1.1.0
+lib/libav/libavutil.a
+lib/libav/libavutil.so
+lib/libav/libavutil.so.53
+lib/libav/libavutil.so.53.3.0
+lib/libav/libswscale.a
+lib/libav/libswscale.so
+lib/libav/libswscale.so.2
+lib/libav/libswscale.so.2.1.2
+libdata/pkgconfig/libavcodec-libav.pc
+libdata/pkgconfig/libavdevice-libav.pc
+libdata/pkgconfig/libavfilter-libav.pc
+libdata/pkgconfig/libavformat-libav.pc
+libdata/pkgconfig/libavresample-libav.pc
+libdata/pkgconfig/libavutil-libav.pc
+libdata/pkgconfig/libswscale-libav.pc
 man/man1/avconv.1.gz
+%%AVPLAY%%man/man1/avplay.1.gz
 man/man1/avprobe.1.gz
 %%DATADIR%%/libvpx-1080p.avpreset
 %%DATADIR%%/libvpx-1080p50_60.avpreset
@@ -139,11 +144,25 @@ man/man1/avprobe.1.gz
 %%DATADIR%%/libx264-veryfast_firstpass.avpreset
 %%DATADIR%%/libx264-veryslow.avpreset
 %%DATADIR%%/libx264-veryslow_firstpass.avpreset
+%%PORTDOCS%%%%DOCSDIR%%/avconv.html
+%%AVPLAY%%%%PORTDOCS%%%%DOCSDIR%%/avplay.html
+%%PORTDOCS%%%%DOCSDIR%%/avprobe.html
+%%PORTDOCS%%%%DOCSDIR%%/developer.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/fate.html
+%%PORTDOCS%%%%DOCSDIR%%/general.html
+%%PORTDOCS%%%%DOCSDIR%%/git-howto.html
+%%PORTDOCS%%%%DOCSDIR%%/libavfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/nut.html
+%%PORTDOCS%%%%DOCSDIR%%/platform.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
-@dirrm include/libswscale
-@dirrm include/libavutil
-@dirrm include/libavresample
-@dirrm include/libavformat
-@dirrm include/libavfilter
-@dirrm include/libavdevice
-@dirrm include/libavcodec
+@dirrm lib/libav
+@dirrm include/libav/libswscale
+@dirrm include/libav/libavutil
+@dirrm include/libav/libavresample
+@dirrm include/libav/libavformat
+@dirrm include/libav/libavfilter
+@dirrm include/libav/libavdevice
+@dirrm include/libav/libavcodec
+@dirrm include/libav