From patchwork Sat Jan 20 11:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 59223 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 9FD5327BBEA; Sat, 20 Jan 2024 11:31:18 +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_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 B6B8B27BBE2 for ; Sat, 20 Jan 2024 11:31:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR9Z2-0003LW-O0; Sat, 20 Jan 2024 06:31:04 -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 1rR9Z0-0003Kr-6N for guix-patches@gnu.org; Sat, 20 Jan 2024 06:31:02 -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 1rR9Yz-0007tJ-Up for guix-patches@gnu.org; Sat, 20 Jan 2024 06:31:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR9Z0-0000Z9-8l; Sat, 20 Jan 2024 06:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68606] [PATCH 1/2] gnu: gdal: Update to 3.8.3. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 11:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68606@debbugs.gnu.org Cc: Roman Scherer , Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher Received: via spool by 68606-submit@debbugs.gnu.org id=B68606.1705750242789 (code B ref 68606); Sat, 20 Jan 2024 11:31:02 +0000 Received: (at 68606) by debbugs.gnu.org; 20 Jan 2024 11:30:42 +0000 Received: from localhost ([127.0.0.1]:33020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR9Yg-0000CW-7W for submit@debbugs.gnu.org; Sat, 20 Jan 2024 06:30:42 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:49317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR9Ye-0008V1-IV for 68606@debbugs.gnu.org; Sat, 20 Jan 2024 06:30:41 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a277339dcf4so179720166b.2 for <68606@debbugs.gnu.org>; Sat, 20 Jan 2024 03:30:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20230601.gappssmtp.com; s=20230601; t=1705750231; x=1706355031; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TwljMqdWuXiHc9p8lwNdBifqw+jkeUsLIFHbLJ+L3yE=; b=Rd/xR2a8hthM52u2km/EnnjUa6nRdrTGPD5zBW20VRzOZOOrlsi07jlI/p9kFlM3AK VwhWY6GwkRFsiyhE49eSXH3zw7XGreXOj0YzJHGAB+HPP5upSAVPjdFKsJ8z7GEQaH35 w6LliwLagatzYY+YLmou0QBfJq3j/xKvhydm/7j9bD2wHuRdtEe9gv9EdfsV5fAPnQgB 8QWAZSoYObt964vwGvkxf82geQ67ZYhQEGnzeRmVuvb2Bz+a3+Wl+xdogFb/hzJzTsAX uMfyuXaMpt5YK/5+FFvkzBP7LftB31eEzYHESVKPwhICZ77QI3oA7zzmTsjMrE0nq8M6 9Rrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705750231; x=1706355031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TwljMqdWuXiHc9p8lwNdBifqw+jkeUsLIFHbLJ+L3yE=; b=JA4Aa3SWHw59XnnstCfe9BJRKe4XCfeVmAtkiwPbT5TXmxneIloT//P2ZKsjs5ct8H 9VYstPwIcy5IjiVK5+T0rk1zca3Nk7oQGkoOFZLIKAeflQqWlmSGFm40aq0hARpK4SCX +TDevsyD+IQQSPX3euhcPascqzWSvPQYeB9/fIaWX4gUSfcLRWNWjGpvswk8k/5UdZuV qP+EMlGqFDwUuOrRg0Aslc6uZa781j7JL5HjPX3f/Mt2QxQyrTAe3LSS89DaCb4KJn06 MZXxHzw/cTBbGM+7Bq6VucTb7A0o+IdaoVOVnjHeTh841jNS7jP/Das1uLcXaTjvg7WL 8Vvw== X-Gm-Message-State: AOJu0YwOFgTayfmTQx0G6CY31BZQPJPkQaqISJBo97XjJJdlcg6jTtuU JrKfJ/Cv8q6pUhLGA3rV6fPdm76gf+zXR4Ut6P00I42WahpzKLoEJ8RDVOkYc+fwW/QdZDRlG4K t X-Google-Smtp-Source: AGHT+IFqjBpROQWgWh+8DKPFAt+J0CwZ3ZHg9n7b2cKRv8MY5/Q7L2VBd4h2OPhASvCtFTNJP7a1RQ== X-Received: by 2002:a17:906:4f8a:b0:a2e:d65b:b320 with SMTP id o10-20020a1709064f8a00b00a2ed65bb320mr612282eju.96.1705750231205; Sat, 20 Jan 2024 03:30:31 -0800 (PST) Received: from precision.. (tmo-084-132.customers.d1-online.com. [80.187.84.132]) by smtp.gmail.com with ESMTPSA id l16-20020a1709067d5000b00a26f6b8be1csm11246572ejp.75.2024.01.20.03.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 03:30:30 -0800 (PST) From: Roman Scherer Date: Sat, 20 Jan 2024 12:30:25 +0100 Message-ID: <056f13e780254afc311925b568d747eeba65db27.1705747715.git.roman@burningswell.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/geo.scm (gdal): Update to 3.8.3. Change-Id: Ib36177e1cb37e3852475cc0c1da3eb8747aac6d5 --- gnu/packages/geo.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 14e2d9f16b..3c82f2f3af 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1172,7 +1172,7 @@ (define-public spatialite-gui (define-public gdal (package (name "gdal") - (version "3.6.1") + (version "3.8.3") (source (origin (method url-fetch) (uri (string-append @@ -1180,7 +1180,7 @@ (define-public gdal version ".tar.gz")) (sha256 (base32 - "1qckwnygszxkkq40bf87s3m1sab6jj9jyakdvskh0qf7dq8zjarf")) + "1sj9l1hjfs5d0mnv71iy8zk2xprn46h8gxq0cai9v7i3m23h78zp")) (modules '((guix build utils))) (snippet `(begin @@ -1193,14 +1193,33 @@ (define-public gdal "frmts/jpeg/libjpeg12" "frmts/gtiff/libtiff" "frmts/gtiff/libgeotiff" - "frmts/zlib" "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 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 @@ -1227,7 +1246,8 @@ (define-public gdal zlib zstd)) (native-inputs - (list pkg-config + (list patchelf + pkg-config python)) (propagated-inputs (list python-numpy)) From patchwork Sat Jan 20 11:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 59224 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 04ED527BBEA; Sat, 20 Jan 2024 11:31:21 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 7467227BBE2 for ; Sat, 20 Jan 2024 11:31:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rR9Z0-0003Ks-Cu; Sat, 20 Jan 2024 06:31: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 1rR9Yy-0003Ke-5C for guix-patches@gnu.org; Sat, 20 Jan 2024 06:31:00 -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 1rR9Yx-0007t8-Td for guix-patches@gnu.org; Sat, 20 Jan 2024 06:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rR9Z0-0000Zj-Kp; Sat, 20 Jan 2024 06:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68606] [PATCH 2/2] gnu: gdal: Build Java bindings. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 11:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68606@debbugs.gnu.org Cc: Roman Scherer , Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher Received: via spool by 68606-submit@debbugs.gnu.org id=B68606.17057502471118 (code B ref 68606); Sat, 20 Jan 2024 11:31:02 +0000 Received: (at 68606) by debbugs.gnu.org; 20 Jan 2024 11:30:47 +0000 Received: from localhost ([127.0.0.1]:33022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR9Yk-0000Hc-RU for submit@debbugs.gnu.org; Sat, 20 Jan 2024 06:30:47 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rR9Yf-00005P-Ms for 68606@debbugs.gnu.org; Sat, 20 Jan 2024 06:30:42 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40e586a62f7so19738395e9.2 for <68606@debbugs.gnu.org>; Sat, 20 Jan 2024 03:30:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20230601.gappssmtp.com; s=20230601; t=1705750232; x=1706355032; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S6bxkL9F+flcujyH8PkLtSkZKHHp0tXHKi40Mg0Aswo=; b=eskTfSOoaf5ZMYL9QGxu0klZzH7VpUwtMavVAQHUOQj3cfYvrusuKvivNUjJjqzz7x ysJAiWlLGfbrT469V1w+sn1L+jA/opSgglWsj9fXxNTL6dbKWubj/ia+e/UXeCySmXoj pDoenAx8bXs41Au97Q20XolfnGGf72XVp6H70wrffbqZClqwknN3OVvvxc+IEUTfREEM 8wVSoY/593taK9fFNTMuUYCct86Zv19B2SPMfs72KQ+e4ZIZf+s0SulVMPBstRMwsbEw 3POCC5UpwMslVmER7h4s1XkdgvGvGL/13RUborRoo7p3V9dAw5/uxHgduEuAEdfpn47p 1Xxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705750232; x=1706355032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S6bxkL9F+flcujyH8PkLtSkZKHHp0tXHKi40Mg0Aswo=; b=OZQyxLiVHMvm8MAuVNawIt8IGQHnM0sFFCH5lr1s1XZPzk+Qm2y4X3mJslv3dTYnP/ H3YNXt1WsseYGFWSwnW8SEayHlSHcP1NGUuRATLOtwUkqRs6G32zlAqb1vXXtqrOOA3F mULlLf0oAQW1zK+RLXEbcgBriBQL25fLz7ICcI2NwCSEWJdvJjDrFchha1TWbvRFAEQC OpaMD4Q4rzcSZrJROuInCgyP5ZKHtJY+pCSpNCiqQ9t8l6f2YPlOyiWgYQOYmX0yokBi XX9MJ5j5wjeu8ksEpTVetmZKRdkw1jwYqnlsR8KNHcLCazudrF0S0tfbyCDOfK8WfmoW 61kg== X-Gm-Message-State: AOJu0Yz97RRK9JnhLTSHUW8WlkSM+1e4biYPpC1ZQbp5oruQe49WATjv yL/ULZM3gNuIE0EOTSS0m/XSHlMMk7PmsX9Oz/XX90n289NvDa5XHo5tc4gFZjiwxZoXbpntHzo 0 X-Google-Smtp-Source: AGHT+IE/W6lZs3wVp8Jw1Q2Au6mPfo24scdu8tVNxpt+VtOpGjyer8/0/cuuXDILQcD+uUIdxOX8HA== X-Received: by 2002:a05:600c:4b1b:b0:40e:8f4c:9fd6 with SMTP id i27-20020a05600c4b1b00b0040e8f4c9fd6mr829175wmp.137.1705750232618; Sat, 20 Jan 2024 03:30:32 -0800 (PST) Received: from precision.. (tmo-084-132.customers.d1-online.com. [80.187.84.132]) by smtp.gmail.com with ESMTPSA id l16-20020a1709067d5000b00a26f6b8be1csm11246572ejp.75.2024.01.20.03.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 03:30:31 -0800 (PST) From: Roman Scherer Date: Sat, 20 Jan 2024 12:30:26 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/geo.scm (gdal): Build Java bindings. Change-Id: I6c6a6d4b5f7c6692d443d8ebf288dfe6c4ccad87 --- gnu/packages/geo.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c82f2f3af..d2d78197c3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1207,6 +1207,10 @@ (define-public gdal (ice-9 popen)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-JAVA_HOME + (lambda* (#:key inputs #:allow-other-keys) + (let ((jdk (assoc-ref inputs "jdk"))) + (setenv "JAVA_HOME" jdk)))) (add-after 'install 'fix-rpath (lambda* (#:key outputs #:allow-other-keys) (let ((libdir (string-append (assoc-ref outputs "out") "/lib"))) @@ -1246,9 +1250,11 @@ (define-public gdal zlib zstd)) (native-inputs - (list patchelf - pkg-config - python)) + `(("ant" ,ant) + ("jdk" ,openjdk11 "jdk") + ("patchelf" ,patchelf) + ("pkg-config" ,pkg-config) + ("python" ,python))) (propagated-inputs (list python-numpy)) (home-page "https://gdal.org/")