[PATCH 1/2] gnu: octave: Build with curl and graphicsmagick.

[PATCH 1/2] gnu: octave: Build with curl and graphicsmagick.

[Arun Isaac]

* gnu/packages/maths.scm (octave)[inputs]: Add curl and graphicsmagick.
---
 gnu/packages/maths.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9533f5f0a..d274d50bb 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages multiprecision)
@@ -949,7 +950,9 @@ can solve two kinds of problems:
        ("libxft" ,libxft)
        ("mesa" ,mesa)
        ("glu" ,glu)
-       ("zlib" ,zlib)))
+       ("zlib" ,zlib)
+       ("curl" ,curl)
+       ("graphicsmagick" ,graphicsmagick)))
     (native-inputs
      `(("lzip" ,lzip)
        ("gfortran" ,gfortran)
-- 
2.11.0

[PATCH 2/2] gnu: graphicsmagick: Build with 16 bit quantum depth.

[Arun Isaac]

Octave requires graphicsmagick to be built with 16 bit quantum depth.

* gnu/packages/imagemagick.scm (graphicsmagick)[arguments]: Add
  "--with-quantum-depth=16" and "--enable-quantum-library-names" to
  #:configure-flags.
---
 gnu/packages/imagemagick.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 74483965d..d7dbdb0ac 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -187,6 +187,8 @@ script.")
          (list "--with-frozenpaths"
                "--enable-shared=yes"
                "--with-x=yes"
+               "--with-quantum-depth=16"
+               "--enable-quantum-library-names"
                (string-append "--with-gs-font-dir="
                               (assoc-ref %build-inputs "gs-fonts")
                               "/share/fonts/type1/ghostscript"))))
-- 
2.11.0

Re: [PATCH 2/2] gnu: graphicsmagick: Build with 16 bit quantum depth.

[Leo Famulari]

On Thu, Mar 09, 2017 at 01:41:45AM +0530, Arun Isaac wrote:
> Octave requires graphicsmagick to be built with 16 bit quantum depth.
> 
> * gnu/packages/imagemagick.scm (graphicsmagick)[arguments]: Add
>   "--with-quantum-depth=16" and "--enable-quantum-library-names" to
>   #:configure-flags.

Thanks, pushed!

Re: [PATCH 1/2] gnu: octave: Build with curl and graphicsmagick.

[Leo Famulari]

On Thu, Mar 09, 2017 at 01:41:44AM +0530, Arun Isaac wrote:
> * gnu/packages/maths.scm (octave)[inputs]: Add curl and graphicsmagick.

Thanks, pushed!

[PATCH 1/2] gnu: octave: Build with curl and graphicsmagick.

[Arun Isaac]

* gnu/packages/maths.scm (octave)[inputs]: Add curl and graphicsmagick.
---
 gnu/packages/maths.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9533f5f0a..d274d50bb 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages multiprecision)
@@ -949,7 +950,9 @@ can solve two kinds of problems:
        ("libxft" ,libxft)
        ("mesa" ,mesa)
        ("glu" ,glu)
-       ("zlib" ,zlib)))
+       ("zlib" ,zlib)
+       ("curl" ,curl)
+       ("graphicsmagick" ,graphicsmagick)))
     (native-inputs
      `(("lzip" ,lzip)
        ("gfortran" ,gfortran)
-- 
2.11.0

[PATCH 2/2] gnu: graphicsmagick: Build with 16 bit quantum depth.

[Arun Isaac]

Octave requires graphicsmagick to be built with 16 bit quantum depth.

* gnu/packages/imagemagick.scm (graphicsmagick)[arguments]: Add
  "--with-quantum-depth=16" to #:configure-flags.
---
 gnu/packages/imagemagick.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 74483965d..65e42fe3e 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -187,6 +187,7 @@ script.")
          (list "--with-frozenpaths"
                "--enable-shared=yes"
                "--with-x=yes"
+               "--with-quantum-depth=16"
                (string-append "--with-gs-font-dir="
                               (assoc-ref %build-inputs "gs-fonts")
                               "/share/fonts/type1/ghostscript"))))
-- 
2.11.0

[PATCH 1/2] gnu: octave: Build with curl and graphicsmagick.

[Arun Isaac]

* gnu/packages/maths.scm (octave)[inputs]: Add curl and graphicsmagick.
---
 gnu/packages/maths.scm | 107 +++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9533f5f0a..3abdf5375 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages multiprecision)
@@ -923,62 +924,64 @@ can solve two kinds of problems:
 ;; the following packages: texinfo, less, ghostscript, gnuplot.
 (define-public octave
   (package
-    (name "octave")
-    (version "4.2.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/octave/octave-"
-                          version ".tar.lz"))
-      (sha256
-       (base32
-        "09zhhch79jw3ynw39vizx0i2cbd2bjz3sp38pjdzraqrbivpwp92"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("lapack" ,lapack)
-       ("readline" ,readline)
-       ("glpk" ,glpk)
-       ("fftw" ,fftw)
-       ("fftwf" ,fftwf)
-       ("arpack" ,arpack-ng)
-       ("pcre" ,pcre)
-       ("fltk" ,fltk)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("hdf5" ,hdf5)
-       ("libxft" ,libxft)
-       ("mesa" ,mesa)
-       ("glu" ,glu)
-       ("zlib" ,zlib)))
-    (native-inputs
-     `(("lzip" ,lzip)
-       ("gfortran" ,gfortran)
-       ("pkg-config" ,pkg-config)
-       ("perl" ,perl)
-       ;; The following inputs are not actually used in the build process.
-       ;; However, the ./configure gratuitously tests for their existence and
-       ;; assumes that programs not present at build time are also not, and
-       ;; can never be, available at run time!  If these inputs are therefore
-       ;; not present, support for them will be built out.  However, Octave
-       ;; will still run without them, albeit without the features they
-       ;; provide.
-       ("less" ,less)
-       ("texinfo" ,texinfo)
-       ("ghostscript" ,ghostscript)
-       ("gnuplot" ,gnuplot)))
-    (arguments
-     `(#:configure-flags
-       (list (string-append "--with-shell="
-                            (assoc-ref %build-inputs "bash")
-                            "/bin/sh"))))
-    (home-page "https://www.gnu.org/software/octave/")
-    (synopsis "High-level language for numerical computation")
-    (description "GNU Octave is a high-level interpreted language that is
+   (name "octave")
+   (version "4.2.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "mirror://gnu/octave/octave-"
+                         version ".tar.lz"))
+     (sha256
+      (base32
+       "09zhhch79jw3ynw39vizx0i2cbd2bjz3sp38pjdzraqrbivpwp92"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("lapack" ,lapack)
+      ("readline" ,readline)
+      ("glpk" ,glpk)
+      ("fftw" ,fftw)
+      ("fftwf" ,fftwf)
+      ("arpack" ,arpack-ng)
+      ("pcre" ,pcre)
+      ("fltk" ,fltk)
+      ("fontconfig" ,fontconfig)
+      ("freetype" ,freetype)
+      ("hdf5" ,hdf5)
+      ("libxft" ,libxft)
+      ("mesa" ,mesa)
+      ("glu" ,glu)
+      ("zlib" ,zlib)
+      ("curl" ,curl)
+      ("graphicsmagick" ,graphicsmagick)))
+   (native-inputs
+    `(("lzip" ,lzip)
+      ("gfortran" ,gfortran)
+      ("pkg-config" ,pkg-config)
+      ("perl" ,perl)
+      ;; The following inputs are not actually used in the build process.
+      ;; However, the ./configure gratuitously tests for their existence and
+      ;; assumes that programs not present at build time are also not, and
+      ;; can never be, available at run time!  If these inputs are therefore
+      ;; not present, support for them will be built out.  However, Octave
+      ;; will still run without them, albeit without the features they
+      ;; provide.
+      ("less" ,less)
+      ("texinfo" ,texinfo)
+      ("ghostscript" ,ghostscript)
+      ("gnuplot" ,gnuplot)))
+   (arguments
+    `(#:configure-flags
+      (list (string-append "--with-shell="
+                           (assoc-ref %build-inputs "bash")
+                           "/bin/sh"))))
+   (home-page "https://www.gnu.org/software/octave/")
+   (synopsis "High-level language for numerical computation")
+   (description "GNU Octave is a high-level interpreted language that is
 specialized for numerical computations.  It can be used for both linear and
 non-linear applications and it provides great support for visualizing results.
 Work may be performed both at the interactive command-line as well as via
 script files.")
-    (license license:gpl3+)))
+   (license license:gpl3+)))
 
 (define-public opencascade-oce
   (package
-- 
2.11.0

[PATCH 2/2] gnu: graphicsmagick: Build with 16 bit quantum depth.

[Arun Isaac]

Octave requires graphicsmagick to be built with 16 bit quantum depth.

* gnu/packages/imagemagick.scm (graphicsmagick)[arguments]: Add
  "--with-quantum-depth=16" to #:configure-flags.
---
 gnu/packages/imagemagick.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 74483965d..65e42fe3e 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -187,6 +187,7 @@ script.")
          (list "--with-frozenpaths"
                "--enable-shared=yes"
                "--with-x=yes"
+               "--with-quantum-depth=16"
                (string-append "--with-gs-font-dir="
                               (assoc-ref %build-inputs "gs-fonts")
                               "/share/fonts/type1/ghostscript"))))
-- 
2.11.0

Re: [PATCH 2/2] gnu: graphicsmagick: Build with 16 bit quantum depth.

[Leo Famulari]

On Tue, Mar 07, 2017 at 10:56:47PM +0530, Arun Isaac wrote:
> Octave requires graphicsmagick to be built with 16 bit quantum depth.
> 
> * gnu/packages/imagemagick.scm (graphicsmagick)[arguments]: Add
>   "--with-quantum-depth=16" to #:configure-flags.

In case anyone is wonder what this option does, here is documentation
from source file 'www/INSTALL-unix.rst':


--with-quantum-depth

  This option allows the user to specify the number of bits to use per
  pixel quantum (the size of the red, green, blue, and alpha pixel
  components. When an image file with less depth is read, smaller
  values are scaled up to this size for processing, and are scaled
  down from this size when a file with lower depth is written.  For
  example, "--with-quantum-depth=8" builds GraphicsMagick using 8-bit
  quantums. Most computer display adaptors use 8-bit
  quantums. Currently supported arguments are 8, 16, or 32.  The
  default is 8. This option is the most important option in
  determining the overall run-time performance of GraphicsMagick.

  The number of bits in a quantum determines how many values it may
  contain. Each quantum level supports 256 times as many values as
  the previous level. The following table shows the range available
  for various quantum sizes.

      ============  =====================  =================
      QuantumDepth  Valid Range (Decimal)  Valid Range (Hex)
      ============  =====================  =================
            8                0-255               00-FF
           16               0-65535            0000-FFFF
           32            0-4294967295      00000000-FFFFFFFF
      ============  =====================  =================

  Larger pixel quantums cause GraphicsMagick to run more slowly and to
  require more memory. For example, using sixteen-bit pixel quantums
  causes GraphicsMagick to run 15% to 50% slower (and take twice as
  much memory) than when it is built to support eight-bit pixel
  quantums.  Regardless, the GraphicsMagick authors prefer to use
  sixteen-bit pixel quantums since they support all common image
  formats and assure that there is no loss of color precision.

  The amount of virtual memory consumed by an image can be computed
  by the equation (QuantumDepth*Rows*Columns*5)/8. This is an
  important consideration when resources are limited, particularly
  since processing an image may require several images to be in
  memory at one time. The following table shows memory consumption
  values for a 1024x768 image:

      ============  ==============
      QuantumDepth  Virtual Memory
      ============  ==============
          8              3MB
         16              8MB
         32             15MB
      ============  ==============

  GraphicsMagick performs all image processing computations using
  floating point or non-lossy integer arithmetic, so results are very
  accurate.  Increasing the quantum storage size decreases the amount
  of quantization noise (usually not visible at 8 bits) and helps
  prevent countouring and posterization in the image.

  Consider also using the --enable-quantum-library-names configure
  option so that installed shared libraries include the quantum depth
  as part of their names so that shared libraries using different
  quantum depth options may co-exist in the same directory.

Re: [PATCH 2/2] gnu: graphicsmagick: Build with 16 bit quantum depth.

[Arun Isaac]

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


>   Consider also using the --enable-quantum-library-names configure
>   option so that installed shared libraries include the quantum depth
>   as part of their names so that shared libraries using different
>   quantum depth options may co-exist in the same directory.

I have send a new patchset with this flag included.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]