From d9cef6128cd0b632fcb60eed0a29b9324abd97fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 1 Sep 2015 21:36:32 +0200 Subject: gnu: Add libraw. * gnu/packages/photo.scm (libraw): New variable. --- gnu/packages/photo.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index bf3c76c51e..cbfc1e8730 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2015 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,25 @@ #:use-module (gnu packages perl) #:use-module (gnu packages base)) +(define-public libraw + (package + (name "libraw") + (version "0.17.0") + (source (origin + (method url-fetch) + (uri (string-append "http://www.libraw.org/data/LibRaw-" + version ".tar.gz")) + (sha256 + (base32 + "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6")))) + (build-system gnu-build-system) + (home-page "http://www.libraw.org") + (synopsis "Raw image decoder") + (description + "LibRaw is a library for reading RAW files obtained from digital photo +cameras (CRW/CR2, NEF, RAF, DNG, and others).") + (license lgpl2.1+))) + (define-public libexif (package (name "libexif") -- cgit v1.2.3 From 341f49657784d55f7e3207d00bdfd26a367a332c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 4 Sep 2015 19:26:07 +0200 Subject: gnu: Add prefix to license imports in (gnu packages photo). * gnu/packages/photo.scm: Import (guix licenses) with #:prefix license: to avoid an impending clash with the import of zlib from both (guix licenses) and (gnu packages compression). --- gnu/packages/photo.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index cbfc1e8730..4dba088fdd 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages photo) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -48,7 +49,7 @@ (description "LibRaw is a library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others).") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libexif (package @@ -67,7 +68,7 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (description "The libexif C library allows applications to read, edit, and save EXIF data as produced by digital cameras.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libgphoto2 (package @@ -97,7 +98,7 @@ MTP, and other vendor specific protocols for controlling and transferring data from digital cameras.") ;; 'COPYING' says LGPLv2.1+, but in practices files are under LGPLv2+. - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public gphoto2 (package @@ -140,7 +141,7 @@ number of different digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.") ;; Files are typically under LGPLv2+, but 'COPYING' says GPLv2+. - (license gpl2+))) + (license license:gpl2+))) (define-public perl-image-exiftool (package -- cgit v1.2.3 From f06441951c4178d8228ba3e3ca1841934f7a86b8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 4 Sep 2015 19:28:26 +0200 Subject: gnu: Order module imports in (gnu packages photo) alphabetically. * gnu/packages/photo.scm: Order module imports alphabetically. --- gnu/packages/photo.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4dba088fdd..38417e3781 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -19,18 +19,18 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages photo) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages libusb) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) #:use-module (gnu packages autotools) - #:use-module (gnu packages readline) - #:use-module (gnu packages popt) + #:use-module (gnu packages base) + #:use-module (gnu packages libusb) #:use-module (gnu packages perl) - #:use-module (gnu packages base)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) + #:use-module (gnu packages readline)) (define-public libraw (package -- cgit v1.2.3 From 0e6412c1d0465a6b3260f4855f3aad76b8b475e6 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 5 Sep 2015 18:41:27 +0200 Subject: gnu: Add libpano13. * gnu/packages/photo.scm (libpano13): New variable. --- gnu/packages/photo.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 38417e3781..3ecb1d720c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages photo) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix download) @@ -26,6 +27,8 @@ #:use-module (guix packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -175,3 +178,29 @@ MTP, and much more.") "This package provides the 'exiftool' command and the 'Image::ExifTool' Perl library to manipulate EXIF tags of digital images.") (license (package-license perl)))) + +(define-public libpano13 + (package + (name "libpano13") + (version "2.9.19") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/panotools/libpano13/" + "libpano13-" version "/" + "libpano13-" version ".tar.gz")) + (sha256 + (base32 + "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3")))) + (build-system cmake-build-system) + (inputs + `(("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("zlib" ,zlib))) + (home-page "http://panotools.sourceforge.net/") + (synopsis "Library for panoramic images") + (description + "The libpano13 package contains the backend library written by the +Panorama Tools project for building panoramic images from a set of +overlapping images, as well as some command line tools.") + (license license:gpl2+))) -- cgit v1.2.3 From 8957241dd461acb17068411eb9542ff8267e7cfc Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 6 Sep 2015 23:12:51 +0200 Subject: gnu: Add enblend-enfuse. * gnu/packages/photo.scm (enblend-enfuse): New variable. --- gnu/packages/photo.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 3ecb1d720c..6af4e4a214 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -25,15 +25,25 @@ #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gl) + #:use-module (gnu packages graphics) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages libusb) + #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) - #:use-module (gnu packages readline)) + #:use-module (gnu packages readline) + #:use-module (gnu packages web) + #:use-module (gnu packages xfig) + #:use-module (gnu packages xml)) (define-public libraw (package @@ -204,3 +214,47 @@ Perl library to manipulate EXIF tags of digital images.") Panorama Tools project for building panoramic images from a set of overlapping images, as well as some command line tools.") (license license:gpl2+))) + +(define-public enblend-enfuse + (package + (name "enblend-enfuse") + (version "4.1.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/enblend/" + name "/" + name "-" (version-major+minor version) "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("perl" ,perl) + ("perl-timedate" ,perl-timedate) + ;; for building the documentation + ("gnuplot" ,gnuplot) + ("imagemagick" ,imagemagick) + ("libxml2" ,libxml2) + ("tidy" ,tidy) + ("transfig" ,transfig))) + (inputs + `(("boost" ,boost) + ("gsl" ,gsl) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("openexr" ,openexr) + ("vigra" ,vigra) + ("zlib" ,zlib))) + (arguments + `(#:configure-flags `("--enable-openmp"))) + (home-page "http://enblend.sourceforge.net/") + (synopsis "Tools for combining and blending images") + (description + "Enblend blends away the seams in a panoramic image mosaic using a +multi-resolution spline. Enfuse merges different exposures of the same +scene to produce an image that looks much like a tone-mapped image.") + (license license:gpl2+))) -- cgit v1.2.3