[bug#33770] [PATCH] gnu: Add vips.

[bug#33770] [PATCH] gnu: Add vips.

[L p R n d n]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-vips.patch --]
[-- Type: text/x-patch, Size: 2809 bytes --]

From d5d6b66818b47f3ea87e13bf0236294b91f942fb Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Wed, 5 Dec 2018 18:59:34 +0100
Subject: [PATCH] gnu: Add vips.

* gnu/packages/image-processing.scm (vips): New variable.
---
 gnu/packages/image-processing.scm | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 0901dc429..df0099c7d 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -35,13 +35,18 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
@@ -396,3 +401,45 @@ vision algorithms.  It can be used to do things like:
 @end itemize\n")
     (home-page "https://opencv.org/")
     (license license:bsd-3)))
+
+(define-public vips
+  (package
+    (name "vips")
+    (version "8.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/libvips/libvips/releases/download/v"
+                    version "/vips-" version ".tar.gz"))
+              (sha256
+               (base32 "1w3b90pdw7nj2p0gb4f96h6zhmga513f968ldfhz1rkhg7y81c0s"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("gobject-introspection" ,gobject-introspection)))
+    (inputs
+     `(("glib" ,glib)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("librsvg" ,librsvg)
+       ("libtiff" ,libtiff)
+       ("libexif" ,libexif)
+       ("giflib" ,giflib)
+       ("libgsf" ,libgsf)
+       ("fftw" ,fftw)
+       ("poppler" ,poppler)
+       ("pango" ,pango)
+       ("lcms" ,lcms)
+       ("matio" ,matio)
+       ("libwebp" ,libwebp)
+       ("niftilib" ,niftilib)
+       ("openexr" ,openexr)
+       ("orc" ,orc)
+       ("imagemagick" ,imagemagick)
+       ("libxml2" ,libxml2)
+       ("expat" ,expat)
+       ("hdf5" ,hdf5)))
+    (home-page "https://libvips.github.io/libvips/")
+    (synopsis "A free image processing system")
+    (description "vips is a demand-driven, horizontally threaded image processing library")
+    (license license:lgpl2.1+)))
-- 
2.19.2

[bug#33770] [PATCH] gnu: Add nip2.

[L p R n d n]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-nip2.patch --]
[-- Type: text/x-patch, Size: 2655 bytes --]

From e90b425484ed84b87333a168447a7128a53a8434 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Wed, 5 Dec 2018 19:03:13 +0100
Subject: [PATCH] gnu: Add nip2.

* gnu/packages/image-processing.scm (nip2): New variable.
---
 gnu/packages/image-processing.scm | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index df0099c7d..226564885 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -31,9 +31,11 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
@@ -443,3 +445,47 @@ vision algorithms.  It can be used to do things like:
     (synopsis "A free image processing system")
     (description "vips is a demand-driven, horizontally threaded image processing library")
     (license license:lgpl2.1+)))
+
+(define-public nip2
+  (package
+    (name "nip2")
+    (version "8.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/libvips/nip2/releases/download/v"
+             version "/nip2-" version ".tar.gz"))
+       (sha256
+        (base32 "08dxfds4n1vxdilxcw01741a2r6fxyhawi656b7f0hy6znnkbsbc"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f))                    ;; tests need $HOME/.nip2-8.7.0
+    (inputs
+     `(("vips" ,vips)
+       ("glib" ,glib)
+       ("libtiff" ,libtiff)
+       ("gtk+-2" ,gtk+-2)
+       ("libxml2" ,libxml2)
+       ("libexif" ,libexif)
+       ("librsvg" ,librsvg)
+       ("fftw" ,fftw)
+       ("libgsf" ,libgsf)
+       ("imagemagick" ,imagemagick)
+       ("orc" ,orc)
+       ("matio" ,matio)
+       ("lcms" ,lcms)
+       ("libwebp" ,libwebp)
+       ("openexr" ,openexr)
+       ("poppler" ,poppler)
+       ("gsl" ,gsl)))
+    (native-inputs
+     `(("flex" ,flex)
+       ("bison" ,bison)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/libvips/nip2")
+    (synopsis "A spreadsheet-like GUI for libvips")
+    (description "nip2 is a GUI for the VIPS image processing library.
+It's a little like a spreadsheet: you create a set of formula connecting your
+objects together, and on a change nip2 recalculates")
+    (license license:gpl2)))
-- 
2.19.2

[bug#33770] [PATCH] gnu: Add vips.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 562 bytes --]

Hello!

L  p R n  d n    <guix@lprndn.info> skribis:

>>From d5d6b66818b47f3ea87e13bf0236294b91f942fb Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Wed, 5 Dec 2018 18:59:34 +0100
> Subject: [PATCH] gnu: Add vips.
>
> * gnu/packages/image-processing.scm (vips): New variable.

Applied with these minor changes.  Please let me know if anything is
amiss!

Regarding package synopses and descriptions, please see
<https://www.gnu.org/software/guix/manual/en/html_node/Synopses-and-Descriptions.html>.

Thank you!

Ludo’.


[-- Attachment #2: Type: text/x-patch, Size: 1689 bytes --]

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index df0099c7df..03080d5fde 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+;;; Copyright © 2018 Lprndn <guix@lprndn.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -440,6 +441,16 @@ vision algorithms.  It can be used to do things like:
        ("expat" ,expat)
        ("hdf5" ,hdf5)))
     (home-page "https://libvips.github.io/libvips/")
-    (synopsis "A free image processing system")
-    (description "vips is a demand-driven, horizontally threaded image processing library")
+    (synopsis "Image processing library")
+    (description
+     "libvips is a demand-driven, horizontally threaded image processing
+library for C and comes with a command-line interface.  It has around 300
+operations covering arithmetic, histograms, convolution, morphological
+operations, frequency filtering, colour, resampling, statistics and others.
+It supports a large range of numeric formats, from 8-bit int to 128-bit
+complex.  Images can have any number of bands.  It supports a good range of
+image formats, including JPEG, TIFF, PNG, WebP, FITS, Matlab, OpenEXR, PDF,
+SVG, HDR, PPM, CSV, GIF, Analyze, NIfTI, DeepZoom, and OpenSlide.  It can also
+load images via ImageMagick or GraphicsMagick, letting it load formats like
+DICOM.  libvips runs quickly and uses little memory.")
     (license license:lgpl2.1+)))

[bug#33770] [PATCH] gnu: Add nip2.

[Ludovic Courtès]

Hello!

L  p R n  d n    <guix@lprndn.info> skribis:

>>From e90b425484ed84b87333a168447a7128a53a8434 Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Wed, 5 Dec 2018 19:03:13 +0100
> Subject: [PATCH] gnu: Add nip2.
>
> * gnu/packages/image-processing.scm (nip2): New variable.

Could you run ‘guix lint’ on this package and address any issues it
reports?

> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://github.com/libvips/nip2/releases/download/v"
> +             version "/nip2-" version ".tar.gz"))

We now try to avoid GitHub-generated tarballs and instead use
‘git-fetch’ to retrieve software from GitHub.  Could you make this
change?

> +    (arguments
> +     `(#:tests? #f))                    ;; tests need $HOME/.nip2-8.7.0

Could you try adding a phase that sets the “HOME” environment variable
right before the ‘check’ phase?  See for example ‘python-biopython’ on
how to do it.

> +    (home-page "https://github.com/libvips/nip2")
> +    (synopsis "A spreadsheet-like GUI for libvips")
> +    (description "nip2 is a GUI for the VIPS image processing library.
> +It's a little like a spreadsheet: you create a set of formula connecting your
> +objects together, and on a change nip2 recalculates")
> +    (license license:gpl2)))

Source file headers contain the “or any later version” wording so it
should be ‘license:gpl2+’.

Apart from that it LGTM!

Thanks in advance,
Ludo’.

bug#33770: [PATCH] gnu: Add nip2.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 622 bytes --]

Hi,

L  p R n  d n    <guix@lprndn.info> skribis:

> Hello,
>
> Thanks for the review!
>
> Here is a new version of the Nip2 patch.
> For the source, I thought only Github "archives" urls where problematic? 

Oh you’re right, I was confused.

> From 5c32d2e6c940e2d3aef91071417a9774ab7cfe4b Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Wed, 5 Dec 2018 19:03:13 +0100
> Subject: [PATCH] gnu: Add nip2.
>
> * gnu/packages/image-processing.scm (nip2): New variable.

Applied with the tiny changes below (the configure phase would fail
without libjpeg.)  Thank you!

Ludo’.


[-- Attachment #2: Type: text/x-patch, Size: 2226 bytes --]

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index f9be2dcab8..9c2ec50bec 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+;;; Copyright © 2018 Lprndn <guix@lprndn.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -460,13 +461,13 @@ vision algorithms.  It can be used to do things like:
         (base32 "08dxfds4n1vxdilxcw01741a2r6fxyhawi656b7f0hy6znnkbsbc"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #t
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          ;; test_conv.ws keep failing so disabling for now
          (add-after 'unpack 'disable-test-conv
            (lambda _
-             (delete-file "test/workspaces/test_conv.ws")))
+             (delete-file "test/workspaces/test_conv.ws")
+             #t))
          (add-before 'check 'set-home
            (lambda _
              (setenv "HOME" "/tmp") #t)))))
@@ -477,6 +478,7 @@ vision algorithms.  It can be used to do things like:
        ("gtk+-2" ,gtk+-2)
        ("libxml2" ,libxml2)
        ("libexif" ,libexif)
+       ("libjpeg" ,libjpeg)                       ;required by vips.pc
        ("librsvg" ,librsvg)
        ("fftw" ,fftw)
        ("libgsf" ,libgsf)
@@ -494,7 +496,8 @@ vision algorithms.  It can be used to do things like:
        ("pkg-config" ,pkg-config)))
     (home-page "https://github.com/libvips/nip2")
     (synopsis "Spreadsheet-like GUI for libvips")
-    (description "GUI for the VIPS image processing library.
-It's a little like a spreadsheet: you create a set of formula connecting your
-objects together, and on a change nip2 recalculates")
+    (description "This package provide a graphical user interface (GUI) for
+the VIPS image processing library.  It's a little like a spreadsheet: you
+create a set of formula connecting your objects together, and on a change nip2
+recalculates.")
     (license license:gpl2+)))