* Some VLC-related updates.

* Variability :-)  Provide both Autoconf 2.59 and 2.60 (the former
  being the default for now).

svn path=/nixpkgs/trunk/; revision=5539

pkgs/development/libraries/ffmpeg/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "ffmpeg-20051126";
+  src = fetchurl {
+    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/ffmpeg-20051126.tar.bz2;
+    md5 = "f9e50bf9ee1dd248a276bf9bd4d606e0";
+  };
+  # !!! Hm, what are the legal consequences of --enable-gpl?
+  configureFlags = "--enable-shared --enable-pp --enable-shared-pp --enable-gpl --disable-ffserver --disable-ffplay";
+}

pkgs/development/libraries/libdvdcss/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libdvdcss-1.2.8";
+  name = "libdvdcss-1.2.9";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libdvdcss-1.2.8.tar.gz;
-    md5 = "e35e4240b6ca0b66a0218065dffe6adb";
+    url = http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.bz2;
+    md5 = "553383d898826c285afb2ee453b07868";
   };
 }

pkgs/development/libraries/libdvdread/builder.sh

@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-libdvdcss=$libdvdcss"
-
-genericBuild

pkgs/development/libraries/libdvdread/default.nix

@@ -1,14 +1,11 @@
 {stdenv, fetchurl, libdvdcss}:
 
-assert libdvdcss != null;
-
 stdenv.mkDerivation {
-  name = "libdvdread-20030812";
-  builder = ./builder.sh;
+  name = "libdvdread-0.9.6";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libdvdread-20030812.tar.bz2;
-    md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
+    url = http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.6.tar.gz;
+    md5 = "329401b84ad0b00aaccaad58f2fc393c";
   };
-  buildInputs = libdvdcss;
+  configureFlags = "--with-libdvdcss=${libdvdcss}";
   inherit libdvdcss;
 }

pkgs/development/libraries/libmad/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libmad-0.15.0b";
+  name = "libmad-0.15.1b";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libmad-0.15.0b.tar.gz;
-    md5 = "2e4487cdf922a6da2546bad74f643205";
+    url = ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz;
+    md5 = "1be543bc30c56fb6bea1d7bf6a64e66c";
   };
 }

pkgs/development/libraries/mpeg2dec/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "mpeg2dec-0.4.0b";
+  name = "mpeg2dec-20050802";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mpeg2dec-0.4.0b.tar.gz;
-    md5 = "52d10ea80595ec83d8557ba7ac6dc8e6";
+    url = ftp://ftp.u-strasbg.fr/pub/videolan/vlc/0.8.4a/contrib/mpeg2dec-20050802.tar.gz;
+    md5 = "79b3559a9354085fcebb1460dd93d237";
   };
 }