From 428f8b4ca3756384052b60437ceee7842a29ccb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Feb 2004 08:17:48 +0000
Subject: [PATCH] * Upgraded vlc to 0.7.0.

svn path=/nixpkgs/trunk/; revision=800
---
 pkgs/applications/video/vlc/default.nix         | 6 +++---
 pkgs/development/libraries/mpeg2dec/builder.sh  | 2 +-
 pkgs/development/libraries/mpeg2dec/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b860ca8c904..da48bc7e46c 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -7,13 +7,13 @@ assert !isNull x11 && !isNull wxGTK && !isNull libdvdcss
 assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
 
 derivation {
-  name = "vlc-0.6.2";
+  name = "vlc-0.7.0";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/vlc-0.6.2.tar.gz;
-    md5 = "619a45ca360d4a7bf935cb5ffd69989d";
+    url = http://download.videolan.org/pub/videolan/vlc/0.7.0/vlc-0.7.0.tar.gz;
+    md5 = "05efef68528892ca933585c7db0842e3";
   };
 
   stdenv = stdenv;
diff --git a/pkgs/development/libraries/mpeg2dec/builder.sh b/pkgs/development/libraries/mpeg2dec/builder.sh
index feda6f3ee57..22fd9594af0 100755
--- a/pkgs/development/libraries/mpeg2dec/builder.sh
+++ b/pkgs/development/libraries/mpeg2dec/builder.sh
@@ -2,7 +2,7 @@
 
 . $stdenv/setup || exit 1
 
-tar xvfj $src || exit 1
+tar xvfz $src || exit 1
 cd mpeg2dec-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
index fb76ac97bf8..1b4da9bc2ce 100644
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -3,8 +3,8 @@
   system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/mpeg2dec-20030612.tar.bz2;
-    md5 = "17b880eb8766a2e46834d2274882d284";
+    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0.tar.gz;
+    md5 = "49a70fef1b0f710ed7e64ed32ee82d4d";
   };
   stdenv = stdenv;
 }