From patchwork Tue Dec 20 19:10:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 45480 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 E80F727BBED; Tue, 20 Dec 2022 19:18:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 64EDE27BBEB for ; Tue, 20 Dec 2022 19:18:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7i7n-0008Rd-Qy; Tue, 20 Dec 2022 14:18:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7i7m-00083h-6G for guix-patches@gnu.org; Tue, 20 Dec 2022 14:18:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7i7l-0000nP-UI for guix-patches@gnu.org; Tue, 20 Dec 2022 14:18:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7i7l-00075W-JX for guix-patches@gnu.org; Tue, 20 Dec 2022 14:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60039] Update GDAL and NetCDF and include lz4 and openjpeg support Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 19:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Guillaume Le Vaillant Cc: 60039@debbugs.gnu.org Received: via spool by 60039-submit@debbugs.gnu.org id=B60039.167156384527238 (code B ref 60039); Tue, 20 Dec 2022 19:18:01 +0000 Received: (at 60039) by debbugs.gnu.org; 20 Dec 2022 19:17:25 +0000 Received: from localhost ([127.0.0.1]:46702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7i7B-00075G-8Y for submit@debbugs.gnu.org; Tue, 20 Dec 2022 14:17:25 -0500 Received: from mail-ed1-f50.google.com ([209.85.208.50]:35487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7i78-00075A-Dt for 60039@debbugs.gnu.org; Tue, 20 Dec 2022 14:17:23 -0500 Received: by mail-ed1-f50.google.com with SMTP id i15so18963742edf.2 for <60039@debbugs.gnu.org>; Tue, 20 Dec 2022 11:17:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=JuU9Fd9Yz0sZyR0MNW/PsaKLqdtC57RTmL+88KPXoUU=; b=tLkJ5EFt2KD35TJXQ4avWLYLNyplN/xWSLwfXJJ3/q0DRf1+3Hl5m+UDpdR8jP3Fyp 1AxOpespKZHC98xJHtb96g5+RHacNvPq0fHacPenblOwMdhNj5XG/tWDgnToMoHdvJ3c 762ncNM/yP7Mxc68CSAqBaPSs6mZtQSvPB6uMTgPEuI2lq7tGIHcB1+b4MayKtIJ2r6H 8t82TdaxOSKJM1dJ8l6YJR1QbtZnSrE8+BAl8MmHGgDcdY/YHmew1Ibu71pfjvYyMRy9 fWqEy5APGN4KqEfIfI7sl01d0O3+WVB8PEGA2nV4BjeSpWmqWRnBMzIyBsGpyBF2BEmh ULDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JuU9Fd9Yz0sZyR0MNW/PsaKLqdtC57RTmL+88KPXoUU=; b=XWQUOW8GoTb3dIRLHitq5Wbwn7qc2/EAW3ga0J6vq/EeI9aFe9aNQujvWA/ONn6AfK 97Ca40n+FFl1zC1E65fnSKtkAHDqz6WkorTCzM14bCsHuv9bjZAWt2nZDV3n7eFV9LJ9 yGG/kXZo8On2Jq9B2GjMBgSLc0m79PsN6qng0PAVwfCD3x5F43LWVfIODFj26zPuY1Ta E5lDNmS8XnlaauxaoO32FxXa72PaFXyYmmIdc9069NLWqWcoOcjBVh9wT3nkAKxlpjGt RJL2JceGAnYFw4UJJtgid4xzgGqx3WtjR+2nyKFF4JMlsL4ZsSlJ+iuknMhTlMFSbajG 0dyw== X-Gm-Message-State: AFqh2kqgzF+rVtgQnhKT4TwhQVf/HI+LUjY1Vs/wsgoxq99LjDhfeuYu VWVpIgVc4yQXeZCbNEabeM0EYbn5+v0b8bAITiE= X-Google-Smtp-Source: AMrXdXs2a+nGyR5MRVt00IFSi1F0CRdxO6bw+8l/uLh/pbzozlbQ2SLadSwx+8A1V5PrfjpfVwrKYQ== X-Received: by 2002:aa7:d146:0:b0:46f:7453:a99d with SMTP id r6-20020aa7d146000000b0046f7453a99dmr2599327edo.6.1671563835955; Tue, 20 Dec 2022 11:17:15 -0800 (PST) Received: from precision (tmo-119-245.customers.d1-online.com. [80.187.119.245]) by smtp.gmail.com with ESMTPSA id ee8-20020a056402290800b0046fb9492961sm6032136edb.25.2022.12.20.11.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 11:17:15 -0800 (PST) References: <86mt7rp4c5.fsf@burningswell.com> <87y1r2c7fs.fsf@kitej> User-agent: mu4e 1.8.11; emacs 29.0.50 From: Roman Scherer Date: Tue, 20 Dec 2022 20:10:23 +0100 In-reply-to: <87y1r2c7fs.fsf@kitej> Message-ID: <86v8m5nava.fsf@burningswell.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Guillaume, here's the updated patch for Netcdf. I checked the tests again, I believe I left some of them off by accident after trying a couple of things. So, I enabled some of them again. They pass. However, I left the remote and large file tests still turned off. I believe the remote tests we do not want anyway on Guix CICD system. Is that correct? And the large file tests seem to take ages. Can we ignore them, because they are super annoying? Thanks for the review. Wdyt? Roman. Guillaume Le Vaillant writes: > [[PGP Signed Part:Undecided]] > Roman Scherer skribis: > >> Hello Guix, >> >> this patch series updates the GDAL, Netcdf and libtiff packages. It also >> adds support for lz4 and openjpeg to GDAL. >> >> Could you please review it? >> >> Thanks, Roman. >> >> [2. text/x-diff; 0001-gnu-gdal-Update-to-3.6.0.patch]... > > Hi, > > Instead of this patch 1, I pushed the patch from issue 60159 that updates > gdal to 3.6.1. > > >> [3. text/x-diff; 0002-gnu-gdal-Add-support-for-lz4-and-openjpeg.patch]... > > Patch 2 pushed as 3c6f7b53cea7ea5dc8176fec02271bc3770d7fc1. > > >> [4. text/x-diff; 0003-gnu-libtiff-Update-to-4.4.0.patch]... > > As libtiff as over 9000 dependents, it has to be updated on the > core-updates branch instead of master (see [1]). However, libtiff is > already at version 4.4.0 on core-updates, so patch 3 is not necessary > and libtiff 4.4.0 will end up in master when core-updates gets merged. > > [1] https://guix.gnu.org/manual/devel/en/guix.html#Submitting-Patches > > >> [5. text/x-diff; 0004-gnu-netcdf-Update-to-4.9.0.patch]... > > When adding or removing a patch file to "gnu/packages/patches/...", the > 'dist_patch_DATA' variable in "gnu/packages/local.mk" has to be updated > to track the necessary patch files. > Moreover, as this patch fixes only one line, it is also possible to add > a custom phase with a '(substitute* ...)' form in the 'arguments' field > instead of adding a patch file. > Could you send an updated patch 4? > Thanks. > > Also, many tests are disabled in 'configure-flags'. Are they not working > at all? > > [[End of PGP Signed Part]] From eb2a03112532f6c1482ebaf1634cf3ac67303507 Mon Sep 17 00:00:00 2001 From: r0man Date: Tue, 20 Dec 2022 20:06:57 +0100 Subject: [PATCH] gnu: netcdf: Update to 4.9.0. * gnu/packages/maths.scm (netcdf): Update to 4.9.0. --- gnu/packages/maths.scm | 50 +++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 050450e12c..a5de0f4016 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1852,16 +1852,16 @@ (define-public itpp (define-public netcdf (package (name "netcdf") - (version "4.7.4") + (version "4.9.0") (source (origin (method url-fetch) (uri (string-append - "https://www.unidata.ucar.edu/downloads/netcdf/ftp/" - "netcdf-c-" version ".tar.gz")) + "https://downloads.unidata.ucar.edu/netcdf-c/" version + "/netcdf-c-" version ".tar.gz")) (sha256 (base32 - "1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf")) + "0j8b814mjdqvqanzmrxpq8hn33n22cdzb3gf9vhya24wnwi615ac")) (modules '((guix build utils))) (snippet ;; Make sure this variable is defined only once. Failing to do so @@ -1870,19 +1870,40 @@ (define-public netcdf '(substitute* "ncdump/ocprint.c" (("^int ocdebug") "static int ocdebug"))) (patches (search-patches "netcdf-date-time.patch")))) - (build-system gnu-build-system) + (build-system cmake-build-system) (native-inputs - (list m4 doxygen graphviz)) + (list m4 doxygen graphviz unzip)) (inputs `(("hdf4" ,hdf4-alt) - ("hdf5" ,hdf5) + ("hdf5" ,hdf5-1.12) ("curl" ,curl) ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo))) + ("libjpeg" ,libjpeg-turbo) + ("libxml2" ,libxml2))) (arguments - `(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4") - - #:phases (modify-phases %standard-phases + `(#:configure-flags + '("-DENABLE_BYTERANGE=ON" + "-DENABLE_CDF5=ON" + "-DENABLE_DAP_LONG_TESTS=ON" + "-DENABLE_DAP_REMOTE_TESTS=OFF" + "-DENABLE_EXAMPLE_TESTS=ON" + "-DENABLE_EXTRA_TESTS=ON" + "-DENABLE_FILTER_TESTING=ON" + "-DENABLE_LARGE_FILE_TESTS=OFF" + "-DENABLE_UNIT_TESTS=ON" + "-DSOURCE_DATE_EPOCH=0") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-cmake-typo + (lambda _ + ;; Fix a typo in CMakeLists.txt + (substitute* "CMakeLists.txt" + (("SET\\(netCDF_LIB_VERSION 19\\}\\)") + "SET(netCDF_LIB_VERSION 19)")) + #t)) + (add-before 'configure 'disable-nc-byterange-test + (lambda _ + (invoke "sed" "-i" "/test_byterange/d" "nc_test/CMakeLists.txt"))) (add-before 'configure 'fix-source-date (lambda _ ;; As we ${SOURCE_DATE_EPOCH} evaluates to "1" in the build @@ -1902,8 +1923,11 @@ (define-public netcdf (substitute* "libnetcdf.settings" (("(/gnu/store/)([0-9A-Za-z]*)" all prefix hash) (string-append prefix (string-take hash 10) "..."))) - #t))) - + #t)) + (add-before 'check 'fix-test-rcmerge + (lambda _ + ;; Set HOME, to fix the test-rcmerge. + (setenv "HOME" "/tmp")))) #:parallel-tests? #f)) ;various race conditions (home-page "https://www.unidata.ucar.edu/software/netcdf/") (synopsis "Library for scientific data") -- 2.38.1