* Updated ffmpeg, faac and xvidcore.

* ffmpeg: enable support for faac (disabled by default because faac is
  non-free).
* faac: use an external mp4v2 because the internal one doesn't build.

svn path=/nixpkgs/trunk/; revision=27240

1 files changed, 11 insertions, 7 deletions

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 205853adb22f5..3575e24c4f90f 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,11 +1,13 @@
-{stdenv, fetchurl, pkgconfig, yasm
+{ stdenv, fetchurl, pkgconfig, yasm
 , mp3Support ? true, lame ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
 , vorbisSupport ? true, libvorbis ? null
 , vpxSupport ? false, libvpx ? null
 , x264Support ? true, x264 ? null
-, xvidSupport ? true, xvidcore ? null}:
+, xvidSupport ? true, xvidcore ? null
+, faacSupport ? false, faac ? null
+}:
 
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
@@ -15,11 +17,11 @@ assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.6.90-rc0";
+  name = "ffmpeg-0.7-rc1";
   
   src = fetchurl {
-    url = http://www.ffmpeg.org/releases/ffmpeg-0.6.90-rc0.tar.bz2;
-    sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f";
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "07ma2b80nslwwy4ddfrz8k575dxyc8x9mvja55ghrwxys8lkhw2m";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -40,7 +42,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
     ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
     ++ stdenv.lib.optional x264Support "--enable-libx264"
-    ++ stdenv.lib.optional xvidSupport "--enable-libxvid";
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
 
   buildInputs = [ pkgconfig lame yasm ]
     ++ stdenv.lib.optional mp3Support lame
@@ -49,7 +52,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vorbisSupport libvorbis
     ++ stdenv.lib.optional vpxSupport libvpx
     ++ stdenv.lib.optional x264Support x264
-    ++ stdenv.lib.optional xvidSupport xvidcore;
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional faacSupport faac;
 
   crossAttrs = {
     dontSetConfigureCross = true;