Author: mkwik
Date: Wed May 9 10:01:35 2012
New Revision: 34024
URL: https://nixos.org/websvn/nix/?rev=34024&sc=1
Log:
mplayer: enabled speex support
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
Modified:
nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Wed May 9
07:22:18 2012 (r34023)
+++ nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Wed May 9
10:01:35 2012 (r34024)
@@ -10,6 +10,7 @@
, x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null
, lameSupport ? true, lame ? null
+, speexSupport ? true, speex ? null
, screenSaverSupport ? true, libXScrnSaver
, pulseSupport ? false, pulseaudio
, mesa, pkgconfig, unzip, yasm, freefont_ttf
@@ -29,6 +30,7 @@
assert amrSupport -> (amrnb != null && amrwb != null);
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
+assert speexSupport -> speex != null;
let
@@ -111,7 +113,8 @@
++ stdenv.lib.optional pulseSupport pulseaudio
++ stdenv.lib.optional screenSaverSupport libXScrnSaver
++ stdenv.lib.optional lameSupport lame
- ++ stdenv.lib.optional vdpauSupport libvdpau;
+ ++ stdenv.lib.optional vdpauSupport libvdpau
+ ++ stdenv.lib.optional speexSupport speex;
buildNativeInputs = [ yasm ];
@@ -132,6 +135,7 @@
${if codecs != null then "--codecsdir=${codecs}" else ""}
${if (stdenv.isi686 || stdenv.isx86_64) then
"--enable-runtime-cpudetection" else ""}
${if x11Support then "--enable-x11" else ""}
+ ${stdenv.lib.optionalString speexSupport "--enable-speex"}
--disable-xanim
--disable-ivtv
--enable-vidix
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
