* Fixes for a52dec and mpeg2dec to make vlc build on x86_64-linux.

* Fixes to make par2cmdline and exult build on gcc 4.x, since gcc
  3.4.x doesn't seem to work on x86_64-linux (NIXPKGS-91).
* Disabled pidgin on x86_64-linux because it needs a dynamic libperl
  which we don't have right now.
* Disabled wine on x86_64-linux because we still lack -m32 support.

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

pkgs/applications/video/vlc/default.nix

@@ -8,11 +8,11 @@ assert libdvdread.libdvdcss == libdvdcss;
 assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
-  name = "vlc-0.8.6d";
+  name = "vlc-0.8.6h";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/0.8.6d/vlc-0.8.6d.tar.bz2;
+    url = http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2;
-    sha256 = "019jw9cp7fbmhbmlbwvjgpamxwx0rdajyxab2sbmh4n6v04fl266";
+    sha256 = "08bj6ndxj0f7jdsif43535qyavpy13wni93z7c2790i2d748gvah";
   };
 
   buildInputs = [
@@ -20,8 +20,7 @@ stdenv.mkDerivation {
     zlib mpeg2dec a52dec libmad ffmpeg alsa
     libdvdread # <- for "simple" DVD playback
     libdvdnav libdvdcss # <- for DVD playback with menus
-    (if xvSupport then libXv else null)
+  ] ++ stdenv.lib.optional xvSupport libXv;
-  ];
 
   # Ensure that libdvdcss will be found without having to set LD_LIBRARY_PATH.
   NIX_LDFLAGS = "-ldvdcss";

pkgs/development/libraries/a52dec/default.nix

@@ -1,7 +1,8 @@
-args: with args;
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "a52dec-0.7.4";
+  
   src = fetchurl {
     url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz";
     sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
@@ -9,7 +10,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-shared --disable-static";
 
+  NIX_CFLAGS_COMPILE = "-fpic";
+
   meta = {
-    homepage = http://liba52.sourceforge.net;
+    homepage = http://liba52.sourceforge.net/;
   };
 }

pkgs/development/libraries/mpeg2dec/default.nix

@@ -1,9 +1,17 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "mpeg2dec-20050802";
+  name = "mpeg2dec-0.4.1";
+  
   src = fetchurl {
-    url = ftp://ftp.u-strasbg.fr/pub/videolan/vlc/0.8.4a/contrib/mpeg2dec-20050802.tar.gz;
+    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.1.tar.gz;
-    md5 = "79b3559a9354085fcebb1460dd93d237";
+    sha256 = "1vny7rg0p2rmic71hli2l2612i5yaw8vy0wsnm5nvhwfiw37cjn7";
+  };
+
+  configureFlags = "--enable-shared --disable-static";
+
+  meta = {
+    homepage = http://libmpeg2.sourceforge.net/;
+    description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
   };
 }

pkgs/games/exult/default.nix

@@ -9,6 +9,14 @@ stdenv.mkDerivation {
     md5 = "0fc88dee74a91724d25373ba0a8670ba";
   };
 
+  # Patches for building on x86_64 and gcc 4.x.
+  patches = [
+    (fetchurl {
+      url = "http://www.rocklinux.net/sources/package/stf/exult/exult-gcc4.patch";
+      sha256 = "1jlikxcpsi3yfchan3jbyi66fcyr18m7kfmsa946lwh3kzckszm7";
+    })
+  ];
+
   buildInputs = [SDL SDL_mixer zlib libpng unzip];
   
   NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL";
@@ -27,6 +35,7 @@ stdenv.mkDerivation {
   ];
 
   meta = {
+    homepage = http://exult.sourceforge.net/;
     description = "A reimplementation of the Ultima VII game engine";
   };
 }

pkgs/tools/networking/par2cmdline/default.nix

@@ -2,8 +2,21 @@
 
 stdenv.mkDerivation {
   name = "par2cmdline-0.4";
+  
   src = fetchurl {
     url = mirror://sourceforge/parchive/par2cmdline-0.4.tar.gz;
     md5 = "1551b63e57e3c232254dc62073b723a9";
   };
+
+  patches = [
+    (fetchurl {
+      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/par2cmdline/files/par2cmdline-0.4-gcc4.patch?rev=1.1.1.1";
+      sha256 = "1xrkr13qw5vqi2qbr2p43nqbq83nywk4bgvq7nfvrca4z60s787d";
+    })
+  ];
+
+  meta = {
+    homepage = http://parchive.sourceforge.net/;
+    description = "A command-line tool for repairing downloaded files using PARs (parity archives)";
+  };
 }

pkgs/top-level/all-packages.nix

@@ -895,8 +895,7 @@ let pkgs = rec {
   };
 
   par2cmdline = import ../tools/networking/par2cmdline {
-    inherit fetchurl;
+    inherit fetchurl stdenv;
-    stdenv = overrideGCC stdenv gcc34;
   };
 
   parted = import ../tools/misc/parted {
@@ -6484,10 +6483,11 @@ let pkgs = rec {
 
   vlc = import ../applications/video/vlc {
     inherit fetchurl stdenv perl x11 wxGTK
-            zlib mpeg2dec a52dec libmad ffmpeg
+            zlib mpeg2dec a52dec libmad
             libdvdread libdvdnav libdvdcss;
     inherit (xlibs) libXv;
     alsa = alsaLib;
+    ffmpeg = ffmpeg_svn;
   };
 
   vorbisTools = import ../applications/audio/vorbis-tools {
@@ -6705,8 +6705,7 @@ let pkgs = rec {
   } null;
 
   exult = import ../games/exult {
-    inherit fetchurl SDL SDL_mixer zlib libpng unzip;
+    inherit fetchurl stdenv SDL SDL_mixer zlib libpng unzip;
-    stdenv = overrideGCC stdenv gcc34;
   };
 
   fsg = import ../games/fsg {

pkgs/top-level/build-for-release.nix

@@ -114,7 +114,6 @@ let
       pciutils
       perl
       php
-      pidgin
       pkgconfig
       postgresql
       procps
@@ -154,7 +153,6 @@ let
       vlc
       w3m
       wget
-      wine
       wirelesstools
       wxHaskell
       x11_ssh_askpass
@@ -205,9 +203,9 @@ let
 
   i686LinuxPkgs = commonLinuxPkgs "i686-linux" // {
     inherit (allPackages {system = "i686-linux";})
-      aterm
       apacheAnt
       aspectj
+      aterm
       batik
       ecj
       eclipsesdk
@@ -220,12 +218,14 @@ let
       jrePlugin
       keen4
       mono
+      pidgin
       postgresql_jdbc
       sdf
       strategoxt
       strategoxtUtils
       syslinux
       uml
+      wine
       xorg_sys_opengl
       ;
   };
@@ -265,10 +265,10 @@ let
       #automake19x
       curl
       docbook5
+      docbook5_xsl
       docbook_xml_dtd_42
       docbook_xml_dtd_43
       docbook_xsl
-      docbook5_xsl
       libtool
       libxml2
       libxslt