* Merge r990 into 0.5-stable.backups/0.5-stable@34171origin/0.5-stablegitlab.intr/0.5-stable

svn path=/nixpkgs/branches/0.5-stable/; revision=993

11 files changed, 54 insertions, 25 deletions

diff --git a/pkgs/VERSION b/pkgs/VERSION
index ea2303bc03f1..4b9fcbec101a 100644
--- a/pkgs/VERSION
+++ b/pkgs/VERSION
@@ -1 +1 @@
-0.5
\ No newline at end of file
+0.5.1
diff --git a/pkgs/applications/video/MPlayer/builder.sh b/pkgs/applications/video/MPlayer/builder.sh
index 333219ef2c15..88ddf1e548b1 100644
--- a/pkgs/applications/video/MPlayer/builder.sh
+++ b/pkgs/applications/video/MPlayer/builder.sh
@@ -1,4 +1,3 @@
-buildInputs="$x11 $freetype $zlib $alsa"
 . $stdenv/setup
 
 postUnpack() {
@@ -9,9 +8,6 @@ postUnpack=postUnpack
 configureFlags="\
  --with-win32libdir=$win32codecs \
  --with-reallibdir=$win32codecs \
- --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
- --disable-lirc --disable-svga --disable-libdv \
- --disable-vorbis --disable-png --disable-jpeg --disable-gif \
  --enable-runtime-cpudetection"
 
 postInstall() {
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 2e8e231f11ef..7bede4de32d6 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -1,16 +1,17 @@
-{ alsaSupport ? false
-, stdenv, fetchurl, x11, freetype, zlib, alsa ? null}:
+{ 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.0pre3";
+  name = "MPlayer-1.0pre4";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre3.tar.bz2;
-    md5 = "998becb79417c6a14d15c07e85188b82";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre4.tar.bz2;
+    md5 = "83ebac0f05b192516a41fca2350ca01a";
   };
   fonts = fetchurl {
     url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
@@ -21,6 +22,9 @@ stdenv.mkDerivation {
     inherit stdenv fetchurl;
   };
 
-  alsa = if alsaSupport then alsa else null;
-  inherit alsaSupport x11 freetype zlib;
+  buildInputs = [
+    x11 libXv freetype zlib
+    (if alsaSupport then alsa else null)
+    (if xvSupport then libXv else null)
+  ];
 }
diff --git a/pkgs/applications/video/MPlayer/win32codecs/builder.sh b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
index 60baa4e29709..4d9ce0b07894 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/builder.sh
+++ b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
@@ -1,7 +1,11 @@
 . $stdenv/setup
 
-mkdir $out
-cd $out
-tar xvfj $src
-mv extralite/* .
-rmdir extralite
+buildPhase=true
+
+installPhase() {
+    mkdir $out
+    cp -prv * $out
+}
+installPhase=installPhase
+
+genericBuild
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index b66e44bf1349..0994faf9858f 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 = "win32codecs-1";
+  name = "MPlayer-codecs-essential-20040427";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2;
-    md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20040427.tar.bz2;
+    md5 = "4ffc1682448aa870aec9d8efc1321a09";
   };
 }
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index f4540a882f53..8faa28cd4362 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
+{ xvSupport ? true
+, stdenv, fetchurl, x11, libXv, wxGTK, libdvdcss, libdvdplay
 , mpeg2dec, a52dec, libmad, alsa}:
 
 assert x11 != null && wxGTK != null && libdvdcss != null
   && libdvdplay != null && mpeg2dec != null && a52dec != null
   && libmad != null && alsa != null;
 assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
   name = "vlc-0.7.1";
@@ -17,6 +19,7 @@ stdenv.mkDerivation {
   buildInputs = [
     x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread
     mpeg2dec a52dec libmad alsa
+    (if xvSupport then libXv else null)
   ];
 
   configureFlags = "--disable-ffmpeg --enable-alsa";
diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh
index d4734204ecff..3114f86eda34 100644
--- a/pkgs/applications/video/zapping/builder.sh
+++ b/pkgs/applications/video/zapping/builder.sh
@@ -1,5 +1,8 @@
 . $stdenv/setup
 
+# !!! hack
+NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
+
 # !!! hack - `make install' tries to setuid to root
 installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
 
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index 9baba537549f..6172d31d1790 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -1,12 +1,13 @@
 { teletextSupport ? true
 , jpegSupport ? true
 , pngSupport ? true
-, stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
+# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXext, libgnomeui
 , libglade, scrollkeeper, esound, gettext
 , zvbi ? null, libjpeg ? null, libpng ? null }:
 
 assert pkgconfig != null && perl != null && python != null &&
-  x11 != null && libgnomeui != null && libglade != null &&
+  x11 != null && libXv != null && libgnomeui != null && libglade != null &&
   scrollkeeper != null && esound != null && gettext != null;
 
 assert teletextSupport -> zvbi != null && zvbi.pngSupport
@@ -24,10 +25,10 @@ stdenv.mkDerivation {
     md5 = "cdedc0088c70f4520c37066ec05cb996";
   };
 
-  inherit teletextSupport jpegSupport pngSupport;
+  inherit teletextSupport jpegSupport pngSupport libXext;
 
   buildInputs = [
-    pkgconfig perl python x11 libgnomeui
+    pkgconfig perl python x11 libXv libgnomeui
     libglade scrollkeeper esound gettext
     (if teletextSupport then zvbi else null)
     (if jpegSupport then libjpeg else null)
diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix
index f7d86e741eea..60cf4e51ae5a 100644
--- a/pkgs/development/libraries/xlibs/default.nix
+++ b/pkgs/development/libraries/xlibs/default.nix
@@ -66,6 +66,10 @@ rec {
     inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm;
   };
 
+  libXv = (import ./libXv) {
+    inherit fetchurl stdenv pkgconfig libX11;
+  };
+
   xlibs = (import ./xlibs) {
     inherit stdenv libX11 libXt freetype fontconfig libXft libXext;
   };
diff --git a/pkgs/development/libraries/xlibs/libXv/default.nix b/pkgs/development/libraries/xlibs/libXv/default.nix
new file mode 100644
index 000000000000..067dad6a37e5
--- /dev/null
+++ b/pkgs/development/libraries/xlibs/libXv/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, libX11}:
+
+stdenv.mkDerivation {
+  name = "libXv-2.2.1";
+  src = fetchurl {
+    url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXv-2.2.1.tar.bz2;
+    md5 = "89b8ca62a77c662a8a7ded89bcf0dd67";
+  };
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [libX11];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 27774f82da73..6d605f54f046 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -571,6 +571,7 @@ rec {
 
   MPlayer = (import ../applications/video/MPlayer) {
     inherit fetchurl stdenv freetype x11 zlib;
+    inherit (xlibs) libXv;
     alsaSupport = true;
     alsa = alsaLib;
   };
@@ -582,6 +583,7 @@ rec {
   vlc = (import ../applications/video/vlc) {
     inherit fetchurl stdenv wxGTK libdvdcss libdvdplay
             mpeg2dec a52dec libmad x11;
+    inherit (xlibs) libXv;
     alsa = alsaLib;
   };
 
@@ -589,6 +591,7 @@ rec {
     inherit fetchurl stdenv pkgconfig perl python 
             scrollkeeper gettext zvbi libjpeg libpng x11;
     inherit (gnome) libgnomeui libglade esound;
+    inherit (xlibs) libXv libXext;
     teletextSupport = true;
     jpegSupport = true;
     pngSupport = true;