Update multimedia/ffmpeg1 to 1.0.4

Add optional support for libopus [1]

PR:		ports/176366 [1]
Submitted by:	Alexander Kojevnikov <alexander_at_kojevnikov_dot_com> [1]

3 files changed, 23 insertions, 15 deletions

diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index a4c3778990d4..e54e706a0b6e 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	1
@@ -38,7 +37,7 @@ USE_PKGCONFIG=	build
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
 		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
 		LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
-		OPTIMIZED_CFLAGS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
+		OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
 		THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
 		X11GRAB X264 XVID
 
@@ -52,6 +51,7 @@ FFSERVER_DESC=	Build and install ffserver
 LIBV4L_DESC=	Video for Linux support
 MODPLUG_DESC=	Mod support via libmodplug
 OPENAL_DESC=	OpenAL 1.1 capture support
+OPUS_DESC=	Opus decoding with libopus
 X11GRAB_DESC=	Enable x11 grabbing
 
 FFPROGS=	ffmpeg ffprobe
@@ -329,6 +329,14 @@ CONFIGURE_ARGS+=	--enable-libopenjpeg
 CONFIGURE_ARGS+=	--disable-libopenjpeg
 .endif
 
+# opus
+.if ${PORT_OPTIONS:MOPUS}
+LIB_DEPENDS+=	opus:${PORTSDIR}/audio/opus
+CONFIGURE_ARGS+=	--enable-libopus
+.else
+CONFIGURE_ARGS+=	--disable-libopus
+.endif
+
 # pulseaudio
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo
index 25ed8742719b..fbfff1e0e459 100644
--- a/multimedia/ffmpeg1/distinfo
+++ b/multimedia/ffmpeg1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-1.0.1.tar.bz2) = 758840dcfc94eb7fd6263718d26408658a59422e5fb8ac4de8e7ecf0cbed6e76
-SIZE (ffmpeg-1.0.1.tar.bz2) = 6446587
+SHA256 (ffmpeg-1.0.4.tar.bz2) = 15f46524195b2c88973585ab29416badd86a92040e96ec38b7df0b4536ba3e53
+SIZE (ffmpeg-1.0.4.tar.bz2) = 6448411
diff --git a/multimedia/ffmpeg1/files/patch-configure b/multimedia/ffmpeg1/files/patch-configure
index 56361d81851d..325eb7bfbfa3 100644
--- a/multimedia/ffmpeg1/files/patch-configure
+++ b/multimedia/ffmpeg1/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-09-28 03:37:35.000000000 +0200
-+++ configure	2012-10-12 21:36:17.611237650 +0200
-@@ -2029,7 +2029,7 @@
+--- configure.orig	2013-02-07 01:29:22.000000000 +0100
++++ configure	2013-02-23 22:38:06.946960545 +0100
+@@ -2030,7 +2030,7 @@
  nogas=":"
  
  # machine
@@ -9,22 +9,22 @@
  cpu="generic"
  
  # OS
-@@ -3728,10 +3728,10 @@
+@@ -3729,10 +3729,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
 -check_header linux/videodev.h
 -check_header linux/videodev2.h
--check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete
+-check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe 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_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
  
  check_header sys/videoio.h
  
-@@ -4121,7 +4121,7 @@
+@@ -4122,7 +4122,7 @@
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,7 +33,7 @@
  CC=$cc
  CXX=$cxx
  AS=$as
-@@ -4324,13 +4324,13 @@
+@@ -4325,13 +4325,13 @@
      requires=$5
      enabled ${name#lib} || return 0
      mkdir -p $name
@@ -49,7 +49,7 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -4344,10 +4344,10 @@
+@@ -4345,10 +4345,10 @@
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
@@ -62,7 +62,7 @@
  includedir=${includedir}
  
  Name: $name
-@@ -4361,25 +4361,25 @@
+@@ -4362,25 +4362,25 @@
  }
  
  libavfilter_pc_deps=""