Adding qtpfsgui and pfstools. Updating fftw because the src URL didn't work anymore.

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

pkgs/applications/graphics/qtpfsgui/default.nix

@@ -0,0 +1,27 @@
+{stdenv, fetchurl, qt4, exiv2, openexr, fftw, libtiff, ilmbase }:
+
+stdenv.mkDerivation {
+  name = "qtpfsgui-1.9.2";
+
+  src = fetchurl {
+    url = mirror://sourceforge/qtpfsgui/qtpfsgui-1.9.2.tar.gz;
+    sha256 = "13kcw760136zpg3b5qhd1sw3kqplicvlsqmy3rxxn5ygm0zfqqj4";
+  };
+
+  buildInputs = [ qt4 exiv2 openexr fftw libtiff ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  configurePhase = ''
+    qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \
+      OPENEXRDIR=${openexr}/include/OpenEXR \
+      FFTW3DIR=${fftw}/include \
+      LIBTIFFDIR=${libtiff}/include \
+  '';
+
+  meta = {
+    homepage = http://qtpfsgui.sourceforge.net/;
+    description = "GUI frontend for some pfstools";
+    license = "GPL";
+  };
+}

pkgs/development/libraries/fftw/default.nix

@@ -2,8 +2,8 @@ args : with args;
 	let localDefs = builderDefs.passthru.function { 
 		src = 
 			fetchurl {
-				url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz;
+				url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.1.tar.gz;
-				sha256 = "1gr63hf5vvsg50b2xwqaxwpvs1y9g8l0sb91a38wpvr7zsbjxfg1";
+				sha256 = "1x8jww3vflrgzjrpnnsk0020bkd9aqmfga8y31v10cqd02l46sh7";
 			};
 		buildInputs = [];
 		configureFlags = ["--enable-shared"] 
@@ -13,8 +13,8 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation {
-	name = "fftw-3.1.2" + ( if args.singlePrecision then "-single" else "-float" );
+	name = "fftw-3.2.1" + ( if args.singlePrecision then "-single" else "-float" );
-	builder = writeScript "fftw-3.1.2-builder"
+	builder = writeScript "fftw-3.2.1-builder"
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare]);
 	meta = {
 		description = "Fastest Fourier Transform in the West library";

pkgs/tools/graphics/pfstools/default.nix

@@ -0,0 +1,20 @@
+{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt, mesa,
+freeglut, bzip2, libX11, libpng, expat }:
+
+stdenv.mkDerivation {
+  name = "pfstools-1.8.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/pfstools/pfstools-1.8.0.tar.gz;
+    sha256 = "19gncsfhypiaarsyhmca52yjx8cv86n31b6hxmdac8z4pczhg3gv";
+  };
+
+  buildInputs = [ libtiff openexr imagemagick libjpeg qt mesa freeglut
+    bzip2 libX11 libpng expat ];
+
+  meta = {
+    homepage = http://pfstools.sourceforge.net/;
+    description = "Toolkit for manipulation of HDR images";
+    license = "GPL";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1090,6 +1090,13 @@ let
     pam = if getPkgConfig "pdsh" "pam" true then pam else null;
   };
 
+  pfstools = import ../tools/graphics/pfstools {
+    inherit fetchurl stdenv imagemagick libjpeg libtiff mesa freeglut bzip2 libpng expat;
+    openexr = openexr_1_6_1;
+    qt = qt3;
+    inherit (xlibs) libX11;
+  };
+
   pinentry = import ../tools/misc/pinentry {
     inherit fetchurl stdenv pkgconfig ncurses;
     inherit (gnome) glib gtk;
@@ -8643,6 +8650,11 @@ let
     inherit fetchurl stdenv emacs;
   };
 
+  qtpfsgui = import ../applications/graphics/qtpfsgui {
+    inherit fetchurl stdenv exiv2 libtiff fftw qt4 ilmbase;
+    openexr = openexr_1_6_1;
+  };
+
   ratpoison = import ../applications/window-managers/ratpoison {
     inherit fetchurl stdenv fontconfig readline;
     inherit (xlibs) libX11 inputproto libXt libXpm libXft