Adding enblend-fuse, libxmi and hugin. Maybe hugin doesn't run well enough still.

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

4 files changed, 78 insertions, 0 deletions

diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
new file mode 100644
index 000000000000..b0bc5317ff9c
--- /dev/null
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, pkgconfig, exiv2, gettext, ilmbase }:
+
+stdenv.mkDerivation {
+  name = "hugin-0.7.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/hugin/hugin-0.7.0.tar.gz;
+    sha256 = "0nbrvzz94gqgk2v1900lly101g0wjz4zksnh5718226n2g8zlccf";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  NIX_LDFLAGS = "-lrt";
+
+  # I added these flags to get all the rpaths right, which I guess they are
+  # taken from the qt4 sources. Not very nice.
+  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
+    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
+    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
+    " -DCMAKE_BUILD_TYPE=Release" +
+    " -DCMAKE_INSTALL_PREFIX=$out";
+
+  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ];
+
+  meta = {
+    homepage = http://hugin.sourceforge.net/;
+    description = "Panoramic imaging toolchain";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
new file mode 100644
index 000000000000..fea49dc7645d
--- /dev/null
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libxmi-1.2";
+  
+  src = fetchurl {
+    url = mirror://gnu/libxmi/libxmi-1.2.tar.gz;
+    sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx";
+  };
+  
+  meta = {
+    description = "Library for rasterizing 2-D vector graphics";
+    homepage = http://www.gnu.org/software/libxmi/;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
new file mode 100644
index 000000000000..d703e90d037d
--- /dev/null
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost }:
+
+stdenv.mkDerivation {
+  name = "enblend-enfuse-3.2";
+
+  src = fetchurl {
+    url = mirror://sourceforge/enblend/enblend-enfuse-3.2.tar.gz;
+    sha256 = "0ly6fdn5ym1v6m1f4gqc6s4zqgrfcys1ypfm82g5qbhh66x6gqw4";
+  };
+
+  buildInputs = [ libtiff libpng lcms libxmi boost ];
+
+  meta = {
+    homepage = http://enblend.sourceforge.net/;
+    description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88235fa2ec7f..2fc35a99187d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -606,6 +606,10 @@ let
     inherit fetchurl stdenv emacs;
   };
 
+  enblendenfuse = import ../tools/graphics/enblend-enfuse {
+    inherit fetchurl stdenv libtiff libpng lcms libxmi boost;
+  };
+
   enscript = import ../tools/text/enscript {
     inherit fetchurl stdenv;
   };
@@ -3588,6 +3592,10 @@ let
     inherit (gtkLibs) glib;
   };
 
+  libxmi = import ../development/libraries/libxmi {
+    inherit fetchurl stdenv;
+  };
+
   libxml2 = import ../development/libraries/libxml2 {
     inherit fetchurl stdenv zlib python;
     pythonSupport = false;
@@ -8284,6 +8292,12 @@ let
     inherit fetchurl stdenv;
   };
 
+  hugin = import ../applications/graphics/hugin {
+    inherit stdenv fetchurl cmake panotools libtiff libpng boost pkgconfig exiv2 gettext ilmbase;
+    wxGTK = wxGTK28;
+    openexr = openexr_1_6_1;
+  };
+
   i810switch = import ../applications/misc/i810 {
     inherit fetchurl stdenv pciutils;
   };