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

* MPlayer updated to the latest SVN snapshot.

Browse Source 
* MPlayer: add VDPAU support.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25297
This commit is contained in:
Eelco Dolstra 2010-12-27 18:48:16 +00:00
parent 1f5b61713e
commit 90f485f268
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
, screenSaverSupport ? true, libXScrnSaver , screenSaverSupport ? true, libXScrnSaver
, pulseSupport ? false, pulseaudio , pulseSupport ? false, pulseaudio
, mesa, pkgconfig, unzip, yasm, freefont_ttf , mesa, pkgconfig, unzip, yasm, freefont_ttf
, vdpauSupport ? false, libvdpau ? null
}: }:
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
@ -27,6 +28,7 @@ assert cddaSupport -> cdparanoia != null;
assert jackaudioSupport -> jackaudio != null; 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;
let let
@ -63,11 +65,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "MPlayer-1.0-pre31984"; name = "MPlayer-1.0-pre20101227";
src = fetchurl { src = fetchurl {
url = "http://www.loegria.net/misc/${name}.tar.bz2"; url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2;
sha256 = "0mg6kggja113rsvvsk05gk50xl5qwzsms6pmb4ylc99mflh7m9km"; sha256 = "0q9rvjz3byvs0qlnb9jbnw3qs6c3vdcqaqxm1rnql8kqic442hv2";
}; };
buildInputs = buildInputs =
@ -87,7 +89,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional xvidSupport xvidcore
++ 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;
buildNativeInputs = [ yasm ]; buildNativeInputs = [ yasm ];