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

mplayer: enabled speex support

Browse Source 
I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by
default too, so it's probably on most systems already

svn path=/nixpkgs/trunk/; revision=34024
This commit is contained in:
Mathijs Kwik 2012-05-09 10:01:35 +00:00
parent 1cdbd5add0
commit aac9492dde
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/video/MPlayer/default.nix
View File

@ -10,6 +10,7 @@
, x264Support ? false, x264 ? null , x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null , xvidSupport ? false, xvidcore ? null
, lameSupport ? true, lame ? null , lameSupport ? true, lame ? null
, speexSupport ? true, speex ? null
, screenSaverSupport ? true, libXScrnSaver , screenSaverSupport ? true, libXScrnSaver
, pulseSupport ? false, pulseaudio , pulseSupport ? false, pulseaudio
, mesa, pkgconfig, unzip, yasm, freefont_ttf , mesa, pkgconfig, unzip, yasm, freefont_ttf
@ -29,6 +30,7 @@ assert jackaudioSupport -> jackaudio != null;
assert amrSupport -> (amrnb != null && amrwb != null); assert amrSupport -> (amrnb != null && amrwb != null);
assert screenSaverSupport -> libXScrnSaver != null; assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null; assert vdpauSupport -> libvdpau != null;
assert speexSupport -> speex != null;
let let
@ -111,7 +113,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional pulseSupport pulseaudio ++ stdenv.lib.optional pulseSupport pulseaudio
++ stdenv.lib.optional screenSaverSupport libXScrnSaver ++ stdenv.lib.optional screenSaverSupport libXScrnSaver
++ stdenv.lib.optional lameSupport lame ++ stdenv.lib.optional lameSupport lame
++ stdenv.lib.optional vdpauSupport libvdpau; ++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional speexSupport speex;
buildNativeInputs = [ yasm ]; buildNativeInputs = [ yasm ];
@ -132,6 +135,7 @@ stdenv.mkDerivation rec {
${if codecs != null then "--codecsdir=${codecs}" else ""} ${if codecs != null then "--codecsdir=${codecs}" else ""}
${if (stdenv.isi686 || stdenv.isx86_64) then "--enable-runtime-cpudetection" else ""} ${if (stdenv.isi686 || stdenv.isx86_64) then "--enable-runtime-cpudetection" else ""}
${if x11Support then "--enable-x11" else ""} ${if x11Support then "--enable-x11" else ""}
${stdenv.lib.optionalString speexSupport "--enable-speex"}
--disable-xanim --disable-xanim
--disable-ivtv --disable-ivtv
--enable-vidix --enable-vidix