* 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

2 files changed, 31 insertions, 52 deletions

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 170c2ca4f7e8..e8fb187e0491 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -4,8 +4,6 @@
 , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
 , libXinerama ? null, libXrandr ? null, libdvdnav ? null
 , cdparanoia ? null, cddaSupport ? true
-, extraBuildInputs ? []
-, extraConfigureFlags ? ""
 }:
 
 assert alsaSupport -> alsa != null;
@@ -30,52 +28,41 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "MPlayer-1.0rc2";
+  name = "MPlayer-1.0rc2-r28450";
 
   src = fetchurl {
-    url = http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2;
-    sha1 = "e9b496f3527c552004ec6d01d6b43f196b43ce2d";
+    url = mirror://gentoo/distfiles/mplayer-1.0_rc2_p28450.tar.bz2;
+    sha256 = "0cbils58mq20nablywgjfpfx2pzjgnhin23sb8k1s5h2rxgvi3vf";
   };
 
-  buildInputs = [
-    x11 libXv freetype zlib
-    (if alsaSupport then alsa else null)
-    (if xvSupport then libXv else null)
-    (if theoraSupport then libtheora else null)
-    (if cacaSupport then libcaca else null)
-    (if xineramaSupport then libXinerama else null)
-    (if randrSupport then libXrandr else null)
-    (if dvdnavSupport then libdvdnav else null)
-    (if cddaSupport then cdparanoia else null)
-  ]
-  ++ extraBuildInputs
-  ;
+  buildInputs =
+    [x11 libXv freetype zlib]
+    ++ stdenv.lib.optional alsaSupport alsa
+    ++ stdenv.lib.optional xvSupport libXv
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional cacaSupport libcaca
+    ++ stdenv.lib.optional xineramaSupport libXinerama
+    ++ stdenv.lib.optional randrSupport libXrandr
+    ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
+    ++ stdenv.lib.optional cddaSupport cdparanoia;
 
-  configureFlags = "
+  configureFlags = ''
     ${if cacaSupport then "--enable-caca" else "--disable-caca"}
-    ${if dvdnavSupport then "--enable-dvdnav" else ""}
+    ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
     --win32codecsdir=${win32codecs}
     --realcodecsdir=${rp9codecs}
     --enable-runtime-cpudetection
     --enable-x11 --with-extraincdir=${libX11}/include
     --disable-xanim
-  "
-  + extraConfigureFlags
-  ;
+  '';
 
-  NIX_LDFLAGS = "-lX11 -lXext "  # !!! hack, necessary to get libX11/Xext in the RPATH
-    + (if dvdnavSupport then "-ldvdnav" else "");
+  NIX_LDFLAGS = "-lX11 -lXext";
 
   # Provide a reasonable standard font.  Maybe we should symlink here.
-  postInstall = "cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf";
-
-  patches = [
-    # These fix MPlayer's aspect ratio when run in a screen rotated with
-    # Xrandr.
-    # See: http://itdp.de/~itdp/html/mplayer-dev-eng/2005-08/msg00427.html
-    #./mplayer-aspect.patch
-    #./mplayer-pivot.patch
-  ];
+  postInstall = ''
+    ensureDir $out/share/mplayer
+    cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
+  '';
 
   meta = {
     description = "A movie player that supports many video formats";
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b774cd28b62c..7e51cf94f1cc 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,31 +1,23 @@
-{ xvSupport ? true
-, stdenv, fetchurl, perl, x11, libXv, wxGTK
-, libdvdread, libdvdnav, libdvdcss
+{ stdenv, fetchurl, perl, xlibs, libdvdnav
 , zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa
+, pkgconfig, dbus, hal, fribidi, qt4
 }:
 
-assert libdvdread.libdvdcss == libdvdcss;
-assert xvSupport -> libXv != null;
-
 stdenv.mkDerivation {
-  name = "vlc-0.8.6h";
+  name = "vlc-0.9.8a";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2;
-    sha256 = "08bj6ndxj0f7jdsif43535qyavpy13wni93z7c2790i2d748gvah";
+    url = http://download.videolan.org/pub/videolan/vlc/0.9.8a/vlc-0.9.8a.tar.bz2;
+    sha256 = "0kw2d7yh8rzb61j1q2cvnjinj1wxc9a7smxl7ckw1vwh6y02jz0r";
   };
 
   buildInputs = [
-    perl x11 wxGTK 
-    zlib mpeg2dec a52dec libmad ffmpeg alsa
-    libdvdread # <- for "simple" DVD playback
-    libdvdnav libdvdcss # <- for DVD playback with menus
-  ] ++ stdenv.lib.optional xvSupport libXv;
-
-  # Ensure that libdvdcss will be found without having to set LD_LIBRARY_PATH.
-  NIX_LDFLAGS = "-ldvdcss";
+    perl xlibs.xlibs xlibs.libXv zlib a52dec libmad ffmpeg alsa
+    libdvdnav libdvdnav.libdvdread
+    pkgconfig dbus hal fribidi qt4
+  ];
 
-  configureFlags = "--enable-alsa";
+  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd";
 
   meta = {
     description = "Cross-platform media player and streaming server";