From patchwork Sun Mar 9 22:11:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39997 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 A373F27BBEA; Sun, 9 Mar 2025 22:14:16 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 1EFA927BBE2 for ; Sun, 9 Mar 2025 22:14:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trOtf-0000vh-8V; Sun, 09 Mar 2025 18:13:23 -0400 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 1trOtS-0000ps-Cf for guix-patches@gnu.org; Sun, 09 Mar 2025 18:13:10 -0400 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 1trOtS-0002Ia-3v for guix-patches@gnu.org; Sun, 09 Mar 2025 18:13:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=eIMFZzElGirzmKlEM8xkikxo7kA+RE+sBoreC7Q7JiY=; b=ntG7qzNLyf/BFJQVufNvUyxUpY4/7bxj+MT3Ap7WSnvPZH9xpulV8SVPLU3expCxPXGZYi7kRNAxRHkBiysk82i6yCKDH6t8ErHIe6yJLBHBU8RbK13FaDLD63WwBKElF3p29b5Lci/KYqftmvsN3nK04G/7603dDyvVaiPKkLQOoeyFvEy4RcCsP0srM5IYr1V62hY9tp/QA9rhmzUyPib70wD0PzfvbvTC0WA6gXfnM1Cho8LFZjmNZkETwDW1TA6sVNCAEL9+nD4aUxCZRHjcVSXz11U/UEQx4nv6r+yztl3VjcF8fpKsA5AHgk1TL7CYb2D+IJGHag5LYyGTbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1trOtR-0000bY-W7 for guix-patches@gnu.org; Sun, 09 Mar 2025 18:13:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76835] [PATCH v2 19/24] gnu: gdal: Update to 3.10.2. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Mar 2025 22:13:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76835@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76835-submit@debbugs.gnu.org id=B76835.17415583582128 (code B ref 76835); Sun, 09 Mar 2025 22:13:09 +0000 Received: (at 76835) by debbugs.gnu.org; 9 Mar 2025 22:12:38 +0000 Received: from localhost ([127.0.0.1]:34815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1trOsw-0000YE-8e for submit@debbugs.gnu.org; Sun, 09 Mar 2025 18:12:38 -0400 Received: from 4.mo576.mail-out.ovh.net ([46.105.42.102]:56939) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1trOsm-0000W3-RV for 76835@debbugs.gnu.org; Sun, 09 Mar 2025 18:12:30 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.176.103]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Z9vQg0yVkz1sYh for <76835@debbugs.gnu.org>; Sun, 9 Mar 2025 22:12:26 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-82vbn (unknown [10.110.113.134]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C168A1FE4D; Sun, 9 Mar 2025 22:12:26 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-5b5ff79f4f-82vbn with ESMTPSA id 7OczJ0oSzmcYch4AJvcgiQ (envelope-from ); Sun, 09 Mar 2025 22:12:26 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R003ef57a46b-0eef-419a-badb-2a8f7c2c93ea, 196D73215860B9B374AEA1D4B43499A65472C7F7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Mar 2025 23:11:27 +0100 Message-ID: <20250309221153.334-19-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250309221153.334-1-ngraves@ngraves.fr> References: <20250309221153.334-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1317865845056463586 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudejiedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieduhffggeetffekfeeuffdujeevjedvudejkeeilefhjeetjeeuudefudejgfdunecuffhomhgrihhnpehoshhgvghordhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieekfeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeimgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=eIMFZzElGirzmKlEM8xkikxo7kA+RE+sBoreC7Q7JiY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741558347; v=1; b=I+Xw+S0ExJCVxASazVgq14YLbLp4JMkajv0plodCr25jcTfEw7ujsMud64pfXzMD8Y53XANe Gz3GG7+FgTacBRU0z9Pyp51+5ob2dsF+sBhPiWWLcdT105f4vIlRU5QsQ+hiPiJSnjGfzE1+goP ZqKvEv7mYsTWCXf4u8An1j3GUS4ACWN8kaQ/NXREQl8e++wDcWbOr7bu4ZJeB4MmhvXRJGBler7 C8jN/ncDHlHfJljF151MHU54VKSCYXxV5reR4bDprFjW27cZ7hfBnOIkEgehx/awT+9tjUp/7lq 6bhntJZDUgseuRkEszAaGvlJymAxAxeITc2sukF3B4iCQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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. [source]: Bundle zlib back, as it's now using a custom fork. [arguments]: Add 'patch-runpath phase and {modules} in order to patch the runpaths of the swig generated python bindings. Improve style. [inputs]: Add gcc:lib, hdf5, librasterlite2, libspatialite. [native-inputs]: Add bison. --- gnu/packages/geo.scm | 66 ++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 251ef5ced9..7e9b1da2e3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1408,46 +1408,69 @@ (define-public pdal (define-public gdal (package (name "gdal") - (version "3.6.1") + (version "3.10.2") (source (origin (method url-fetch) (uri (string-append - "http://download.osgeo.org/gdal/" version "/gdal-" - version ".tar.gz")) + "http://download.osgeo.org/gdal/" version "/gdal-" + version ".tar.gz")) (sha256 (base32 - "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf")) + "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")))))) + `(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" + "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"))) + (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 gremlin) + (guix build utils) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-before 'strip 'patch-runpath + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (cut set-file-runpath <> + (list (string-append #$output "/lib") + (dirname (search-input-file + inputs "/lib/libgcc_s.so")) + (dirname (search-input-file + inputs "/lib/libc.so.6")))) + (find-files + #$output + (lambda (file stat) + (and (string-suffix? ".so" file) + (string-contains file "site-packages")))))))))) (inputs (list curl expat freexl + `(,gcc "lib") geos giflib + hdf5 json-c libgeotiff libjpeg-turbo libjxl libpng + librasterlite2 + libspatialite libtiff libwebp lz4 @@ -1463,7 +1486,8 @@ (define-public gdal zlib zstd)) (native-inputs - (list pkg-config + (list bison + pkg-config python)) (propagated-inputs (list python-numpy))