From patchwork Tue Mar 4 07:22:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Bilke X-Patchwork-Id: 39657 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 136E527BBE9; Tue, 4 Mar 2025 07:26:47 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 8A8DD27BBE2 for ; Tue, 4 Mar 2025 07:26:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpMfn-00061D-Ez; Tue, 04 Mar 2025 02:26:39 -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 1tpMeH-0005Xb-VZ for guix-patches@gnu.org; Tue, 04 Mar 2025 02:25:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpMeH-0006lb-4S for guix-patches@gnu.org; Tue, 04 Mar 2025 02:25:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:Date:MIME-version:To:Subject; bh=+a+MqGBYXgnieFC2ZEIisf8RoLI62ntdFZZaKIlizQs=; b=IPytA+xVBTHg66WqWt+c9KgDpjVzWGruOjMwjVbM57qbQNtIH66NUNDg91zBTjo4eqVLwUCqlT2gfRN4klj+mRDBlSIY80qAUxTIHZ6/1o1bOHCZwKh7WZRaxlqF7RMeKqSM0BALqeoBZIqbNV/BUQdIHCdzgyVhK0fbCBUc/Q6bYAVYcDiab3Gvssa6ro4BhcmOxkOGFqIdXZM/X7GJ/tL7Rpvw0Iqtfc7DV9+4i1UbJT9TxpnUYdWSMNDO4lIdxMOlMJmxN3gtZ10EAjcbAMwi3/ZOiIPZOCvoo+PAB8cc2huc3PxJpGGPoYthjZ9SRaFCpM0r2kANYYwOvFCjzw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tpMeE-0002vp-Sf; Tue, 04 Mar 2025 02:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76736] [PATCH] gnu: gdal: Update to 3.10.2 and fix rpaths. Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 04 Mar 2025 07:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76736 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76736@debbugs.gnu.org Cc: Lars Bilke , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.174107304411141 (code B ref -1); Tue, 04 Mar 2025 07:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2025 07:24:04 +0000 Received: from localhost ([127.0.0.1]:54859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tpMdI-0002tb-42 for submit@debbugs.gnu.org; Tue, 04 Mar 2025 02:24:04 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56374) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tpMdF-0002rv-E9 for submit@debbugs.gnu.org; Tue, 04 Mar 2025 02:24:02 -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 1tpMcI-0004w1-Qc for guix-patches@gnu.org; Tue, 04 Mar 2025 02:23:05 -0500 Received: from mailgate4.ufz.de ([141.65.7.211] helo=mailgate.ufz.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpMcD-0006Io-Jb for guix-patches@gnu.org; Tue, 04 Mar 2025 02:23:02 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate4-UFZ) with ESMTP id 89AEC160300 for ; Tue, 4 Mar 2025 08:22:53 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SSL0090081I8500@imap.intranet.ufz.de> for guix-patches@gnu.org; Tue, 04 Mar 2025 08:22:53 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.216]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SSL00IZZ8I54M90@imap.intranet.ufz.de> for guix-patches@gnu.org; Tue, 04 Mar 2025 08:22:53 +0100 (CET) Received: from envinf4.minotaur-alpha.ts.net (unknown [141.65.34.85]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp1-UFZ) with ESMTPSA id 57BC68008C; Tue, 4 Mar 2025 08:22:53 +0100 (CET) Date: Tue, 04 Mar 2025 08:22:41 +0100 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.46.1 Received-SPF: pass client-ip=141.65.7.211; envelope-from=lars.bilke@ufz.de; helo=mailgate.ufz.de 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (gdal): Update to 3.10.2. * gnu/packages/geo.scm (gdal): Add fix-rpath phase from https://issues.guix.gnu.org/68606 Change-Id: I973e04af737d757329adfbfa37d255386143a21c --- gnu/packages/geo.scm | 124 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 56 deletions(-) base-commit: f203028ef869945b3d44f0f2f7b16d61d064190c diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 251ef5ced9..943de4586f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1408,68 +1408,80 @@ (define-public pdal (define-public gdal (package (name "gdal") - (version "3.6.1") - (source (origin - (method url-fetch) - (uri (string-append - "http://download.osgeo.org/gdal/" version "/gdal-" - version ".tar.gz")) - (sha256 - (base32 - "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf")) - (modules '((guix build utils))) - (snippet - `(begin + (version "3.10.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://download.osgeo.org/gdal/" version "/gdal-" + version ".tar.gz")) + (sha256 + (base32 "1nmh92vbcrp9qnld98vkxsvaw0mrska06kxxbn7n6kgbh6mhlwfa")) + (modules '((guix build utils))) + (snippet `(begin ;; TODO: frmts contains a lot more bundled code. (for-each delete-file-recursively - ;; bundled code - '("frmts/png/libpng" - "frmts/gif/giflib" - "frmts/jpeg/libjpeg" - "frmts/jpeg/libjpeg12" - "frmts/gtiff/libtiff" - "frmts/gtiff/libgeotiff" - "frmts/zlib" - "ogr/ogrsf_frmts/geojson/libjson")))))) + ;; bundled code + '("frmts/png/libpng" "frmts/gif/giflib" + "frmts/jpeg/libjpeg" + "frmts/jpeg/libjpeg12" + "frmts/gtiff/libtiff" + "frmts/gtiff/libgeotiff" + "ogr/ogrsf_frmts/geojson/libjson")))))) (build-system cmake-build-system) (arguments - `(#:tests? #f - #:configure-flags - (list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL" - "-DGDAL_USE_JPEG12_INTERNAL=OFF"))) - (inputs - (list curl - expat - freexl - geos - giflib - json-c - libgeotiff - libjpeg-turbo - libjxl - libpng - libtiff - libwebp - lz4 - netcdf - openssl - openjpeg - pcre2 - postgresql ; libpq - proj - qhull - sqlite - swig - zlib - zstd)) - (native-inputs - (list pkg-config - python)) - (propagated-inputs - (list python-numpy)) + (list + #:tests? #f + #:configure-flags + #~(list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL" + "-DGDAL_USE_JPEG12_INTERNAL=OFF") + #:modules '((guix build cmake-build-system) + (guix build utils) + (ice-9 rdelim) + (ice-9 popen)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'fix-rpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((libdir (string-append (assoc-ref outputs "out") "/lib"))) + (for-each (lambda (file) + (let* ((pipe (open-pipe* OPEN_READ "patchelf" + "--print-rpath" file)) + (line (read-line pipe))) + (and (zero? (close-pipe pipe)) + (invoke "patchelf" "--set-rpath" + (string-append libdir ":" line) + file)))) + (find-files libdir ".*\\.so$")))))))) + (inputs (list curl + expat + freexl + geos + giflib + json-c + libgeotiff + libjpeg-turbo + libjxl + libpng + libtiff + libwebp + lz4 + netcdf + openssl + openjpeg + pcre2 + postgresql ;libpq + proj + qhull + sqlite + swig + zlib + zstd)) + (native-inputs (list patchelf pkg-config python)) + (propagated-inputs (list python-numpy)) (home-page "https://gdal.org/") (synopsis "Raster and vector geospatial data format library") - (description "GDAL is a translator library for raster and vector geospatial + (description + "GDAL is a translator library for raster and vector geospatial data formats. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line