From 267a904c26e1e737dbd6a2ffcb6f5989a907bd7d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Jan 2005 19:39:42 +0000
Subject: [PATCH] * MPlayer updated to 1.0pre6.

svn path=/nixpkgs/trunk/; revision=2138
---
 pkgs/applications/video/MPlayer/builder.sh              | 3 +++
 pkgs/applications/video/MPlayer/default.nix             | 7 +++----
 pkgs/applications/video/MPlayer/win32codecs/default.nix | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/MPlayer/builder.sh b/pkgs/applications/video/MPlayer/builder.sh
index 88ddf1e548b..d6dd2d7cb83 100644
--- a/pkgs/applications/video/MPlayer/builder.sh
+++ b/pkgs/applications/video/MPlayer/builder.sh
@@ -1,5 +1,8 @@
 . $stdenv/setup
 
+# !!! Remove eventually.
+export _POSIX2_VERSION=199209
+
 postUnpack() {
     unpackFile $fonts
 }
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 7bede4de32d..b086504ff52 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -1,17 +1,16 @@
 { alsaSupport ? false, xvSupport ? true
 , stdenv, fetchurl, x11, libXv, freetype, zlib, alsa ? null}:
 
-assert x11 != null && freetype != null;
 assert alsaSupport -> alsa != null;
 assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
-  name = "MPlayer-1.0pre4";
+  name = "MPlayer-1.0pre6";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre4.tar.bz2;
-    md5 = "83ebac0f05b192516a41fca2350ca01a";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre6a.tar.bz2;
+    md5 = "a812d945b884c2e2fa7f90c57cd76bff";
   };
   fonts = fetchurl {
     url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index 6db49fd0f66..b9b892b1015 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/default.nix
+++ b/pkgs/applications/video/MPlayer/win32codecs/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "MPlayer-codecs-essential-20040427";
+  name = "MPlayer-codecs-essential-20050115";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/essential-20040427.tar.bz2;
-    md5 = "4ffc1682448aa870aec9d8efc1321a09";
+    url = http://www1.mplayerhq.hu/MPlayer/releases/codecs/essential-20050115.tar.bz2;
+    md5 = "b627e5710c6f2bf38fc2a6ef81c13be8";
   };
 }