* ffmpeg: build with faad2 support. However, vlc still won't play

  mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

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

1 files changed, 11 insertions, 12 deletions

diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index 23566428529..733724f2a42 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -1,19 +1,18 @@
-args:
-args.stdenv.mkDerivation {
-  name = "faad2-2.6.1";
+{stdenv, fetchurl}:
 
-  src = args.fetchurl {
-    url = http://downloads.sourceforge.net/faac/faad2-2.6.1.tar.gz;
-    sha256 = "0p1870qfpaadphdfphbcfalf6d25r30k3y1f7sa7ly4vq3hc5lla";
-  };
+stdenv.mkDerivation {
+  name = "faad2-2.7";
 
-  preConfigure = "./bootstrap";
+  src = fetchurl {
+    url = mirror://sourceforge/faac/faad2-2.7.tar.bz2;
+    sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
+  };
 
-  buildInputs =(with args; [autoconf automake libtool]);
+  configureFlags = "--disable-static";
 
   meta = {
-      description="AAC audio decoding library";
-      homepage = http://www.audiocoding.com/faad2.html;
-      license = "GPLv2";
+    description = "An open source MPEG-4 and MPEG-2 AAC decoder";
+    homepage = http://www.audiocoding.com/faad2.html;
+    license = "GPLv2";
   };
 }