From 63e6f8a5829937605ac6f92f030a0d2f6f4a1130 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 28 Dec 2020 13:17:49 +0100 Subject: gnu: vips: Update to 8.10.5. * gnu/packages/image-processing.scm (vips): Update to 8.10.5. Signed-off-by: Efraim Flashner --- gnu/packages/image-processing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index e313b14ebf..3dbe6f34f1 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -520,7 +520,7 @@ vision algorithms. It can be used to do things like: (define-public vips (package (name "vips") - (version "8.7.4") + (version "8.10.5") (source (origin (method url-fetch) @@ -528,7 +528,7 @@ vision algorithms. It can be used to do things like: "https://github.com/libvips/libvips/releases/download/v" version "/vips-" version ".tar.gz")) (sha256 - (base32 "01gjhcrl6zj7mcj1al717v5jsniahplqhz1xkfh2j78vyfl1hxff")))) + (base32 "1n6gw7cw66rfn1wdb92ydpkv7gfmjiinsg6d6gqxpdja6gsz5vm4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 5d99167a46def3ac290a3005ff515ae4498e0c2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 31 Dec 2020 14:58:15 +0200 Subject: gnu: vips: Sort inputs alphabetically. * gnu/packages/image-processing.scm (vips)[native-inputs]: Sort inputs alphabetically. [inputs]: Same. --- gnu/packages/image-processing.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 3dbe6f34f1..8d31029963 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -531,30 +531,30 @@ vision algorithms. It can be used to do things like: (base32 "1n6gw7cw66rfn1wdb92ydpkv7gfmjiinsg6d6gqxpdja6gsz5vm4")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("gobject-introspection" ,gobject-introspection))) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) (inputs - `(("glib" ,glib) + `(("expat" ,expat) + ("fftw" ,fftw) + ("giflib" ,giflib) + ("glib" ,glib) + ("hdf5" ,hdf5) + ("imagemagick" ,imagemagick) + ("lcms" ,lcms) + ("libexif" ,libexif) + ("libgsf" ,libgsf) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("librsvg" ,librsvg) ("libtiff" ,libtiff) - ("libexif" ,libexif) - ("giflib" ,giflib) - ("libgsf" ,libgsf) - ("fftw" ,fftw) - ("poppler" ,poppler) - ("pango" ,pango) - ("lcms" ,lcms) - ("matio" ,matio) + ("libxml2" ,libxml2) ("libwebp" ,libwebp) + ("matio" ,matio) ("niftilib" ,niftilib) ("openexr" ,openexr) ("orc" ,orc) - ("imagemagick" ,imagemagick) - ("libxml2" ,libxml2) - ("expat" ,expat) - ("hdf5" ,hdf5))) + ("pango" ,pango) + ("poppler" ,poppler))) (home-page "https://libvips.github.io/libvips/") (synopsis "Multithreaded image processing system with low memory needs") (description -- cgit v1.2.3 From 58a5746e7361c317e352920745fbe2ad01e2e802 Mon Sep 17 00:00:00 2001 From: Oleh Malyi Date: Tue, 5 Jan 2021 00:23:38 +0000 Subject: gnu: Add stiff. * gnu/packages/image-processing.scm (stiff): New variable. Co-authored-by: Sharlatan Hellseher Signed-off-by: Leo Famulari --- gnu/packages/image-processing.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 8d31029963..388e91d31a 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Brendan Tildesley +;;; Copyright © 2021 Oleh Malyi ;;; ;;; This file is part of GNU Guix. ;;; @@ -1064,3 +1065,27 @@ this project. Scan Tailer Advanced is a fork of Scan Tailer that merges Scan Tailor Featured and Scan Tailor Enhanced versions as well as including many more bug fixes.") (license license:gpl3+)))) + +(define-public stiff + (package + (name "stiff") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.astromatic.net/download/stiff/stiff-" + version ".tar.gz")) + (sha256 + (base32 "14m92dskzw7bwsr64ha4p0mj3ndv13gwcbfic3qxrs3zq5353s7l")))) + (build-system gnu-build-system) + (inputs + `(("libtiff" ,libtiff) + ("zlib" ,zlib) + ("libjpeg-turbo" ,libjpeg-turbo))) + (home-page "https://www.astromatic.net/software/stiff") + (synopsis "Convert scientific FITS images to TIFF format") + (description + "STIFF is a program that converts scientific @acronym{FITS, Flexible Image +Transport System} images to the more popular TIFF format for illustration +purposes.") + (license license:gpl3+))) -- cgit v1.2.3 From b17b54113a0952b7c66653169161069a894dc9b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 7 Jan 2021 21:43:23 +0200 Subject: gnu: vtk: Remove some vendored libraries. * gnu/packages/image-processing.scm (vtk)[source]: Add snippet to remove some vendored sources. --- gnu/packages/image-processing.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 388e91d31a..613d55beaa 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018 Lprndn -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2021 Efraim Flashner ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Pierre Neidhardt @@ -252,7 +252,17 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")))) + "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each + (lambda (dir) + (delete-file-recursively + (string-append "ThirdParty/" dir "/vtk" dir))) + '("expat" "freetype" "hdf5" "jpeg" "jsoncpp" "libxml2" + "png" "tiff" "zlib")) + #t)))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. -- cgit v1.2.3 From fac4e4aee51c85b9e2058071c4970217769d1f01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 7 Jan 2021 21:45:04 +0200 Subject: gnu: vtk: Sort inputs alphabetically. * gnu/packages/image-processing.scm (vtk)[inputs]: Sort alphabetically. --- gnu/packages/image-processing.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 613d55beaa..cf84bfb4aa 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -279,21 +279,21 @@ many popular formats.") "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE") #:tests? #f)) ;XXX: no "test" target (inputs - `(("libXt" ,libxt) - ("xorgproto" ,xorgproto) - ("libX11" ,libx11) - ("libxml2" ,libxml2) - ("mesa" ,mesa) - ("glu" ,glu) - ("expat" ,expat) + `(("expat" ,expat) ("freetype" ,freetype) + ("glu" ,glu) ("hdf5" ,hdf5) ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) ("libogg" ,libogg) ("libtheora" ,libtheora) + ("libX11" ,libx11) + ("libxml2" ,libxml2) + ("libXt" ,libxt) + ("mesa" ,mesa) ("png" ,libpng) ("tiff" ,libtiff) + ("xorgproto" ,xorgproto) ("zlib" ,zlib))) (home-page "https://vtk.org/") (synopsis "Libraries for 3D computer graphics") -- cgit v1.2.3 From a675c01ffeb416b82d8e1e7aba1a8fd557cb9fa2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 7 Jan 2021 22:28:21 +0200 Subject: gnu: vtk: Use more system libraries. * gnu/packages/image-processing.scm (vtk)[source]: Remove more bundled sources in snippet. [arguments]: Add to configure-flags to use more system libraries. [inputs]: Remove libogg. Add double-conversion, eigen, gl2ps, glew, lz4, netcdf, proj.4 and sqlite. --- gnu/packages/image-processing.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index cf84bfb4aa..c3ea8491d9 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tbb) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -260,38 +261,59 @@ many popular formats.") (lambda (dir) (delete-file-recursively (string-append "ThirdParty/" dir "/vtk" dir))) - '("expat" "freetype" "hdf5" "jpeg" "jsoncpp" "libxml2" - "png" "tiff" "zlib")) + ;; ogg, pugixml depended upon unconditionally + '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" + "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" + "netcdf" "png" "sqlite" "theora" "tiff" "zlib")) #t)))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. - ;; -DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE requires netcdf_cxx - #:configure-flags '("-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE" + #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE" + ;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=TRUE" ; not honored + "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=TRUE" + "-DVTK_USE_SYSTEM_EIGEN:BOOL=TRUE" + "-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE" "-DVTK_USE_SYSTEM_FREETYPE:BOOL=TRUE" + "-DVTK_USE_SYSTEM_GL2PS:BOOL=TRUE" + "-DVTK_USE_SYSTEM_GLEW:BOOL=TRUE" "-DVTK_USE_SYSTEM_HDF5:BOOL=TRUE" "-DVTK_USE_SYSTEM_JPEG:BOOL=TRUE" "-DVTK_USE_SYSTEM_JSONCPP:BOOL=TRUE" + "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=TRUE" "-DVTK_USE_SYSTEM_LIBXML2:BOOL=TRUE" - "-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=TRUE" + "-DVTK_USE_SYSTEM_LZ4:BOOL=TRUE" + "-DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE" "-DVTK_USE_SYSTEM_PNG:BOOL=TRUE" + ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=TRUE" ; breaks IO/CityGML + "-DVTK_USE_SYSTEM_SQLITE:BOOL=TRUE" + "-DVTK_USE_SYSTEM_THEORA:BOOL=TRUE" "-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE" "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE") - #:tests? #f)) ;XXX: no "test" target + #:tests? #f)) ;XXX: test data not included (inputs - `(("expat" ,expat) + `(("double-conversion" ,double-conversion) + ("eigen" ,eigen) + ("expat" ,expat) ("freetype" ,freetype) + ("gl2ps" ,gl2ps) + ("glew" ,glew) ("glu" ,glu) ("hdf5" ,hdf5) ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) - ("libogg" ,libogg) + ;("libogg" ,libogg) ("libtheora" ,libtheora) ("libX11" ,libx11) ("libxml2" ,libxml2) ("libXt" ,libxt) + ("lz4" ,lz4) ("mesa" ,mesa) + ("netcdf" ,netcdf) ("png" ,libpng) + ("proj" ,proj.4) + ;("pugixml" ,pugixml) + ("sqlite" ,sqlite) ("tiff" ,libtiff) ("xorgproto" ,xorgproto) ("zlib" ,zlib))) -- cgit v1.2.3