* MPlayer: updated to the SVN version.

* VLC: updated to 0.9.8a.  It now uses Qt for the GUI, which looks a
  lot better than the wxWidgets one.
* libdvdread, libdvdnav: updated to 4.1.3.
* ffmpeg: updated to 0.5 (a new release!).  Got rid of the SVN
  version, which shouldn't be necessary anymore.

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

pkgs/development/libraries/ffmpeg/default.nix

@@ -1,11 +1,28 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "ffmpeg-20051126";
+  name = "ffmpeg-0.5";
+  
   src = fetchurl {
-    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/ffmpeg-20051126.tar.bz2;
-    md5 = "f9e50bf9ee1dd248a276bf9bd4d606e0";
+    url = http://www.ffmpeg.org/releases/ffmpeg-0.5.tar.bz2;
+    sha1 = "f930971bc0ac3d11a4ffbb1af439425c24f6f5b1";
+  };
+  
+  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+  # the resulting library is GPL'ed, so it can only be used in GPL'ed
+  # applications.
+  configureFlags = ''
+    --enable-shared
+    --disable-static
+    --enable-gpl
+    --enable-postproc
+    --enable-swscale
+    --disable-ffserver
+    --disable-ffplay
+  '';
+
+  meta = {
+    homepage = http://www.ffmpeg.org/;
+    description = "A complete, cross-platform solution to record, convert and stream audio and video";
   };
-  # !!! 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/ffmpeg_svn_snapshot/default.nix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "ffmpeg-svn-pre-r11901";
-  src = fetchurl {
-    url = http://nixos.org/tarballs/ffmpeg-svn-r11901.tar.bz2;
-    sha256 = "0l5207gnfaz57pvlxpxyjphyz0mp9plnxzd0aghy0nz3hmqh4rs7";
-  };
-  # !!! Hm, what are the legal consequences of --enable-gpl?
-  configureFlags = "--enable-shared --enable-pp --enable-gpl --disable-ffserver --disable-ffplay";
-}

pkgs/development/libraries/libdvdnav/default.nix

@@ -1,9 +1,25 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, libdvdread}:
 
 stdenv.mkDerivation {
-  name = "libdvdnav-20050211";
+  name = "libdvdnav-4.1.3";
+  
   src = fetchurl {
-    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/libdvdnav-20050211.tar.bz2;
-    md5 = "e1b1d45c8fdaf6a2dce3078bd3d7047d";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2;
+    sha1 = "d1b95eb8a7caee1fa7580a1abad84d6cb3cad046";
   };
+
+  buildInputs = [libdvdread];
+
+  configureScript = "./configure2"; # wtf?
+
+  preConfigure = ''
+    ensureDir $out
+  '';
+
+  meta = {
+    homepage = http://www.mplayerhq.hu/;
+    description = "A library that implements DVD navigation features such as DVD menus";
+  };
+
+  passthru = { inherit libdvdread; };
 }

pkgs/development/libraries/libdvdread/default.nix

@@ -1,11 +1,29 @@
 {stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation {
-  name = "libdvdread-0.9.6";
+  name = "libdvdread-4.1.3";
+  
   src = fetchurl {
-    url = http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-0.9.6.tar.gz;
-    md5 = "329401b84ad0b00aaccaad58f2fc393c";
+    url = http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2;
+    sha1 = "fc4c7ba3e49929191e057b435bc4f867583ea8d5";
+  };
+
+  buildInputs = [libdvdcss];
+
+  NIX_LDFLAGS = "-ldvdcss";
+
+  configureScript = "./configure2"; # wtf?
+
+  preConfigure = ''
+    ensureDir $out
+  '';
+
+  postInstall = ''
+    ln -s dvdread $out/include/libdvdread
+  '';
+
+  meta = {
+    homepage = http://www.mplayerhq.hu/;
+    description = "A library for reading DVDs";
   };
-  configureFlags = "--with-libdvdcss=${libdvdcss}";
-  inherit libdvdcss;
 }