From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IHCHLvCxmGQaWQEASxT56A (envelope-from ) for ; Sun, 25 Jun 2023 23:30:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id wIqgLfCxmGTSNAAAG6o9tA (envelope-from ) for ; Sun, 25 Jun 2023 23:30:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4C41925438 for ; Sun, 25 Jun 2023 23:30:24 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ppELIAjA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687728624; a=rsa-sha256; cv=none; b=UsTHPluaawYAeacRNK65l/eJRmDqjnrNzpafhUQk3prgdw5YRf21JLWiyFtY67ABbJPO9D Y8K8Kv08nmqDlJv4AB0DXwQLdlNULMDzJLdMHwtz6EVexJUjM8dQl8Y1+NlBsJ/bCKRJAG PWIFBzEargCduTFIt/HBnAxa2X1usyuTnPDDvjQ6ziO7NXDbzgR8FkMGsNZiFjG0F2dnAt dFb1qgw/6AUC9mdEvk9nTbIC2JFTZVx0fzitMnBA2FWtUyHFlIyuDXrZYRhtDvuQQTikG0 Lp37m1xsvbrR6ZYJ8qIMqOnmEnO37R01Au6MMtilmVgE7LJ7EvTZNCwceH5BDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ppELIAjA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687728624; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+9Ig/1FwDUgoJxK6DWLoyIjC1skmh53iGUreU3DdKSI=; b=IPDbDuRzG3xCq2uCzE1RxHFv/6RGItg8fWV4kyO1Q5vZuZn7uMkc30UKjt4/d4TKiWM6JL 5+WZOAIHRiQnjy1fJj9rEJC2kuHErHbCgWbiZu1oGs062PRfVkpvzR5pSfC67qch42NqPN em7dhAlNd6vJjjcwRC3PD4UUAbgSUsz+56EYFMv6V8dvOd4bzHczxCRLeNGg9fvHYbJoFh Z7B7J1T5oIXaU7++aJwbNRXn25GWhfIr5Mtl6fvAfcO5lzb+DVRcjQxK2GkeH1AhcF0PSR y7GxpN1DfVXQDDhU0Ke/ixis3br6oPqFzCTR4IFIQJxAxGTDKa+pBgpdLO6qvw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIP-0008VY-1Z; Sun, 25 Jun 2023 17:29: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 1qDXI9-0008PD-LG for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 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 1qDXI9-0003qx-Cp for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI9-0004r4-8W; Sun, 25 Jun 2023 17:29:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 8/9] gnu: celestia: Update to 1.6.3. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772853918575 (code B ref 64287); Sun, 25 Jun 2023 21:29:05 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:59 +0000 Received: from localhost ([127.0.0.1]:43820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXI2-0004pX-BH for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:58 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:57371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHe-0004nF-V8 for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:43 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3f90b8ace97so38821205e9.2 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728509; x=1690320509; 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=+9Ig/1FwDUgoJxK6DWLoyIjC1skmh53iGUreU3DdKSI=; b=ppELIAjA6Y/AKJ7/MDLslFRYwmmFWSi4fiifjVHj5vueTNl4qnDjEuIaSfmi+Fv+mH TUcBU7512g1Po72Ih7xGTfGtPJPuJ1uvij7xYoPJV4c3uYfwj2xvQRRU+Nqyu5dbyX74 bDHLggYcfI5Guda/a4kkaODxurMxRpbeaavokb17emu+TRUFc6+D9fv6yf0n654PigRr M7upULeB7xkpZwR6hjGwyWChqS064GfzAVL0j/4L6DH9A8YwRxfQOybCbkz/47ESNEXf D/TYunmvRxeq7AyXnue8JFaW7uPTuWWS74jIldXjMCrkaIW/EXoKDJ8hPq9MpCC5/v5w iQtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728509; x=1690320509; 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=+9Ig/1FwDUgoJxK6DWLoyIjC1skmh53iGUreU3DdKSI=; b=XOvkyGVzzVpwL0My0XUcx1nvanJQ9eR0ybrRy1OkNiNU60hCVseb5GYjkDtQFZJmCL mpDSpeeWToQ908GxE/hcgRak3bXHCHB8Ko2X/J05gQE8YFYIYrVfkt2o4NY9Z1/632Hg kv1McIUaQIhhCknEh2R0sSYUCzmZ3VwEG6YdrYdbJJJNqAqrwWZyHI2u9O2zctbApXHJ 6ZYcc6VjKnGVEk10YFy2Td/jz6Y8Nxpb4cvisdFIJWfEFSEp1kPhbGRDBTqBYZ4KXM6Z wD20ENq9ekaxOIur/hrNf62/kaHIWVEUVmyhkVTp+xyCF2ifzfskxsZ5G9vYTbhlAHG6 Hgww== X-Gm-Message-State: AC+VfDzFlJbnwkSjTuGWgTdHfQck4+FGMp2g0OL8V5gz6/6A9PYvTgx7 94rTZVyVH+s5ZiJ47Pz34dz6GPJGDS0= X-Google-Smtp-Source: ACHHUZ5kTg3ERFZgoNNgnDq60Q2g3+exDHwUvtlAFhsKnMHumH8xXM2kp+pOkcqh2B5WG9dIOLymNw== X-Received: by 2002:a1c:6a12:0:b0:3fa:934c:8356 with SMTP id f18-20020a1c6a12000000b003fa934c8356mr1474252wmc.10.1687728508955; Sun, 25 Jun 2023 14:28:28 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:28 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:20 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.65 X-Migadu-Queue-Id: 4C41925438 X-Spam-Score: -0.65 X-TUID: d8Pu156gIQSK * gnu/packages/astronomy.scm (celestia): Update to 1.6.3, improve package style. [build-system]: Swap to 'gnu-build-system as versioned tag does not contain Cmake build files. [arguments]: Use G-expressions, update configure-flags to be compatible with autoconf. [native-inputs]: Remove labels. Add autoconf, automake. [inputs]: Remove labels. Remove eigen, fmt-7, glew. --- gnu/packages/astronomy.scm | 91 ++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b212f4614f..af75d493f6 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1129,54 +1129,59 @@ (define-public swarp (license license:gpl3+))) (define-public celestia - (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce")) - (package - (name "celestia") - (version (git-version "1.6.1" "815" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/celestiaproject/celestia") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78")))) - (build-system cmake-build-system) - (native-inputs - `(("perl" ,perl) - ("libgit2" ,libgit2) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool) - ("gettext" ,gettext-minimal))) - (inputs - `(("glu" ,glu) - ("glew" ,glew) - ("libtheora" ,libtheora) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ;; maybe required? - ("mesa" ,mesa) - ;; optional: fmtlib, Eigen3; - ("fmt" ,fmt-7) - ("eigen" ,eigen) - ;; glut: for glut interface - ("freeglut" ,freeglut))) - (propagated-inputs - (list lua)) - (arguments - `(#:configure-flags '("-DENABLE_GLUT=ON" "-DENABLE_QT=OFF") - #:tests? #f)) ;no tests - (home-page "https://celestia.space/") - (synopsis "Real-time 3D visualization of space") - (description - "This simulation program lets you explore our universe in three + (package + (name "celestia") + (version "1.6.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/celestiaproject/celestia") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dzci5n7gcnm1vq916gsn9zddkhbzhbsakqxrpnmvzibsqznn6c8")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Make sure it detects the Lua's version packed in Guix. + ;; Review this part to support current default version of Lua in Guix. + (substitute* "configure.ac" + (("lua5.3") "lua-5.3")))))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "--with-glut" + (string-append "--with-lua=" #$(this-package-input "lua"))))) + (native-inputs + (list autoconf + automake + gettext-minimal + libgit2 + libtool + perl + pkg-config)) + (inputs + (list freeglut + glu + libjpeg-turbo + libpng + libtheora + mesa)) + (propagated-inputs + (list lua)) + (home-page "https://celestia.space/") + (synopsis "Real-time 3D visualization of space") + (description + "This simulation program lets you explore our universe in three dimensions. Celestia simulates many different types of celestial objects. From planets and moons to star clusters and galaxies, you can visit every object in the expandable database and view it from any point in space and time. The position and movement of solar system objects is calculated accurately in real time at any rate desired.") - (license license:gpl2+)))) + (license license:gpl2+))) + (define-public celestia-gtk (package -- 2.40.1