Update ffmpeg-devel to 2012-10-13

Feature safe:	yes

6 files changed, 45 insertions, 37 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 8b08ac9636a2..d334986a306c 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2012-08-06
-PORTREVISION=	1
+DISTVERSION=	2012-10-13
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://git.videolan.org/
 PKGNAMESUFFIX=	-devel
@@ -27,7 +26,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 
 LATEST_LINK=	ffmpeg${PKGNAMESUFFIX}
 
-GIT_SNAPSHOT=	388243bb27f3d9b8f50d54268a784d55a7171f10
+GIT_SNAPSHOT=	79133fd0e58f3564e790eb2858b24db18182cef1
 GIT_SUFFIX=	${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
 FETCH_ARGS=	-pRr -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 FETCH_URL=	"http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};sf=tgz"
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index d03810968c8f..72729ba9123d 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-388243b.tar.gz) = ea65d0359ea0f629b25f529923f5fc344c0852390df694bfdb0af877bca92f73
-SIZE (ffmpeg-388243b.tar.gz) = 7475800
+SHA256 (ffmpeg-79133fd.tar.gz) = 4198d6a6a2515acca7854081417dc20abc6ce3521c77d63f5def84033ecf872a
+SIZE (ffmpeg-79133fd.tar.gz) = 7689996
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index 44b605473dff..30564f41c5db 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-08-06 10:06:26.000000000 +0200
-+++ configure	2012-08-12 09:48:55.838509614 +0200
-@@ -1924,7 +1924,7 @@
+--- configure.orig	2012-10-13 10:22:27.000000000 +0200
++++ configure	2012-10-13 10:55:30.573237451 +0200
+@@ -2041,7 +2041,7 @@
  nogas=":"
  
  # machine
@@ -9,8 +9,8 @@
  cpu="generic"
  
  # OS
-@@ -3506,10 +3506,10 @@
- makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
+@@ -3744,10 +3744,10 @@
+ perl --version > /dev/null 2>&1 && enable perl || disable perl
  pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
  
 -check_header linux/fb.h
@@ -24,7 +24,7 @@
  
  check_header sys/videoio.h
  
-@@ -3897,7 +3897,7 @@
+@@ -4152,7 +4152,7 @@
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,12 +33,12 @@
  CC=$cc
  CXX=$cxx
  AS=$as
-@@ -4093,13 +4093,13 @@
- requires=$5
- enabled ${name#lib} || return 0
- mkdir -p $name
--cat <<EOF > $name/$name.pc
-+cat <<EOF > $name/${name}${build_suffix}.pc
+@@ -4355,13 +4355,13 @@
+     requires=$5
+     enabled ${name#lib} || return 0
+     mkdir -p $name
+-    cat <<EOF > $name/$name.pc
++    cat <<EOF > $name/${name}${build_suffix}.pc
  prefix=$prefix
  exec_prefix=\${prefix}
  libdir=$libdir
@@ -49,16 +49,16 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -4113,7 +4113,7 @@
+@@ -4375,7 +4375,7 @@
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
--cat <<EOF > doc/examples/pc-uninstalled/$name.pc
-+cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
+-    cat <<EOF > doc/examples/pc-uninstalled/$name.pc
++    cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
  prefix=
  exec_prefix=
  libdir=\${pcfiledir}/../../../$name
-@@ -4130,22 +4130,22 @@
+@@ -4392,25 +4392,25 @@
  }
  
  libavfilter_pc_deps=""
@@ -93,3 +93,6 @@
 -pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
 +pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
 +pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
+ 
+ fix_ffmpeg_remote(){
+     git_remote_from=$1
diff --git a/multimedia/ffmpeg-devel/files/patch-doc-Makefile b/multimedia/ffmpeg-devel/files/patch-doc-Makefile
index c3dc3fd3dad3..27385532b68d 100644
--- a/multimedia/ffmpeg-devel/files/patch-doc-Makefile
+++ b/multimedia/ffmpeg-devel/files/patch-doc-Makefile
@@ -1,9 +1,9 @@
---- doc/Makefile.orig	2012-08-06 10:06:26.000000000 +0200
-+++ doc/Makefile	2012-08-12 09:53:14.566506176 +0200
-@@ -54,7 +54,7 @@
+--- doc/Makefile.orig	2012-10-13 10:22:27.000000000 +0200
++++ doc/Makefile	2012-10-13 10:56:02.141525689 +0200
+@@ -58,7 +58,7 @@
  install-man:
  
- ifdef HAVE_POD2MAN
+ ifdef CONFIG_MANPAGES
 -install-progs-$(CONFIG_DOC): install-man
 +#install-progs-$(CONFIG_DOC): install-man
  
diff --git a/multimedia/ffmpeg-devel/files/patch-library.mak b/multimedia/ffmpeg-devel/files/patch-library.mak
index ec9b270751a2..17dc5b64be49 100644
--- a/multimedia/ffmpeg-devel/files/patch-library.mak
+++ b/multimedia/ffmpeg-devel/files/patch-library.mak
@@ -1,6 +1,6 @@
---- library.mak.orig	2012-05-25 20:02:16.000000000 +0200
-+++ library.mak	2012-08-12 09:31:55.551526509 +0200
-@@ -74,9 +74,9 @@
+--- library.mak.orig	2012-10-13 10:22:27.000000000 +0200
++++ library.mak	2012-10-13 10:57:11.333238227 +0200
+@@ -76,9 +76,9 @@
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
@@ -13,10 +13,10 @@
  
  uninstall-libs::
  	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
-@@ -88,7 +88,7 @@
+@@ -90,7 +90,7 @@
  
  uninstall-headers::
- 	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS))
+ 	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
 -	$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 +	$(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"
  	-rmdir "$(INCINSTDIR)"
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index 7a85f4ea55d2..3afabaecf068 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -7,6 +7,7 @@ bin/ffprobe%%SUFF%%
 include/ffmpeg%%SUFF%%/libavcodec/avcodec.h
 include/ffmpeg%%SUFF%%/libavcodec/avfft.h
 include/ffmpeg%%SUFF%%/libavcodec/dxva2.h
+include/ffmpeg%%SUFF%%/libavcodec/old_codec_ids.h
 include/ffmpeg%%SUFF%%/libavcodec/vaapi.h
 include/ffmpeg%%SUFF%%/libavcodec/vda.h
 include/ffmpeg%%SUFF%%/libavcodec/vdpau.h
@@ -55,6 +56,7 @@ include/ffmpeg%%SUFF%%/libavutil/lzo.h
 include/ffmpeg%%SUFF%%/libavutil/mathematics.h
 include/ffmpeg%%SUFF%%/libavutil/md5.h
 include/ffmpeg%%SUFF%%/libavutil/mem.h
+include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h
 include/ffmpeg%%SUFF%%/libavutil/opt.h
 include/ffmpeg%%SUFF%%/libavutil/parseutils.h
 include/ffmpeg%%SUFF%%/libavutil/pixdesc.h
@@ -69,37 +71,39 @@ include/ffmpeg%%SUFF%%/libavutil/timestamp.h
 include/ffmpeg%%SUFF%%/libavutil/version.h
 include/ffmpeg%%SUFF%%/libavutil/xtea.h
 include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
+include/ffmpeg%%SUFF%%/libpostproc/version.h
 include/ffmpeg%%SUFF%%/libswresample/swresample.h
+include/ffmpeg%%SUFF%%/libswresample/version.h
 include/ffmpeg%%SUFF%%/libswscale/swscale.h
 include/ffmpeg%%SUFF%%/libswscale/version.h
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.49.100
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.65.100
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.100
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.100
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.5.102
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.19.102
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.22.101
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.32.100
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.66.101
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.76.100
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.1.100
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
-lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.16.100
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
@@ -114,10 +118,12 @@ libdata/pkgconfig/libswresample%%SUFF%%.pc
 libdata/pkgconfig/libswscale%%SUFF%%.pc
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/decoding_encoding.c
+%%DATADIR%%/examples/demuxing.c
 %%DATADIR%%/examples/filtering_audio.c
 %%DATADIR%%/examples/filtering_video.c
 %%DATADIR%%/examples/metadata.c
 %%DATADIR%%/examples/muxing.c
+%%DATADIR%%/examples/scaling_video.c
 %%DATADIR%%/ffprobe.xsd
 %%DATADIR%%/libvpx-1080p.ffpreset
 %%DATADIR%%/libvpx-1080p50_60.ffpreset