mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: gdal: Update to 3.5.0.
* gnu/packages/geo.scm (gdal): Update to 3.5.0. [inputs]: Add curl and openssl. [arguments]: Remove 'fix-path' phase. Add "--without-jpeg12" to 'configure-flags'. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
parent
0de4318bb1
commit
d4c8e8b62f
1 changed files with 21 additions and 22 deletions
|
@ -18,6 +18,7 @@
|
|||
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org>
|
||||
;;; Copyright © 2021 Roman Scherer <roman.scherer@burningswell.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -113,6 +114,7 @@ (define-module (gnu packages geo)
|
|||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages webkit)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
|
@ -914,7 +916,7 @@ (define-public spatialite-gui
|
|||
(define-public gdal
|
||||
(package
|
||||
(name "gdal")
|
||||
(version "3.3.3")
|
||||
(version "3.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -922,7 +924,7 @@ (define-public gdal
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nk09lws1hk873yn5f4wzqfvr82gm4hw3gq8w9g1h0kvf6j5x4i8"))
|
||||
"0h7dgjx8nk3dd17wwqm2yjnaqciyrd2mz9gcjswpcnmap09wbzrs"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
|
@ -946,27 +948,23 @@ (define-public gdal
|
|||
(string-append option "="
|
||||
(assoc-ref %build-inputs input))))))
|
||||
(list
|
||||
;; TODO: --with-pcidsk, --with-pcraster
|
||||
(with "--with-freexl" "freexl")
|
||||
(with "--with-libjson-c" "json-c")
|
||||
(with "--with-png" "libpng")
|
||||
(with "--with-webp" "libwebp")
|
||||
(with "--with-gif" "giflib")
|
||||
(with "--with-jpeg" "libjpeg-turbo")
|
||||
(with "--with-libtiff" "libtiff")
|
||||
(with "--with-geotiff" "libgeotiff")
|
||||
(with "--with-libz" "zlib")
|
||||
(with "--with-expat" "expat")
|
||||
(with "--with-sqlite3" "sqlite")
|
||||
"--with-pcre"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-path
|
||||
(lambda _
|
||||
(substitute* "frmts/mrf/mrf_band.cpp"
|
||||
(("\"../zlib/zlib.h\"") "<zlib.h>")))))))
|
||||
;; TODO: --with-pcidsk, --with-pcraster
|
||||
(with "--with-expat" "expat")
|
||||
(with "--with-freexl" "freexl")
|
||||
(with "--with-geotiff" "libgeotiff")
|
||||
(with "--with-gif" "giflib")
|
||||
(with "--with-jpeg" "libjpeg-turbo")
|
||||
(with "--with-libjson-c" "json-c")
|
||||
(with "--with-libtiff" "libtiff")
|
||||
(with "--with-libz" "zlib")
|
||||
(with "--with-png" "libpng")
|
||||
(with "--with-sqlite3" "sqlite")
|
||||
(with "--with-webp" "libwebp")
|
||||
"--without-jpeg12"
|
||||
"--with-pcre"))))
|
||||
(inputs
|
||||
(list expat
|
||||
(list curl
|
||||
expat
|
||||
freexl
|
||||
geos
|
||||
giflib
|
||||
|
@ -977,6 +975,7 @@ (define-public gdal
|
|||
libtiff
|
||||
libwebp
|
||||
netcdf
|
||||
openssl
|
||||
pcre
|
||||
postgresql ; libpq
|
||||
proj
|
||||
|
|
Loading…
Reference in a new issue