* 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/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;
+    url = mirror://gentoo/distfiles/mplayer-1.0_rc2_p28450.tar.bz2;
-    sha1 = "e9b496f3527c552004ec6d01d6b43f196b43ce2d";
+    sha256 = "0cbils58mq20nablywgjfpfx2pzjgnhin23sb8k1s5h2rxgvi3vf";
   };
 
-  buildInputs = [
+  buildInputs =
-    x11 libXv freetype zlib
+    [x11 libXv freetype zlib]
-    (if alsaSupport then alsa else null)
+    ++ stdenv.lib.optional alsaSupport alsa
-    (if xvSupport then libXv else null)
+    ++ stdenv.lib.optional xvSupport libXv
-    (if theoraSupport then libtheora else null)
+    ++ stdenv.lib.optional theoraSupport libtheora
-    (if cacaSupport then libcaca else null)
+    ++ stdenv.lib.optional cacaSupport libcaca
-    (if xineramaSupport then libXinerama else null)
+    ++ stdenv.lib.optional xineramaSupport libXinerama
-    (if randrSupport then libXrandr else null)
+    ++ stdenv.lib.optional randrSupport libXrandr
-    (if dvdnavSupport then libdvdnav else null)
+    ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
-    (if cddaSupport then cdparanoia else null)
+    ++ stdenv.lib.optional cddaSupport cdparanoia;
-  ]
-  ++ extraBuildInputs
-  ;
 
-  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
+  NIX_LDFLAGS = "-lX11 -lXext";
-    + (if dvdnavSupport then "-ldvdnav" else "");
 
   # Provide a reasonable standard font.  Maybe we should symlink here.
-  postInstall = "cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf";
+  postInstall = ''
-
+    ensureDir $out/share/mplayer
-  patches = [
+    cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
-    # 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
-  ];
 
   meta = {
     description = "A movie player that supports many video formats";

pkgs/applications/video/vlc/default.nix

@@ -1,31 +1,23 @@
-{ xvSupport ? true
+{ stdenv, fetchurl, perl, xlibs, libdvdnav
-, stdenv, fetchurl, perl, x11, libXv, wxGTK
-, libdvdread, libdvdnav, libdvdcss
 , 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;
+    url = http://download.videolan.org/pub/videolan/vlc/0.9.8a/vlc-0.9.8a.tar.bz2;
-    sha256 = "08bj6ndxj0f7jdsif43535qyavpy13wni93z7c2790i2d748gvah";
+    sha256 = "0kw2d7yh8rzb61j1q2cvnjinj1wxc9a7smxl7ckw1vwh6y02jz0r";
   };
 
   buildInputs = [
-    perl x11 wxGTK 
+    perl xlibs.xlibs xlibs.libXv zlib a52dec libmad ffmpeg alsa
-    zlib mpeg2dec a52dec libmad ffmpeg alsa
+    libdvdnav libdvdnav.libdvdread
-    libdvdread # <- for "simple" DVD playback
+    pkgconfig dbus hal fribidi qt4
-    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.
+  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd";
-  NIX_LDFLAGS = "-ldvdcss";
-
-  configureFlags = "--enable-alsa";
 
   meta = {
     description = "Cross-platform media player and streaming server";

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;
+    url = http://www.ffmpeg.org/releases/ffmpeg-0.5.tar.bz2;
-    md5 = "f9e50bf9ee1dd248a276bf9bd4d606e0";
+    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;
+    url = http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2;
-    md5 = "e1b1d45c8fdaf6a2dce3078bd3d7047d";
+    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;
+    url = http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2;
-    md5 = "329401b84ad0b00aaccaad58f2fc393c";
+    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;
 }

pkgs/top-level/all-packages.nix

@@ -2872,10 +2872,6 @@ let
     inherit fetchurl stdenv;
   };
 
-  ffmpeg_svn = import ../development/libraries/ffmpeg_svn_snapshot {
-    inherit fetchurl stdenv;
-  };
-
   fftw = import ../development/libraries/fftw {
     inherit fetchurl stdenv builderDefs stringsWithDeps;
     singlePrecision = false;
@@ -3294,7 +3290,7 @@ let
   };
 
   libdvdnav = import ../development/libraries/libdvdnav {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv libdvdread;
   };
 
   libdvdread = import ../development/libraries/libdvdread {
@@ -3569,8 +3565,7 @@ let
   mediastreamer = composedArgsAndFun (selectVersion
       ../development/libraries/mediastreamer "2.2.0-cvs20080207") {
     inherit fetchurl stdenv automake libtool autoconf alsaLib pkgconfig speex
-      ortp;
+      ortp ffmpeg;
-    ffmpeg = ffmpeg_svn;
   };
 
   mesaSupported =
@@ -8320,7 +8315,7 @@ let
     inherit stdenv fetchurl libao libmad libid3tag zlib;
   };
 
-  MPlayer = lib.composedArgsAndFun (import ../applications/video/MPlayer) {
+  MPlayer = import ../applications/video/MPlayer {
     inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav
       cdparanoia;
     inherit (xlibs) libX11 libXv libXinerama libXrandr;
@@ -8551,13 +8546,12 @@ let
   sox = import ../applications/misc/audio/sox {
     inherit fetchurl stdenv lib composableDerivation;
     # optional features
-    inherit alsaLib libao;
+    inherit alsaLib libao ffmpeg;
     inherit libsndfile libogg flac libmad lame libsamplerate;
     # Using the default nix ffmpeg I get this error when linking
     # .libs/libsox_la-ffmpeg.o: In function `audio_decode_frame':
     # /tmp/nix-7957-1/sox-14.0.0/src/ffmpeg.c:130: undefined reference to `avcodec_decode_audio2
     # That's why I'v added ffmpeg_svn
-    ffmpeg = ffmpeg_svn;
   };
 
   spoofax = import ../applications/editors/eclipse/plugins/spoofax {
@@ -8756,12 +8750,10 @@ let
   virtualbox = virtualboxFun null;*/
 
   vlc = import ../applications/video/vlc {
-    inherit fetchurl stdenv perl x11 wxGTK
+    inherit fetchurl stdenv perl xlibs zlib mpeg2dec a52dec libmad
-            zlib mpeg2dec a52dec libmad
+      ffmpeg libdvdnav pkgconfig hal fribidi qt4;
-            libdvdread libdvdnav libdvdcss;
+    dbus = dbus.libs;
-    inherit (xlibs) libXv;
     alsa = alsaLib;
-    ffmpeg = ffmpeg_svn;
   };
 
   vorbisTools = import ../applications/audio/vorbis-tools {
@@ -9209,6 +9201,7 @@ let
   kdelibs = kde3.kdelibs;
   kdebase = kde3.kdebase;
 
+  
   ### SCIENCE/GEOMETRY
 
   drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
@@ -9346,18 +9339,15 @@ let
     inherit (gtkLibs1x) gtk;
   };
 
-  ghostscript = import ../misc/ghostscript {
+  ghostscript = makeOverridable (import ../misc/ghostscript) {
     inherit fetchurl stdenv libjpeg libpng libtiff zlib x11 pkgconfig
       fontconfig cups openssl;
     x11Support = false;
     cupsSupport = getPkgConfig "ghostscript" "cups" true;
   };
 
-  ghostscriptX = lowPrio (appendToName "with-X" (import ../misc/ghostscript {
+  ghostscriptX = lowPrio (appendToName "with-X" (ghostscript.override {
-    inherit fetchurl stdenv libjpeg libpng libtiff zlib x11 pkgconfig
-      fontconfig cups openssl;
     x11Support = true;
-    cupsSupport = getPkgConfig "ghostscript" "cups" true;
   }));
 
   gxemul = (import ../misc/gxemul) {