From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54204) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbUGa-0004D5-Kh for guix-patches@gnu.org; Thu, 13 Jun 2019 14:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbUGY-00030w-PI for guix-patches@gnu.org; Thu, 13 Jun 2019 14:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbUGY-00030Q-Jx for guix-patches@gnu.org; Thu, 13 Jun 2019 14:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hbUGY-0003Le-ES for guix-patches@gnu.org; Thu, 13 Jun 2019 14:16:02 -0400 Subject: [bug#36197] [Patch] gnu: add celestia; celestia-gtk Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:54061) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbUGG-0003VG-6H for guix-patches@gnu.org; Thu, 13 Jun 2019 14:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbUG5-0002AQ-Lt for guix-patches@gnu.org; Thu, 13 Jun 2019 14:15:40 -0400 Received: from knopi.disroot.org ([178.21.23.139]:40644) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbUFt-0001gK-5B for guix-patches@gnu.org; Thu, 13 Jun 2019 14:15:23 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 50D2D34808 for ; Thu, 13 Jun 2019 20:15:14 +0200 (CEST) Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ba6z-83R3jOx for ; Thu, 13 Jun 2019 20:15:12 +0200 (CEST) From: Amar Singh Date: Thu, 13 Jun 2019 23:45:05 +0530 Message-ID: <855zp9gxna.fsf@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36197@debbugs.gnu.org --=-=-= Content-Type: text/plain Added Celestia; space visualisation and simulator to (gnu packages astronomy). Tests are disabled because the project does not include any tests. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-celestia.patch Content-Transfer-Encoding: quoted-printable >From dba590074e9a0c7cf3dc8440492190de732feaea Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Sun, 19 May 2019 12:39:48 +0530 Subject: [PATCH 1/2] gnu: Add celestia. * gnu/packages/astronomy.scm (celestia): New variable. --- gnu/packages/astronomy.scm | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9ddb9e1d52..c0ddbca033 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2016 John Darrington ;;; Copyright =C2=A9 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018, 2019 Efraim Flashner +;;; Copyright =C2=A9 2019 by Amar Singh ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,11 +23,18 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages image) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) + #:use-module (gnu packages version-control) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xiph) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages algebra) + #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages gl) #:use-module (gnu packages qt) @@ -176,3 +184,57 @@ programs for the manipulation and analysis of astronom= ical data.") can be used to control telescopes over a serial port for tracking celestial objects.") (license license:gpl2+))) + +(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) + ("libpng" ,libpng) + ;; maybe required? + ("mesa" ,mesa) + ;; optional: fmtlib, Eigen3; + ("fmt" ,fmt) + ("eigen" ,eigen) + ;; glut: for glut interface + ("freeglut" ,freeglut))) + (propagated-inputs + `(("lua" ,lua))) + (arguments + `(#:configure-flags '("-DENABLE_GLUT=3DON" "-DENABLE_QT=3DOFF") + #:tests? #f)) + (home-page "https://celestia.space/") + (synopsis "Real-time 3D visualization of space") + (description + "The free space simulation that lets you explore our universe in th= ree +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)))) --=20 2.22.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-celestia-gtk.patch >From c8dd3c6871da910761ea8908f6bc9866c7f3c5ac Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Thu, 13 Jun 2019 22:53:22 +0530 Subject: [PATCH 2/2] gnu: Add celestia-gtk. * gnu/packages/astronomy.scm (celestia-gtk): New variable. --- gnu/packages/astronomy.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c0ddbca033..206b9b0b5a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -38,6 +38,8 @@ #:use-module (gnu packages perl) #:use-module (gnu packages gl) #:use-module (gnu packages qt) + #:use-module (gnu packages gtk) + #:use-module (gnu packages gnome) #:use-module (gnu packages maths) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) @@ -238,3 +240,18 @@ 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)))) + +(define-public celestia-gtk + (package (inherit celestia) + (name "celestia-gtk") + (version (package-version celestia)) + (inputs + (append (filter (lambda (x) + (not (equal? (car x) "freeglut"))) + (package-inputs celestia)) + `(("gtk2" ,gtk+-2) + ("gtkglext" ,gtkglext)))) + (arguments + `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF") + #:tests? #f)))) + -- 2.22.0 --=-=-=--