From patchwork Tue Dec 13 18:00:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 45242 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 45A4B27BBEC; Tue, 13 Dec 2022 18:06:27 +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 D22E827BBE9 for ; Tue, 13 Dec 2022 18:06:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p59fK-0000Bd-Fs; Tue, 13 Dec 2022 13:06:08 -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 1p59fG-00008g-KE for guix-patches@gnu.org; Tue, 13 Dec 2022 13:06: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 1p59fG-0003GL-Ce for guix-patches@gnu.org; Tue, 13 Dec 2022 13:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p59fG-0003Jd-8K for guix-patches@gnu.org; Tue, 13 Dec 2022 13:06:02 -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, 13 Dec 2022 18:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60039@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167095472212719 (code B ref -1); Tue, 13 Dec 2022 18:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2022 18:05:22 +0000 Received: from localhost ([127.0.0.1]:33739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p59eb-0003J3-Uh for submit@debbugs.gnu.org; Tue, 13 Dec 2022 13:05:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:47200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p59ea-0003Ix-55 for submit@debbugs.gnu.org; Tue, 13 Dec 2022 13:05:20 -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 1p59eL-00085Z-PZ for guix-patches@gnu.org; Tue, 13 Dec 2022 13:05:12 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p59eI-0002Pn-7s for guix-patches@gnu.org; Tue, 13 Dec 2022 13:05:05 -0500 Received: by mail-ej1-x62f.google.com with SMTP id tz12so15853122ejc.9 for ; Tue, 13 Dec 2022 10:05:01 -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:date:subject:to:from:user-agent:from:to:cc :subject:date:message-id:reply-to; bh=DYr7tmb3rJJy9ZGG1naac4c7ZYrMpS8OOscOmr+R+yw=; b=DPkIrGI73oiIE3h5jVuvBtUflVf9X+uv+L9jx0ZV8qBEld3mvhNZwij/l/sCp+3PTw xUNDuYgh8uFiGuTfriWdntilZwXqKWA5IplwTXMszU/27Ru9t/nkqtpLSSfIqqXCXYIe F9kEQusjt/XqzmDOmyAevqAR0L9RFMowmhxMOJxXLmcYORSPtLbZovOTqWoL0lEuZArj MeUUYddBEKXhujQ/EI39JwleCPtVZOVWphkw2fQAgx/d2iwhc0/YN+HkUIVg1/hDvqYX tRCE3iKqbtmkcvA70GvSPGvoYeJNMXfv9/hM6Fk0xMtS7TLCUTmByxqb9ijZ4A0fJgKy Z8LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:subject:to:from:user-agent :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DYr7tmb3rJJy9ZGG1naac4c7ZYrMpS8OOscOmr+R+yw=; b=AgIHwZythiiFjoSgw7jA5p8x2Y9swRUHry36f4eV8pIH2NZa5dXVm4dqdUbBmLeuLB VISnpC6KmLC0qT7Ml2sphHdTgrR0/wfmZju2jmqIaC34VumPMz4jdZersOsNVRw4a0y3 vtQPK8l03xzSYFT8SLeDOK+KRTk7bCCu6bbmLIA72cHNMfbh3zqRMTutrJ/5WqclpAJC K4rqklkvuA80a6gyKlRViQ9cLFcYnJJvnuIGOlMlXnY6Mm4tjsPa1Z1e5D8XkVbEhgJs chv/MglF0S7Q4cMwf1uXaoxZRiLLxP9Hen48jCwT/JlECO2ZL4j6fMDXvN5WmUjWucXv 7TVQ== X-Gm-Message-State: ANoB5plJXorAIHZ1/OvVZpu1kjOKP7pL+7P1gk39rGmHbyGPE0vf2nqy XCoxvTLHKZjD4R99yHTjF/G28b4cZnPBl3Ft4O8= X-Google-Smtp-Source: AA0mqf4PGHghxYupEW/yMZ8Kjz/8RSqcWZxZGm1H2/BS1jX9v7rvYe+bXbTAcjD1MC/fNEr5YotzVA== X-Received: by 2002:a17:906:859a:b0:7c1:4bb2:f62c with SMTP id v26-20020a170906859a00b007c14bb2f62cmr15529848ejx.40.1670954699855; Tue, 13 Dec 2022 10:04:59 -0800 (PST) Received: from precision (tmo-117-8.customers.d1-online.com. [80.187.117.8]) by smtp.gmail.com with ESMTPSA id b10-20020a17090630ca00b0073dbaeb50f6sm4832482ejb.169.2022.12.13.10.04.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 10:04:59 -0800 (PST) User-agent: mu4e 1.8.11; emacs 29.0.50 From: Roman Scherer Date: Tue, 13 Dec 2022 19:00:32 +0100 Message-ID: <86mt7rp4c5.fsf@burningswell.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::62f; envelope-from=roman.scherer@burningswell.com; helo=mail-ej1-x62f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, URI_DOTEDU=1.213 autolearn=no 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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. From 4ab999dfcab8b999d6256e328667a07aa7cb5e76 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 10 Dec 2022 12:18:20 +0100 Subject: [PATCH 4/4] gnu: netcdf: Update to 4.9.0. * gnu/packages/maths.scm (netcdf): Update to 4.9.0. * gnu/packages/patches/netcdf-4.9.0-fix-cmake-typo.patch --- gnu/packages/maths.scm | 46 +++++++++++++------ .../patches/netcdf-4.9.0-fix-cmake-typo.patch | 23 ++++++++++ 2 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/netcdf-4.9.0-fix-cmake-typo.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index aee050735e..057e9651c2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1850,16 +1850,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 @@ -1867,20 +1867,35 @@ (define-public netcdf ;; multiple-definition link error with GCC 10. '(substitute* "ncdump/ocprint.c" (("^int ocdebug") "static int ocdebug"))) - (patches (search-patches "netcdf-date-time.patch")))) - (build-system gnu-build-system) + (patches (search-patches "netcdf-date-time.patch" + "netcdf-4.9.0-fix-cmake-typo.patch")))) + (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=OFF" + "-DENABLE_DAP_REMOTE_TESTS=OFF" + "-DENABLE_EXAMPLE_TESTS=OFF" + "-DENABLE_EXTRA_TESTS=OFF" + "-DENABLE_FILTER_TESTING=OFF" + "-DENABLE_LARGE_FILE_TESTS=OFF" + "-DENABLE_UNIT_TESTS=OFF" + "-DSOURCE_DATE_EPOCH=0") + #:phases + (modify-phases %standard-phases + (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 @@ -1900,8 +1915,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") diff --git a/gnu/packages/patches/netcdf-4.9.0-fix-cmake-typo.patch b/gnu/packages/patches/netcdf-4.9.0-fix-cmake-typo.patch new file mode 100644 index 0000000000..b9c0ed5c10 --- /dev/null +++ b/gnu/packages/patches/netcdf-4.9.0-fix-cmake-typo.patch @@ -0,0 +1,23 @@ +From 80a6611cfca98a5979c5ac69cba56a49af8c1e48 Mon Sep 17 00:00:00 2001 +From: Yuriy Chernyshov +Date: Sun, 19 Jun 2022 19:29:20 +0300 +Subject: [PATCH] Fix typo in CMakeLists.txt + +At the time generated dynamic library is named `libnetcdf.so.19}` which looks like a typo. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7bf8641bec..18366d24ad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,5 +39,5 @@ SET(NC_VERSION ${netCDF_VERSION}) + SET(PACKAGE_VERSION ${VERSION}) + + # These values should match those in configure.ac +-SET(netCDF_LIB_VERSION 19}) ++SET(netCDF_LIB_VERSION 19) + SET(netCDF_SO_VERSION 19) + + # Version of the dispatch table. This must match the value in -- 2.38.1