From 410197a73477b2cc6d3902e05139bef312c8b6af Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 6 Feb 2008 19:01:01 +0000
Subject: [PATCH] ffmpeg: new has, more features

svn path=/nixpkgs/branches/stdenv-updates/; revision=10524
---
 .../libraries/ffmpeg_svn_snapshot/default.nix    | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
index 90978eb2908b..5cfb90e48584 100644
--- a/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
+++ b/pkgs/development/libraries/ffmpeg_svn_snapshot/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchsvn}:
+args: with args;
 
 stdenv.mkDerivation {
   name = "ffmpeg-svn-2007-12-04";
   src = fetchsvn {
     url = svn://svn.mplayerhq.hu/ffmpeg/trunk ;
     rev = "11164";
-    #sha256 = "95658455e466aeab5a302ddd6e7b2f79f620d4495012add46028a548e6c364b2";
-    sha256 = "c97b0cd791f8408cfc69452ff7afbf00d34b367e493dfbcae830fba99c229189";
+    sha256 = "80d3b3311abaf8343b73c711f02d269e8c87991f2c3d0f08e32309d39ad6aa3b";
   };
-  /*fetchurl {
-    url = http://ffmpeg.mplayerhq.hu/ffmpeg-export-snapshot.tar.bz2;
-    sha256 = "040a35f0c004323af14329c09ad3cff8d040e2cf9797d97cde3d9d83d02b4d87";
-  };*/
+
+  propagatedBuildInputs = [ a52dec lame libtheora x11 zlib SDL];
   # !!! Hm, what are the legal consequences of --enable-gpl?
-  configureFlags = "--enable-shared --enable-pp --enable-gpl --disable-ffserver --disable-ffplay";
+  configureFlags = "--enable-pthreads --enable-gpl --enable-pp --enable-shared
+  --disable-static --enable-x11grab  --enable-liba52 --enable-libmp3lame
+  --enable-libtheora --enable-swscaler";
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b6dd327bdd6..cde6b8839334 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1874,7 +1874,7 @@ rec {
   };
 
   ffmpeg_svn = import ../development/libraries/ffmpeg_svn_snapshot {
-    inherit fetchsvn stdenv;
+    inherit fetchsvn stdenv a52dec libtheora x11 lame zlib SDL;
   };
 
   fftw = import ../development/libraries/fftw {