6 files changed, 106 insertions, 44 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 5350482825c0..c95d26cd5907 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2011-10-09
-PORTREVISION=	2
+DISTVERSION=	2012-01-22
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm/ffmpeg
+PKGNAMESUFFIX=	-devel
 DISTNAME=	ffmpeg-HEAD-${GIT_SUFFIX}
 
 MAINTAINER=	mm@FreeBSD.org
@@ -23,7 +23,7 @@ CONFLICTS=	ffmpeg-0.*
 
 LATEST_LINK=	ffmpeg-devel
 
-GIT_SNAPSHOT=	9719f25e7b5a7222ca4a1e0966bb35f363752814
+GIT_SNAPSHOT=	b4ec645f471faa5142ce492e39c7527eddda46de
 GIT_SUFFIX=	${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
 
 USE_XZ=		yes
@@ -37,17 +37,24 @@ OPTIONS=	AACPLUS	"Enable aac via libaacplus" off \
 		ALSA	"Enable alsa input/output device" off \
 		AMR_NB	"AMR Narrow Band audio encoder (opencore)" off \
 		AMR_WB	"AMR Wide Band audio decoder (opencore)" off \
+		ASS	"Subtitles rendering via libass" off \
+		CDIO	"Audio CD grabbing with libcdio" off \
 		CELT	"Enable CELT/Opus decoding via libcelt" off \
 		DIRAC	"Dirac codec via libdirac" off \
 		FAAC	"FAAC mp4/aac audio encoder" off \
 		FFSERVER "Build and install ffserver" on \
 		FREETYPE "Text on top of video frames (freetype2)" on \
 		FREI0R	"Frei0r wrapper filter" on \
+		GNUTLS	"GnuTLS support (disables OpenSSL)" on \
 		GSM	"GSM audio codec" off \
 		LAME	"LAME MP3 encoder" off \
+		MODPLUG	"Mod support via libmodplug" off \
+		OPENAL	"OpenAL 1.1 capture support" off \
 		OPENCV	"OpenCV video filtering support" on \
 		OPENJPEG	"JPEG 2000 decoder" off \
+		OPENSSL	"OpenSSL support" off \
 		OPTIMIZED_CFLAGS "Additional optimizations" off \
+		PULSE	"Pulseaudio input via libpulse" off \
 		RTMP	"RTMP[E] support via librtmp" off \
 		SCHROEDINGER	"Dirac codec via libschroedinger" on \
 		SDL	"SDL support (build ffplay)" off \
@@ -88,22 +95,24 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
 	libpostproc/postprocess.h \
 	libswscale/swscale.h
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
+USE_OPENSSL=	yes
+FFMPEG_NONFREE=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.elif ${ARCH} == "i386"
-BROKEN=		does not build
-.endif
-
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/man" \
 		--enable-shared \
 		--enable-gpl \
 		--enable-postproc \
+		--enable-avconv \
 		--enable-avfilter \
 		--enable-pthreads \
 		--enable-x11grab \
@@ -195,6 +204,22 @@ CONFIGURE_ARGS+=	--enable-libopencore-amrwb
 CONFIGURE_ARGS+=	--disable-libopencore-amrwb
 .endif
 
+# ass
+.if defined(WITH_ASS)
+LIB_DEPENDS+=	ass.5:${PORTSDIR}/multimedia/libass
+CONFIGURE_ARGS+=	--enable-libass
+.else
+CONFIGURE_ARGS+=	--disable-libass
+.endif
+
+# cdio
+.if defined(WITH_CDIO)
+LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
+CONFIGURE_ARGS+=	--enable-libcdio
+.else
+CONFIGURE_ARGS+=	--disable-libcdio
+.endif
+
 # celt
 .if defined(WITH_CELT)
 LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
@@ -248,6 +273,14 @@ CONFIGURE_ARGS+=	--enable-frei0r
 CONFIGURE_ARGS+=	--disable-frei0r
 .endif
 
+# GnuTLS
+.if !defined(WITHOUT_GNUTLS)
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--enable-gnutls
+.else
+CONFIGURE_ARGS+=	--disable-gnutls
+.endif
+
 # gsm
 .if defined(WITH_GSM)
 LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
@@ -264,6 +297,22 @@ CONFIGURE_ARGS+=	--enable-libmp3lame
 CONFIGURE_ARGS+=	--disable-libmp3lame
 .endif
 
+# modplug
+.if defined(WITH_MODPLUG)
+LIB_DEPENDS+=	 modplug.1:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+=	--enable-libmodplug
+.else
+CONFIGURE_ARGS+=	--disable-libmodplug
+.endif
+
+# OpenAL
+.if defined(WITH_OPENAL)
+LIB_DEPENDS+=	openal.1:${PORTSDIR}/audio/openal-soft
+CONFIGURE_ARGS+=	--enable-openal
+.else
+CONFIGURE_ARGS+=	--disable-openal
+.endif
+
 # opencv
 .if !defined(WITHOUT_OPENCV)
 LIB_DEPENDS+=	opencv_imgproc.2:${PORTSDIR}/graphics/opencv
@@ -280,6 +329,14 @@ CONFIGURE_ARGS+=	--enable-libopenjpeg
 CONFIGURE_ARGS+=	--disable-libopenjpeg
 .endif
 
+# PulseAudio
+.if defined(WITH_PULSE)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+=	--enable-libpulse
+.else
+CONFIGURE_ARGS+=	--disable-libpulse
+.endif
+
 # rtmp
 .if defined(WITH_RTMP)
 LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
@@ -420,7 +477,7 @@ pre-configure:
 post-patch:
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/subdir.mak
+		${WRKSRC}/library.mak
 	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
 		${WRKSRC}/ffserver.c
 	@${REINPLACE_CMD} -E \
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index 88b4bdb1f9e1..bfd6140818df 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-HEAD-9719f25.tar.xz) = e7fd708af2fe8c9290b76256961c6e7791ea07fa46a294d24ab53c735cf96c8a
-SIZE (ffmpeg-HEAD-9719f25.tar.xz) = 4034508
+SHA256 (ffmpeg-HEAD-b4ec645.tar.xz) = 27031646723a47de1ceb44c98b807a0158ea5b97745b08728166ec6866bfb304
+SIZE (ffmpeg-HEAD-b4ec645.tar.xz) = 4270676
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index db725c4297af..e9a8840db7c0 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	2011-06-25 04:32:49.000000000 +0200
-+++ configure	2011-06-27 22:33:05.761413592 +0200
-@@ -1660,7 +1660,7 @@
- nm_opts='-g'
+--- configure.orig	2012-01-22 14:41:15.000000000 +0100
++++ configure	2012-01-22 16:05:39.961156595 +0100
+@@ -1806,7 +1806,7 @@
+ nogas=":"
  
  # machine
 -arch_default=$(uname -m)
@@ -9,25 +9,27 @@
  cpu="generic"
  
  # OS
-@@ -2968,9 +2968,9 @@
- 
+@@ -3176,10 +3176,10 @@
  texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+ makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
  
 -check_header linux/fb.h
 -check_header linux/videodev.h
 -check_header linux/videodev2.h
+-check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
 +#check_header linux/fb.h
 +#check_header linux/videodev.h
 +#check_header linux/videodev2.h
++#check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
+ 
  check_header sys/videoio.h
  
- check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
-@@ -3329,7 +3329,7 @@
- MANDIR=\$(DESTDIR)$mandir
- SRC_PATH=$source_path
+@@ -3517,7 +3517,7 @@
+ SRC_PATH:=\$(SRC_PATH:.%=..%)
+ endif
  CC_IDENT=$cc_ident
 -ARCH=$arch
 +FFMPEG_ARCH=$arch
  CC=$cc
+ CXX=$cxx
  AS=$as
- LD=$ld
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c
index 7e1368f823fb..22b346333978 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec-libgsm.c
@@ -1,11 +1,11 @@
---- libavcodec/libgsm.c.orig	2010-04-18 19:05:53.640509610 +0200
-+++ libavcodec/libgsm.c	2010-04-18 19:05:59.140526816 +0200
-@@ -28,7 +28,7 @@
+--- libavcodec/libgsm.c.orig	2012-01-22 14:41:15.000000000 +0100
++++ libavcodec/libgsm.c	2012-01-22 16:06:24.357156664 +0100
+@@ -27,7 +27,7 @@
+ 
  // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
  
- #include "avcodec.h"
 -#include <gsm/gsm.h>
 +#include <gsm.h>
  
- // gsm.h misses some essential constants
- #define GSM_BLOCK_SIZE 33
+ #include "avcodec.h"
+ #include "gsm.h"
diff --git a/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c
index 83e42f8db401..c64d1826eb91 100644
--- a/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c
+++ b/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c
@@ -1,14 +1,14 @@
---- libavdevice/bktr.c.orig	2011-06-25 04:32:49.000000000 +0200
-+++ libavdevice/bktr.c	2011-06-25 10:11:19.281738648 +0200
+--- libavdevice/bktr.c.orig	2012-01-22 14:41:15.000000000 +0100
++++ libavdevice/bktr.c	2012-01-22 16:07:07.873280412 +0100
 @@ -24,6 +24,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
-+typedef unsigned char	u_char;
-+typedef unsigned short	u_short;
-+typedef unsigned int	u_int;
-+typedef unsigned long	u_long;
++typedef unsigned char u_char;
++typedef unsigned short        u_short;
++typedef unsigned int  u_int;
++typedef unsigned long u_long;
 +
+ #include "libavformat/internal.h"
  #include "libavutil/log.h"
  #include "libavutil/opt.h"
- #include "libavutil/parseutils.h"
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index 3db2a8af80d7..e95ca1ff68fe 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -35,6 +35,7 @@ include/libavcodec/avfft.h
 include/libavcodec/dxva2.h
 include/libavcodec/opt.h
 include/libavcodec/vaapi.h
+include/libavcodec/vda.h
 include/libavcodec/vdpau.h
 include/libavcodec/version.h
 include/libavcodec/xvmc.h
@@ -43,6 +44,7 @@ include/libavfilter/avcodec.h
 include/libavfilter/avfilter.h
 include/libavfilter/avfiltergraph.h
 include/libavfilter/buffersink.h
+include/libavfilter/version.h
 include/libavfilter/vsrc_buffer.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
@@ -89,34 +91,34 @@ include/postproc/postprocess.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.1
-lib/libavcodec.so.53.19.1
+lib/libavcodec.so.53.57.105
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.1
-lib/libavdevice.so.53.4.0
+lib/libavdevice.so.53.4.100
 lib/libavfilter.a
 lib/libavfilter.so
 lib/libavfilter.so.1
-lib/libavfilter.so.2.43.6
+lib/libavfilter.so.2.59.101
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.1
-lib/libavformat.so.53.14.0
+lib/libavformat.so.53.30.100
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.1
-lib/libavutil.so.51.20.1
+lib/libavutil.so.51.34.101
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.1
-lib/libpostproc.so.51.2.0
+lib/libpostproc.so.52.0.100
 lib/libswresample.a
 lib/libswresample.so
-lib/libswresample.so.0.0.0
+lib/libswresample.so.0.6.100
 lib/libswresample.so.1
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.2.1.0
+lib/libswscale.so.2.1.100
 lib/libswscale.so.1
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavdevice.pc
@@ -126,6 +128,7 @@ libdata/pkgconfig/libavutil.pc
 libdata/pkgconfig/libpostproc.pc
 libdata/pkgconfig/libswresample.pc
 libdata/pkgconfig/libswscale.pc
+%%DATADIR%%/ffprobe.xsd
 %%DATADIR%%/libvpx-1080p.ffpreset
 %%DATADIR%%/libvpx-1080p50_60.ffpreset
 %%DATADIR%%/libvpx-360p.ffpreset