all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / Atom feed
* [bug#47447] [PATCH] gnu: Add entt.
@ 2021-03-28 10:03 Alexandru-Sergiu Marton
  2021-03-28 10:44 ` Leo Prikler
  0 siblings, 1 reply; 5+ messages in thread
From: Alexandru-Sergiu Marton @ 2021-03-28 10:03 UTC (permalink / raw)
  To: 47447; +Cc: Alexandru-Sergiu Marton

* 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 <brettg@gnu.org>
 ;;; Copyright © 2020 Milkey Mouse <milkeymouse@meme.institute>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
-
+;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;;
 ;;; 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")))))))
-- 
2.31.0





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#47447] [PATCH] gnu: Add entt.
  2021-03-28 10:03 [bug#47447] [PATCH] gnu: Add entt Alexandru-Sergiu Marton
@ 2021-03-28 10:44 ` Leo Prikler
  2021-03-31 18:18   ` Alexandru-Sergiu Marton
  0 siblings, 1 reply; 5+ messages in thread
From: Leo Prikler @ 2021-03-28 10:44 UTC (permalink / raw)
  To: Alexandru-Sergiu Marton, 47447

Am Sonntag, den 28.03.2021, 13:03 +0300 schrieb Alexandru-Sergiu
Marton:
> * 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 <brettg@gnu.org>
>  ;;; Copyright © 2020 Milkey Mouse <milkeymouse@meme.institute>
>  ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
> -
> +;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
>  ;;;
>  ;;; 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
> +                "17w0gx6xah8j2d1kc6ly7a8jvkp4jspmn505w724hynlvlx1192
> x"))))
> +    (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++.")
Please cut down on the marketing buzzwords :)
> +    (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
> +                  "1amlr4amj94xnmbdz94292vfkxbl92azsr5s41vcqqjmarwkk
> hfh")))))))
Would it be possible to cherry-pick this commit and add it to the
patches field of entt's origin?

Regards,
Leo





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#47447] [PATCH] gnu: Add entt.
  2021-03-28 10:44 ` Leo Prikler
@ 2021-03-31 18:18   ` Alexandru-Sergiu Marton
  2021-04-07 11:15     ` [bug#47447] [PATCH v2] " Alexandru-Sergiu Marton
  0 siblings, 1 reply; 5+ messages in thread
From: Alexandru-Sergiu Marton @ 2021-03-31 18:18 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 47447

Hi,

Leo Prikler writes:

> Would it be possible to cherry-pick this commit and add it to the
> patches field of entt's origin?

I'm inexperienced with cherry-picking. I will try to do it, but the
maintainer mentioned another release might come soon, so if that happens
before I get to figure this out, I will come back with a recipe for the
new version which will contain the fixed tests too.

Cheers.

-- 
Alexandru-Sergiu Marton
https://brown.121407.xyz




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#47447] [PATCH v2] gnu: Add entt.
  2021-03-31 18:18   ` Alexandru-Sergiu Marton
@ 2021-04-07 11:15     ` Alexandru-Sergiu Marton
  2021-04-07 11:46       ` bug#47447: " Leo Prikler
  0 siblings, 1 reply; 5+ messages in thread
From: Alexandru-Sergiu Marton @ 2021-04-07 11:15 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 47447

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

I wrote:

> Leo Prikler writes:
>
>> Would it be possible to cherry-pick this commit and add it to the
>> patches field of entt's origin?
>
> I'm inexperienced with cherry-picking. I will try to do it, but the
> maintainer mentioned another release might come soon, so if that happens
> before I get to figure this out, I will come back with a recipe for the
> new version which will contain the fixed tests too.

The new release indeed came and after a discussion with the maintainer I
managed to get all the tests running too. I'm attaching the a new patch
with the lastest version to this email.

Cheers.

-- 
Alexandru-Sergiu Marton
https://brown.121407.xyz

[-- Attachment #2: v2-0001-gnu-Add-entt.patch --]
[-- Type: text/x-patch, Size: 2763 bytes --]

From ff79e8c2a8f70cde214a10091747f8e2ae8db052 Mon Sep 17 00:00:00 2001
From: Alexandru-Sergiu Marton <brown121407@posteo.ro>
Date: Sun, 28 Mar 2021 12:56:53 +0300
Subject: [PATCH v2] gnu: Add entt.

* gnu/packages/cpp.scm (entt): New variable.
---
 gnu/packages/cpp.scm | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 2a00d3838a..be9aa5ff30 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -18,7 +18,7 @@
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Milkey Mouse <milkeymouse@meme.institute>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
-
+;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;;
 ;;; 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,34 @@ of reading and writing XML.")
     ;; incompatible with the GPL v2.  Refer to the file named FLOSSE for the
     ;; details.
     (license license:gpl2+)))
+
+(define-public entt
+  (package
+    (name "entt")
+    (version "3.7.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
+                "0nzvnhiw3r6nkmxp749zwxc8kzja09nijyxibdbri3g2i7pysf58"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags (list "-DENTT_BUILD_TESTING=ON"
+                               "-DENTT_FIND_GTEST_PACKAGE=ON"
+                               "-DENTT_BUILD_DOCS=ON")
+       #:build-type "Debug")) ;; Only tests are compiled; this is needed so
+                              ;; that assertions work.
+    (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
-- 
2.31.0


^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#47447: [PATCH v2] gnu: Add entt.
  2021-04-07 11:15     ` [bug#47447] [PATCH v2] " Alexandru-Sergiu Marton
@ 2021-04-07 11:46       ` Leo Prikler
  0 siblings, 0 replies; 5+ messages in thread
From: Leo Prikler @ 2021-04-07 11:46 UTC (permalink / raw)
  To: Alexandru-Sergiu Marton; +Cc: 47447-done

Hello,
Am Mittwoch, den 07.04.2021, 14:15 +0300 schrieb Alexandru-Sergiu
Marton:
> The new release indeed came and after a discussion with the
> maintainer I
> managed to get all the tests running too. I'm attaching the a new
> patch
> with the lastest version to this email.
> 
> Cheers.
Thanks!  I've applied some small cosmetic changes, moved the package to
game-development.scm (where I feel it would fit better) and pushed it
to master.

Regards,
Leo





^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-04-07 11:47 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-28 10:03 [bug#47447] [PATCH] gnu: Add entt Alexandru-Sergiu Marton
2021-03-28 10:44 ` Leo Prikler
2021-03-31 18:18   ` Alexandru-Sergiu Marton
2021-04-07 11:15     ` [bug#47447] [PATCH v2] " Alexandru-Sergiu Marton
2021-04-07 11:46       ` bug#47447: " Leo Prikler

all messages for Guix-related lists mirrored at yhetil.org

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix

Example config snippet for mirrors.


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git