From fdc760a3f6acc7d51438e2d3b9c37fec650d6a18 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 14 Apr 2010 09:45:22 +0000
Subject: [PATCH] add libtheora, speex, vorbis to ffmpeg

svn path=/nixpkgs/trunk/; revision=21067
---
 pkgs/development/libraries/ffmpeg/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix               | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index c67ce169a1c3..cdb9bb887e82 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, faad2}:
+{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}:
 
 stdenv.mkDerivation {
   name = "ffmpeg-0.5.1";
@@ -19,9 +19,12 @@ stdenv.mkDerivation {
     --disable-ffplay
     --enable-libfaad
     --enable-shared
+    --enable-libtheora
+    --enable-libvorbis
+    --enable-libspeex
   '';
 
-  buildInputs = [faad2];
+  buildInputs = [faad2 libtheora speex libvorbis];
 
   meta = {
     homepage = http://www.ffmpeg.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70f1ef0e7632..8acb5d0ff694 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3608,7 +3608,7 @@ let
   };
 
   ffmpeg = import ../development/libraries/ffmpeg {
-    inherit fetchurl stdenv faad2;
+    inherit fetchurl stdenv faad2 libvorbis speex libtheora;
   };
 
   fftw = import ../development/libraries/fftw {
@@ -8007,7 +8007,8 @@ let
     inherit fetchurl stdenv lib cmake pkgconfig freetype lcms libtiff libxml2
       cairo python cups fontconfig zlib libjpeg libpng;
     inherit (gnome) libart_lgpl;
-    inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
+    inherit (xlibs) libXau libXaw libXdmcp libXext libX11 libXtst libXi libXinerama libXrender;
+    inherit (xorg) pixman libpthreadstubs;
     qt = qt3;
   };