Author: eelco
Date: Mon Dec 27 18:48:16 2010
New Revision: 25297
URL: https://svn.nixos.org/websvn/nix/?rev=25297&sc=1

Log:
* MPlayer updated to the latest SVN snapshot.
* MPlayer: add VDPAU support.

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/applications/video/MPlayer/default.nix

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/applications/video/MPlayer/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/video/MPlayer/default.nix 
Mon Dec 27 18:30:52 2010        (r25296)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/video/MPlayer/default.nix 
Mon Dec 27 18:48:16 2010        (r25297)
@@ -13,6 +13,7 @@
 , screenSaverSupport ? true, libXScrnSaver
 , pulseSupport ? false, pulseaudio
 , mesa, pkgconfig, unzip, yasm, freefont_ttf
+, vdpauSupport ? false, libvdpau ? null
 }:
 
 assert alsaSupport -> alsaLib != null;
@@ -27,6 +28,7 @@
 assert jackaudioSupport -> jackaudio != null;
 assert amrSupport -> (amrnb != null && amrwb != null);
 assert screenSaverSupport -> libXScrnSaver != null;
+assert vdpauSupport -> libvdpau != null;
 
 let
 
@@ -63,11 +65,11 @@
 in  
 
 stdenv.mkDerivation rec {
-  name = "MPlayer-1.0-pre31984";
+  name = "MPlayer-1.0-pre20101227";
 
   src = fetchurl {
-    url = "http://www.loegria.net/misc/${name}.tar.bz2";;
-    sha256 = "0mg6kggja113rsvvsk05gk50xl5qwzsms6pmb4ylc99mflh7m9km";
+    url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2;
+    sha256 = "0q9rvjz3byvs0qlnb9jbnw3qs6c3vdcqaqxm1rnql8kqic442hv2";
   };
 
   buildInputs =
@@ -87,7 +89,8 @@
     ++ stdenv.lib.optional xvidSupport xvidcore
     ++ stdenv.lib.optional pulseSupport pulseaudio
     ++ stdenv.lib.optional screenSaverSupport libXScrnSaver
-    ++ stdenv.lib.optional lameSupport lame;
+    ++ stdenv.lib.optional lameSupport lame
+    ++ stdenv.lib.optional vdpauSupport libvdpau;
 
   buildNativeInputs = [ yasm ];
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to