From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dF2nO-0003E8-Qs for guix-patches@gnu.org; Sun, 28 May 2017 14:20:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dF2nK-00032F-RU for guix-patches@gnu.org; Sun, 28 May 2017 14:20:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dF2nK-000329-Nq for guix-patches@gnu.org; Sun, 28 May 2017 14:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dF2nK-0004fR-7X for guix-patches@gnu.org; Sun, 28 May 2017 14:20:02 -0400 Subject: bug#27118: [PATCH] Add hugin. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dF2mh-0002ng-8B for guix-patches@gnu.org; Sun, 28 May 2017 14:19:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dF2md-0002wA-8O for guix-patches@gnu.org; Sun, 28 May 2017 14:19:23 -0400 Received: from mailrelay1.public.one.com ([91.198.169.124]:38517) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dF2mc-0002vz-Vs for guix-patches@gnu.org; Sun, 28 May 2017 14:19:19 -0400 Date: Sun, 28 May 2017 20:19:13 +0200 From: Andreas Enge Message-ID: <20170528181913.GA9008@jurong> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8t9RHnE3ZwKMSgU+" Content-Disposition: inline Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27118@debbugs.gnu.org --8t9RHnE3ZwKMSgU+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, the attached patch adds hugin, a tool for combining several photos into a panorama. It works on an example. Comments are welcome. Andreas --8t9RHnE3ZwKMSgU+ Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-Add-hugin.patch" Content-Transfer-Encoding: 8bit >From fb114699c4c8058f12614524144ef0a03467669c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 28 May 2017 20:08:15 +0200 Subject: [PATCH] gnu: Add hugin. * gnu/packages/photo.scm (hugin): New variable. --- gnu/packages/photo.scm | 77 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index b68aea9d7..cb6ce7ad6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Roel Janssen ;;; @@ -28,12 +28,14 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) @@ -53,7 +55,9 @@ #:use-module (gnu packages readline) #:use-module (gnu packages tex) #:use-module (gnu packages web) + #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xfig) + #:use-module (gnu packages xorg) #:use-module (gnu packages xml)) (define-public libraw @@ -374,3 +378,74 @@ developer. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.") (license license:gpl3+))) + +(define-public hugin + (package + (name "hugin") + (version "2016.2.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/hugin/hugin/hugin-" + (version-major+minor version) + "/hugin-" version ".tar.bz2")) + (sha256 + (base32 + "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl")))) + (build-system cmake-build-system) + (native-inputs + `(("gettext" ,gnu-gettext) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("enblend-enfuse" ,enblend-enfuse) + ("exiv2" ,exiv2) + ("fftw" ,fftw) + ("flann" ,flann) + ("freeglut" ,freeglut) + ("glew" ,glew) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg) + ("libpano13" ,libpano13) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("libxi" ,libxi) + ("libxmu" ,libxmu) + ("mesa" ,mesa) + ("openexr" ,openexr) + ("sqlite" ,sqlite) + ("vigra" ,vigra) + ("wxwidgets" ,wxwidgets) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; no check target + #:configure-flags + (list + ;; The header files of ilmbase (propagated by openexr) are not found + ;; when included by the header files of openexr, and an explicit + ;; flag needs to be set. + (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs "ilmbase") + "/include/OpenEXR") + ;; Disable installation of the Python scripting interface. + ;; It would require the additional inputs python and swig. + ;; Installation would need to be tweaked, as it tries to install + ;; into the python directory. + "-DBUILD_HSI=OFF") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'substitute + (lambda _ + (substitute* "src/hugin1/base_wx/StitchingExecutor.cpp" + (("wxT\\(\"enblend\"\\)") + (string-append "wxT(\"" (which "enblend") "\")")) + (("wxT\\(\"enfuse\"\\)") + (string-append "wxT(\"" (which "enfuse") "\")")))))) + )) + (home-page "http://hugin.sourceforge.net/") + (synopsis "Panorama photo stitcher") + (description + "Hugin is an easy to use panoramic imaging toolchain with a graphical +user interface. It can be used to assemble a mosaic of photographs into +a complete panorama and stitch any series of overlapping pictures.") + (license license:gpl2+))) + -- 2.13.0 --8t9RHnE3ZwKMSgU+--