From patchwork Sat Jun 25 12:25:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 40322 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 30B7C27BBEA; Sat, 25 Jun 2022 13:28:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9A33927BBE9 for ; Sat, 25 Jun 2022 13:28:26 +0100 (BST) Received: from localhost ([::1]:41282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o54tl-0007iq-QB for patchwork@mira.cbaines.net; Sat, 25 Jun 2022 08:28:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o54tO-0007hv-K2 for guix-patches@gnu.org; Sat, 25 Jun 2022 08:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50450) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o54tO-0003Vw-3m for guix-patches@gnu.org; Sat, 25 Jun 2022 08:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o54tN-0000tH-Uk for guix-patches@gnu.org; Sat, 25 Jun 2022 08:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56214] [PATCH] Update GDAL to 3.5.0 Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Jun 2022 12:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56214 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56214@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16561600323363 (code B ref -1); Sat, 25 Jun 2022 12:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jun 2022 12:27:12 +0000 Received: from localhost ([127.0.0.1]:44347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o54sZ-0000sA-Mh for submit@debbugs.gnu.org; Sat, 25 Jun 2022 08:27:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:48778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o54sX-0000s3-Qd for submit@debbugs.gnu.org; Sat, 25 Jun 2022 08:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o54sX-0007fy-Jv for guix-patches@gnu.org; Sat, 25 Jun 2022 08:27:09 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:43856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o54sU-0003NO-Hd for guix-patches@gnu.org; Sat, 25 Jun 2022 08:27:09 -0400 Received: by mail-ed1-x531.google.com with SMTP id c13so6848893eds.10 for ; Sat, 25 Jun 2022 05:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=user-agent:from:to:subject:date:message-id:mime-version; bh=7MuW/t9jIbJJGMzMAo4ro2LKMSX3hlSCVpBdUTkkeOI=; b=U7LCfUsmJPUVK0pOEIB02ldnCxrn48geXYtotvsh2g8IAm+FezEQ5DbQ7YMZisDCof UngiuUiCLfRHvdm10tGWlTsQ3cJVqjizyBqLIzNjznqn0KUtRdcrvoH7BCYb6wpfG2Lp XsBoivsvDOOb1TPWaBbC+Tlr89OYUpMldGPZ7wIA9ow1KrL0602dx5L+bK40YsRjE/AC 01ZiMX77ZA8vZyiY9bvdNHqkpEsUfPzC+SHY9Vekz28QfghKZeVjAIYdmRdzN5jXHsOK taicZPI5bgP/F5wgBy4g2b6fcbwxl5Nd5kXjReHnamZwCASxOJXoglDonOPLbGc4E0Pl ZTBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=7MuW/t9jIbJJGMzMAo4ro2LKMSX3hlSCVpBdUTkkeOI=; b=AX3igjWElRULmeJb/PYqVU4F9A3d6Uwnq4cWTM/DNTBxBbpbXZi6Gjw79aNr8jcBFG dD9Uq1ABlyIAH3vNv09WJDYyNwjqJWM7Didoy4e585XJKvALr6ddhxPbyrm0Kzb72j5c blnZwUw644RGBSen4c5WVLgspDzfILt8Tc108qJ2EuqVu0LwtbmJzIL/gAmGTKx5DhWJ 3LdAku2m8jDUwyE1ZHe2b8soUEvaNGbFzUNapJ/5VWmiLwNsqfleGdsa5XKC1uP4OBxw 0POaSvXtTuE1I6p7ex/AmJ7s3mtnsVZ2y71UAnHBQZSjFfBnsQzj05kd8wnasn6IwCBn 2cwQ== X-Gm-Message-State: AJIora9ThSzYo3FCqJ2GDO0h+Dy94adu78ggqeIxaQzy5vOO4MskzNx9 qVJi4I4XfTD71crNnSHBIWtsNAVInM8kTCWx X-Google-Smtp-Source: AGRyM1s5/tUNQEGIQNr29KUDi0ZD/tnYHogaZu1nLCldqO+ILK80qQbr3zAck4GRikCzOeGoUvzS4Q== X-Received: by 2002:a05:6402:2552:b0:435:9e1c:ca49 with SMTP id l18-20020a056402255200b004359e1cca49mr4776516edb.126.1656160024073; Sat, 25 Jun 2022 05:27:04 -0700 (PDT) Received: from thinkpad (tmo-117-18.customers.d1-online.com. [80.187.117.18]) by smtp.gmail.com with ESMTPSA id f26-20020a056402005a00b004358f6e0570sm3955654edu.17.2022.06.25.05.27.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jun 2022 05:27:03 -0700 (PDT) User-agent: mu4e 1.6.11; emacs 28.1.50 From: Roman Scherer Date: Sat, 25 Jun 2022 14:25:37 +0200 Message-ID: <87a6a1vsh6.fsf@burningswell.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::531; envelope-from=roman.scherer@burningswell.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello Guix, I would like to update the GDAL library to v3.5.0. Could you please review it? Thanks, Roman. From caccab6114293a9b4e3b2304de22de997a076a34 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 25 Jun 2022 13:47:19 +0200 Subject: [PATCH] Update GDAL to 3.5.0 This patch updates GDAL to v3.5.0. I added 2 more dependencies to the package: - curl (To be able to read rasters using vsicurl) [1] - openssl (To enable Postgresql raster support, pkg-config was not detecting libpq without openssl) I also had to add the --without-jpeg12 option, because GDAL did not build with it's internal libjpeg and libjpeg12 removed. I don't think we supported libjpeg12 in the previous version, since the bundled code was removed and I believe libjpeg-turbo does not provide this functionality. [1] https://gdal.org/user/virtual_file_systems.html --- gnu/packages/geo.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 7b29c55088..38df5ff537 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -113,6 +113,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 +915,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 +923,7 @@ (define-public gdal version ".tar.gz")) (sha256 (base32 - "0nk09lws1hk873yn5f4wzqfvr82gm4hw3gq8w9g1h0kvf6j5x4i8")) + "0h7dgjx8nk3dd17wwqm2yjnaqciyrd2mz9gcjswpcnmap09wbzrs")) (modules '((guix build utils))) (snippet `(begin @@ -946,27 +947,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\"") ""))))))) + ;; 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 +974,7 @@ (define-public gdal libtiff libwebp netcdf + openssl pcre postgresql ; libpq proj -- 2.36.1