* 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

pkgs/development/libraries/faac/default.nix

@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ stdenv, fetchurl, mp4v2 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "faac-1.26";
+  name = "faac-1.28";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/faac/faac-1.26.tar.gz;
+    url = "http://downloads.sourceforge.net/faac/${name}.tar.gz";
-    sha256 = "0ld9d8mn3yp90japzkqkicmjcggi7d8y9gn7cl1jdsb74bif4j2b";
+    sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
   };
 
-  preConfigure = "./bootstrap";
+  buildInputs = [ mp4v2 ];
-
-  buildInputs = [ autoconf automake libtool ];
 
   meta = {
     description = "Open source MPEG-4 and MPEG-2 AAC encoder";

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;
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f";
+    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;

pkgs/development/libraries/mp4v2/default.nix

@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, help2man }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mp4v2-1.9.1";
 
-  buildInputs = [ help2man ];
   src = fetchurl {
     url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2";
     sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w";
   };
 
+  # `faac' expects `mp4.h'.
+  postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";
+
   meta = {
     homepage = http://code.google.com/p/mp4v2;
     maintainers = [ stdenv.lib.maintainers.urkud ];

pkgs/development/libraries/xvidcore/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, nasm}:
 
 stdenv.mkDerivation rec {
-  name = "xvidcore-1.2.2";
+  name = "xvidcore-1.3.1";
   
   src = fetchurl {
-    url = http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.bz2;
+    url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
-    sha256 = "04bd1clv90i5pdwh6mz3mskyzmxyx5l2nx7lyyb8nhw9whnn0ap4";
+    sha256 = "0r1x00fgm7cbb7i9p17p9l0p4b82gig6sm0mbs6qrz84kd2fh6n5";
   };
 
   preConfigure = ''