From patchwork Sun Mar 28 10:03:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Sergiu Marton X-Patchwork-Id: 28153 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 2A65E27BC64; Sun, 28 Mar 2021 11:05:38 +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_H4,RCVD_IN_MSPIKE_WL,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 05F9927BC63 for ; Sun, 28 Mar 2021 11:05:37 +0100 (BST) Received: from localhost ([::1]:59774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQSIa-0002Wc-27 for patchwork@mira.cbaines.net; Sun, 28 Mar 2021 06:05:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQSI2-0002WU-5B for guix-patches@gnu.org; Sun, 28 Mar 2021 06:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQSI1-0002HQ-U2 for guix-patches@gnu.org; Sun, 28 Mar 2021 06:05:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQSI1-0003qR-OO for guix-patches@gnu.org; Sun, 28 Mar 2021 06:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47447] [PATCH] gnu: Add entt. Resent-From: Alexandru-Sergiu Marton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Mar 2021 10:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47447 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47447@debbugs.gnu.org Cc: Alexandru-Sergiu Marton X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161692585314720 (code B ref -1); Sun, 28 Mar 2021 10:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Mar 2021 10:04:13 +0000 Received: from localhost ([127.0.0.1]:45449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQSHD-0003pK-N7 for submit@debbugs.gnu.org; Sun, 28 Mar 2021 06:04:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:60212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQSH8-0003p9-JQ for submit@debbugs.gnu.org; Sun, 28 Mar 2021 06:04:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQSH6-00021V-Sy for guix-patches@gnu.org; Sun, 28 Mar 2021 06:04:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQSH1-0001Pl-48 for guix-patches@gnu.org; Sun, 28 Mar 2021 06:04:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EC54F2400FB for ; Sun, 28 Mar 2021 12:03:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.ro; s=2017; t=1616925834; bh=wo5eTYvSWs69z+x2L356wh4NHlnh1nZ+MUtM8hAtMI8=; h=From:To:Cc:Subject:Date:From; b=iiKLNjUJhyBx7v/lse6BWaQLiyGMr7WcUbMvCbgs8hoir2laLSg4D+r/eIk9yxXwI wMOAkmn4zMW5MSWRQ8TTzfQAR+W3k1eJ9aa+G3Rvu4VBWU2lFDwppQ/37EEXCkTRU+ c3hh6ATaBPZs2crVfsa/fzkHYVM86SF8YN89ZfKs2psYy1zP8NKL+cKF3uEfyBlU10 m1A0WW9nUNNPzImqbDf5P1b1KO8AwwHhpdUdLKGxqFMaHWskUrsDPVwdZD6x1I6qnf em//wn03/6bJfJBbtYX+glUYryeVHa5WMC1E1BsQXdNjw/soj0adKyoKj5xFHojG07 4Z9uoacOLG/cw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4F7WWY1lGjz6tmQ; Sun, 28 Mar 2021 12:03:52 +0200 (CEST) From: Alexandru-Sergiu Marton Date: Sun, 28 Mar 2021 13:03:22 +0300 Message-Id: <20210328100322.31991-1-brown121407@posteo.ro> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=brown121407@posteo.ro; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/cpp.scm (entt): New variable. (entt-fixed-tests): New variable. --- gnu/packages/cpp.scm | 51 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2a00d3838a..449b4c1c06 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse ;;; Copyright © 2021 Raghav Gururajan - +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +57,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) + #:use-module (gnu packages graphviz) #:use-module (gnu packages libevent) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) @@ -1211,3 +1212,51 @@ of reading and writing XML.") ;; incompatible with the GPL v2. Refer to the file named FLOSSE for the ;; details. (license license:gpl2+))) + +;; TODO: Make public and remove the fix below when the next release comes and +;; fixes the failing tests. +(define entt + (package + (name "entt") + (version "3.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skypjack/entt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17w0gx6xah8j2d1kc6ly7a8jvkp4jspmn505w724hynlvlx1192x")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENTT_BUILD_TESTING=ON" + "-DENTT_FIND_GTEST_PACKAGE=ON" + "-DENTT_BUILD_DOCS=ON"))) + (native-inputs + `(("googletest" ,googletest) + ("doxygen" ,doxygen) ; These two packages are needed for + ("graphviz" ,graphviz))) ; generating the documentation. + (synopsis "Fast and reliable entity component system (ECS)") + (description "EnTT is a header-only, tiny and easy to use library for game +programming and much more written in modern C++.") + (home-page "https://github.com/skypjack/entt") + (license (list license:expat ; for the code + license:cc-by4.0)))) ; for the docs + +(define-public entt-fixed-tests + ;; This commit fixes two tests that are failing on the 3.6.0 version. + (let ((commit "14915368c7d4fa87e944cb55ffae1bb88cc6ef4c") + (revision "1")) + (package + (inherit entt) + (name "entt") + (version (git-version "v3.6.0" revision commit)) + (source (origin + (inherit (package-source entt)) + (uri (git-reference + (url "https://github.com/skypjack/entt") + (commit commit))) + (sha256 + (base32 + "1amlr4amj94xnmbdz94292vfkxbl92azsr5s41vcqqjmarwkkhfh")))))))