public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add libtheora, speex, vorbis to ffmpeg 

svn path=/nixpkgs/trunk/; revision=21067
This commit is contained in:
Armijn Hemel 2010-04-14 09:45:22 +00:00
parent 75fb2e32db
commit fdc760a3f6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, faad2}: {stdenv, fetchurl, faad2, libtheora, speex, libvorbis}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ffmpeg-0.5.1"; name = "ffmpeg-0.5.1";
@ -19,9 +19,12 @@ stdenv.mkDerivation {
--disable-ffplay --disable-ffplay
--enable-libfaad --enable-libfaad
--enable-shared --enable-shared
--enable-libtheora
--enable-libvorbis
--enable-libspeex
''; '';
buildInputs = [faad2]; buildInputs = [faad2 libtheora speex libvorbis];
meta = { meta = {
homepage = http://www.ffmpeg.org/; homepage = http://www.ffmpeg.org/;

5
pkgs/top-level/all-packages.nix
View File

@ -3608,7 +3608,7 @@ let
}; };
ffmpeg = import ../development/libraries/ffmpeg { ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv faad2; inherit fetchurl stdenv faad2 libvorbis speex libtheora;
}; };
fftw = import ../development/libraries/fftw { fftw = import ../development/libraries/fftw {
@ -8007,7 +8007,8 @@ let
inherit fetchurl stdenv lib cmake pkgconfig freetype lcms libtiff libxml2 inherit fetchurl stdenv lib cmake pkgconfig freetype lcms libtiff libxml2
cairo python cups fontconfig zlib libjpeg libpng; cairo python cups fontconfig zlib libjpeg libpng;
inherit (gnome) libart_lgpl; 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; qt = qt3;
}; };