From a608a6f52a6d7021a802a3e9344a2f66815fadeb Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sat, 12 Jul 2014 13:17:53 +0200 Subject: [PATCH 1/3] enblend-enfuse: update to version 4.1.3 --- .../tools/graphics/enblend-enfuse/default.nix | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index b77d63d510d..bfb01ead302 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,34 +1,19 @@ -{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost, mesa, freeglut -, pkgconfig, perl, glew }: +{ stdenv, fetchurl +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra +, pkgconfig, perl }: stdenv.mkDerivation rec { - name = "enblend-enfuse-4.0"; + name = "enblend-enfuse-4.1.3"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "1i2kq842zrncpadarhcikg447abmh5r7a5js3mzg553ql3148am1"; + sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; }; - buildInputs = [ libtiff libpng lcms libxmi boost mesa freeglut glew ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; nativeBuildInputs = [ perl pkgconfig ]; - patches = - let - prefix = "http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff"; - in map fetchurl [ - { - url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx"; - name = "ftbfs-libpng15.patch"; - sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg"; - } - { - url = "${prefix}/101796703d73/src/vigra_impex/png.cxx"; - name = "ftbfs-libpng15.patch"; - sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005"; - } - ]; - meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; From 75518f748f6ac25cd0f7ba5090234791de5f2085 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sat, 12 Jul 2014 13:18:22 +0200 Subject: [PATCH 2/3] hugin: update to version 2013.0.0 --- pkgs/applications/graphics/hugin/default.nix | 28 +++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a9ff7ef25c3..c9b1a9a9f23 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,25 +1,35 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost -, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa -, freeglut, glew, libXmu, libXi, tclap }: +{ stdenv, cmake, fetchurl, gnumake, pkgconfig +, boost, gettext, tclap, wxGTK +, freeglut, glew, libXi, libXmu, mesa +, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, openexr, panotools, perlPackages +}: stdenv.mkDerivation rec { - name = "hugin-2011.4.0"; + name = "hugin-2013.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf"; + sha256 = "1mgbvg09xvf0zcm9jfv5lb65nd292l86ffa23yp4pzm6izaiwkj8"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; -#NIX_LDFLAGS = "-lrt"; + buildInputs = [ boost gettext tclap wxGTK + freeglut glew libXi libXmu mesa + exiv2 ilmbase lensfun libtiff libpng openexr panotools + ]; - buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap - exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; + # disable installation of the python scripting interface + cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; nativeBuildInputs = [ cmake pkgconfig ]; - propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ]; + # commandline tools needed by the hugin batch processor + # you may have to tell hugin (in the preferences) where these binaries reside + propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake + perlPackages.ImageExifTool + ]; postInstall = '' mkdir -p "$out/nix-support" From df76cbaa212074427bb2ce33144afbfa7c9d5c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 12 Aug 2014 21:17:53 +0200 Subject: [PATCH 3/3] hugin, enblend-enfuse: enbaleParallelBuilding, default boost Also unset meta.broken. --- pkgs/applications/graphics/hugin/default.nix | 3 ++- pkgs/tools/graphics/enblend-enfuse/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 20d2b2a4b2d..88912cbda55 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; + enableParallelBuilding = true; + # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake @@ -42,6 +44,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index fc9a22df548..6b65d3df0d3 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; + enableParallelBuilding = true; + meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 358cce02753..8a0fd0ed737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -964,9 +964,7 @@ let emv = callPackage ../tools/misc/emv { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { - boost = boost149; - }; + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { };