From patchwork Tue Sep 28 06:34:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33385 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 E315027BBE3; Tue, 28 Sep 2021 07:36:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A49FE27BBE1 for ; Tue, 28 Sep 2021 07:36:36 +0100 (BST) Received: from localhost ([::1]:51692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV6jD-00043f-OV for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 02:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV6ih-0003UT-5p for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV6ig-0007jx-Ua for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mV6ig-0000NB-Rb for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50812] [PATCH v4 1/5] gnu: proj: Update to 7.2.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 06:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50812@debbugs.gnu.org Cc: Guillaume Le Vaillant , Felix Gruber , Xinglu Chen , Maxime Devos Received: via spool by 50812-submit@debbugs.gnu.org id=B50812.16328109221316 (code B ref 50812); Tue, 28 Sep 2021 06:36:02 +0000 Received: (at 50812) by debbugs.gnu.org; 28 Sep 2021 06:35:22 +0000 Received: from localhost ([127.0.0.1]:43566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6i2-0000LA-7g for submit@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6hz-0000Kl-KQ for 50812@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:20 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C17EA240028 for <50812@debbugs.gnu.org>; Tue, 28 Sep 2021 08:35:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632810913; bh=ig8SXw2r88MfaE68tpnJOdVl7ygje13zji2dgXpICFU=; h=From:To:Cc:Subject:Date:From; b=hIXxJ8S7UPcaym+PVrmGt98esyb51vgOs0BhdHX7myl6Wxx1BHrRB9nbXHURF3kRJ 5+AxyADYrnZTDDp9Ex6ue+oYBCiXiAtVhysQ2gEXzJzJfmxX44CMi4gOT3OLVSxRJW 4/pVrm55yjTcy0zPD26yFur7MpNH8lJ3qOcNh41+0nh+5aRcnJyKgTBjG0uT+7xV6E DF6FabZGKyrQAAwDMgLjb3eReN+OuPJC7EnGsKEKi/ZGfQKWfm2kBEMicTMtAKsxo4 PvmGVPXhPPKq0/KZnPEWUhp40/IUJEplX7lvv3biO4Jj1/P14K+aofpgIffbDDffsu wlVWxqPD/yQEQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJV9r5zyJz6tmH; Tue, 28 Sep 2021 08:35:12 +0200 (CEST) From: Felix Gruber Date: Tue, 28 Sep 2021 06:34:40 +0000 Message-Id: <20210928063444.466158-2-felgru@posteo.net> In-Reply-To: <20210928063444.466158-1-felgru@posteo.net> References: <20210926085219.13547-1-felgru@posteo.net> <20210928063444.466158-1-felgru@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (proj): Update to 7.2.1. [build-system]: Change to cmake-build-system. [arguments]: Add configure flag to find googletest. [inputs]: Add curl, libjpeg-turbo and libtiff. [native-inputs]: Add googletest. [description]: Consistently call the package Proj, instead of Proj, PROJ or proj. Use @acronym to define CRS. --- gnu/packages/geo.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9d4a1a8955..ec45601ef4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -514,7 +514,7 @@ fully fledged Spatial SQL capabilities.") (define-public proj (package (name "proj") - (version "6.3.1") + (version "7.2.1") (source (origin (method url-fetch) @@ -522,22 +522,28 @@ fully fledged Spatial SQL capabilities.") version ".tar.gz")) (sha256 (base32 - "1y46ij32j9b4x1kjnnlykcwk3kkjwkg44sfc1ziwm3a3g0ki3q3d")))) - (build-system gnu-build-system) + "050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON"))) (inputs - `(("sqlite" ,sqlite))) + `(("curl" ,curl) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libtiff" ,libtiff) + ("sqlite" ,sqlite))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) (home-page "https://proj.org/") (synopsis "Coordinate transformation software") (description "Proj is a generic coordinate transformation software that transforms -geospatial coordinates from one coordinate reference system (CRS) to another. -This includes cartographic projections as well as geodetic transformations. -PROJ includes command line applications for easy conversion of coordinates -from text files or directly from user input. In addition, proj also exposes -an application programming interface that lets developers use the -functionality of proj in their own software.") +geospatial coordinates from one @acronym{CRS, coordinate reference system} +to another. This includes cartographic projections as well as geodetic +transformations. Proj includes command line applications for easy +conversion of coordinates from text files or directly from user input. +In addition, Proj also exposes an application programming interface that +lets developers use the functionality of Proj in their own software.") (license (list license:expat ;; src/projections/patterson.cpp license:asl2.0