unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#30084] [PATCH] gnu: Add urho3d.
@ 2018-01-10 22:24 Oleg Pykhalov
  2018-01-12 14:01 ` Ludovic Courtès
  2020-03-22 20:42 ` Leo Famulari
  0 siblings, 2 replies; 6+ messages in thread
From: Oleg Pykhalov @ 2018-01-10 22:24 UTC (permalink / raw)
  To: 30084


[-- Attachment #1.1: Type: text/plain, Size: 48 bytes --]

Hello Guix,

This patch adds a 3D game engine.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] gnu: Add urho3d. --]
[-- Type: text/x-patch, Size: 3195 bytes --]

From 186090075a1ae515bb4893763e7c528568e15939 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Thu, 11 Jan 2018 01:14:41 +0300
Subject: [PATCH] gnu: Add urho3d.

* gnu/packages/game-development.scm (urho3d): New public variable.
---
 gnu/packages/game-development.scm | 51 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 363d9a253..69045cf9c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1150,3 +1150,54 @@ features design tools such as a visual editor, can import 3D models and
 provide high-quality 3D rendering, it contains an animation editor, and can be
 scripted in a Python-like language.")
     (license license:expat)))
+
+(define-public urho3d
+  (package
+    (name "urho3d")
+    (version "1.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/urho3d/Urho3D"
+                                  "/archive/" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1im63n9rx8qq1ks6aq6jrl5ikxg87hqhsy06miqc317hpm1iyav5"))))
+    (build-system cmake-build-system)
+    (inputs `(("libx11" ,libx11)
+              ("libxcursor" ,libxcursor)
+              ("libxext" ,libxext)
+              ("libxi" ,libxi)
+              ("libxinerama" ,libxinerama)
+              ("libxrandr" ,libxrandr)
+              ("libxrender" ,libxrender)
+              ("libxscrnsaver" ,libxscrnsaver)
+              ("mesa" ,mesa)
+              ("alsa-lib" ,alsa-lib)
+              ("pulseaudio" ,pulseaudio)))
+    (arguments
+     '(#:tests?
+       #f ; There are no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'use-full-library-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (string-append "../build/Source/ThirdParty"
+                                         "/SDL/include/generated/SDL_config.h")
+               (("#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC \"libasound\\.so\\.2\"")
+                (string-append "#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC \""
+                               (assoc-ref inputs "alsa-lib")
+                               "/lib/libasound.so.2"
+                               "\""))
+               (((string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC"
+                                " \"libpulse-simple\\.so\\.0\""))
+                (string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC \""
+                               (assoc-ref inputs "pulseaudio")
+                               "/lib/libpulse-simple.so.0"
+                               "\"")))
+             #t)))))
+    (home-page "https://urho3d.github.io/")
+    (synopsis "Cross-platform 2D and 3D game engine")
+    (description "Lightweight, cross-platform 2D and 3D game engine
+implemented in C++.  Inspired by OGRE and Horde3D.")
+    (license license:expat)))
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 910 bytes --]


Also the latest version of engine could be build with:

--8<---------------cut here---------------start------------->8---
(define-public urho3d-checkout
  (let ((commit "4af4148048a6443154c6f0498d32626d10f1e86b")
        (revision "1"))
    (package
      (inherit urho3d)
      (name "urho3d-checkout")
      (version (string-append (package-version urho3d) "-" revision "."
                              (string-take commit 7)))
      (source (origin
                (method git-fetch)
                (uri (git-reference
                      (url "https://github.com/urho3d/Urho3D")
                      (commit commit)))
                (file-name (string-append name "-" version "-checkout"))
                (sha256
                 (base32
                  "1nchxswrkfgzsxghi6c55b27zy9127ni7yvnb4xw2xdddyfm1wl0")))))))--8<---------------cut here---------------end--------------->8---

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

* [bug#30084] [PATCH] gnu: Add urho3d.
  2018-01-10 22:24 [bug#30084] [PATCH] gnu: Add urho3d Oleg Pykhalov
@ 2018-01-12 14:01 ` Ludovic Courtès
  2018-01-23 13:29   ` Oleg Pykhalov
  2020-03-22 20:42 ` Leo Famulari
  1 sibling, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2018-01-12 14:01 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 30084

Hi Oleg,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> From 186090075a1ae515bb4893763e7c528568e15939 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Thu, 11 Jan 2018 01:14:41 +0300
> Subject: [PATCH] gnu: Add urho3d.
>
> * gnu/packages/game-development.scm (urho3d): New public variable.

[...]

> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* (string-append "../build/Source/ThirdParty"
> +                                         "/SDL/include/generated/SDL_config.h")

IIUC there’s a bundled copy of SDL, right?  Can we instead build against
our SDL?

Ideally, to be safe from bundling, we should “rm -rf ThirdParty” in a
snippet.  Is that possible?

> +               (((string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC"
> +                                " \"libpulse-simple\\.so\\.0\""))
> +                (string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC \""
> +                               (assoc-ref inputs "pulseaudio")
> +                               "/lib/libpulse-simple.so.0"
> +                               "\"")))

Please use a literal string in the ‘substitute*’ pattern (you can use
backslashes to split it on several lines.)

> +    (description "Lightweight, cross-platform 2D and 3D game engine
> +implemented in C++.  Inspired by OGRE and Horde3D.")

Full sentences please!  :-)

  https://www.gnu.org/software/guix/manual/html_node/Synopses-and-Descriptions.html

Could you send an updated path?

Thank you,
Ludo’.

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

* [bug#30084] [PATCH] gnu: Add urho3d.
  2018-01-12 14:01 ` Ludovic Courtès
@ 2018-01-23 13:29   ` Oleg Pykhalov
  2018-01-23 14:07     ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Oleg Pykhalov @ 2018-01-23 13:29 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 30084


[-- Attachment #1.1: Type: text/plain, Size: 2709 bytes --]

Hello Ludovic,

Thank you for review!

ludo@gnu.org (Ludovic Courtès) writes:

> Hi Oleg,
>
> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>
>> From 186090075a1ae515bb4893763e7c528568e15939 Mon Sep 17 00:00:00 2001
>> From: Oleg Pykhalov <go.wigust@gmail.com>
>> Date: Thu, 11 Jan 2018 01:14:41 +0300
>> Subject: [PATCH] gnu: Add urho3d.
>>
>> * gnu/packages/game-development.scm (urho3d): New public variable.
>
> [...]
>
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             (substitute* (string-append "../build/Source/ThirdParty"
>> +                                         "/SDL/include/generated/SDL_config.h")
>
> IIUC there’s a bundled copy of SDL, right?  Can we instead build against
> our SDL?

Yes, it's a bundled copy.  We probably can, but how?  The build system
probably configured look for 'Source/ThirdParty/SDL'.  So should we make
a symbolic link like 'Source/ThirdParty/SDL' -> '/gnu/store/…-SDL'?

I'll check this later.  Maybe it will search for a system first SDL and
if not find it use their own.  Also I have a question about SDL in the
following quote.

> Ideally, to be safe from bundling, we should “rm -rf ThirdParty” in a
> snippet.  Is that possible?

Unfortunately no.  The contents of the 'Source/ThirdParty' has much more
than just SDL.  It's too much work for now, but a good TODO.

Source/ThirdParty/SDL

    AngelScript Assimp boost Box2D Bullet Civetweb Detour DetourCrowd
    DetourTileCache FreeType GLEW ik JO kNet LibCpuId LICENSES Lua
    LuaJIT LZ4 MojoShader Mustache nanodbc PugiXml rapidjson Recast SDL
    SQLite StanHull STB toluapp WebP

Actually I wonder will those libraries and the engine overall play nice
with OUR SDL library?  Should we provide a Guix version and bundled
libraries version?

>> +               (((string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC"
>> +                                " \"libpulse-simple\\.so\\.0\""))
>> +                (string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC \""
>> +                               (assoc-ref inputs "pulseaudio")
>> +                               "/lib/libpulse-simple.so.0"
>> +                               "\"")))
>
> Please use a literal string in the ‘substitute*’ pattern (you can use
> backslashes to split it on several lines.)

OK.  Thanks for notice!

>> +    (description "Lightweight, cross-platform 2D and 3D game engine
>> +implemented in C++.  Inspired by OGRE and Horde3D.")
>
> Full sentences please!  :-)
>
>   https://www.gnu.org/software/guix/manual/html_node/Synopses-and-Descriptions.html

Oh, thanks!

> Could you send an updated path?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] gnu: Add urho3d. --]
[-- Type: text/x-patch, Size: 3126 bytes --]

From 5a906d8a8a9ff50ed46b5ffc33714b11517e23ca Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Thu, 11 Jan 2018 01:14:41 +0300
Subject: [PATCH] gnu: Add urho3d.

* gnu/packages/game-development.scm (urho3d): New public variable.
---
 gnu/packages/game-development.scm | 51 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0b08b04f5..3c5eae5cd 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1206,3 +1206,54 @@ related games such as Heretic and Hexen.  It comes with a 3d preview mode and
 a 2D editor view.")
     (home-page "http://eureka-editor.sourceforge.net/")
     (license license:gpl2+)))
+
+(define-public urho3d
+  (package
+    (name "urho3d")
+    (version "1.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/urho3d/Urho3D"
+                                  "/archive/" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1im63n9rx8qq1ks6aq6jrl5ikxg87hqhsy06miqc317hpm1iyav5"))))
+    (build-system cmake-build-system)
+    (inputs `(("libx11" ,libx11)
+              ("libxcursor" ,libxcursor)
+              ("libxext" ,libxext)
+              ("libxi" ,libxi)
+              ("libxinerama" ,libxinerama)
+              ("libxrandr" ,libxrandr)
+              ("libxrender" ,libxrender)
+              ("libxscrnsaver" ,libxscrnsaver)
+              ("mesa" ,mesa)
+              ("alsa-lib" ,alsa-lib)
+              ("pulseaudio" ,pulseaudio)))
+    (arguments
+     '(#:tests?
+       #f ; There are no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'use-full-library-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "../build/Source/ThirdParty\
+/SDL/include/generated/SDL_config.h"
+               (("#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC \"libasound\\.so\\.2\"")
+                (string-append "#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC \""
+                               (assoc-ref inputs "alsa-lib")
+                               "/lib/libasound.so.2"
+                               "\""))
+               (((string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC"
+                                " \"libpulse-simple\\.so\\.0\""))
+                (string-append "#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC \""
+                               (assoc-ref inputs "pulseaudio")
+                               "/lib/libpulse-simple.so.0"
+                               "\"")))
+             #t)))))
+    (home-page "https://urho3d.github.io/")
+    (synopsis "Cross-platform 2D and 3D game engine")
+    (description "This package provides a lightweight, cross-platform 2D and
+3D game engine implemented in C++.  Inspired by OGRE and Horde3D.")
+    (license license:expat)))
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 8 bytes --]



Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

* [bug#30084] [PATCH] gnu: Add urho3d.
  2018-01-23 13:29   ` Oleg Pykhalov
@ 2018-01-23 14:07     ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2018-01-23 14:07 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 30084

Hello,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Hi Oleg,
>>
>> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>>
>>> From 186090075a1ae515bb4893763e7c528568e15939 Mon Sep 17 00:00:00 2001
>>> From: Oleg Pykhalov <go.wigust@gmail.com>
>>> Date: Thu, 11 Jan 2018 01:14:41 +0300
>>> Subject: [PATCH] gnu: Add urho3d.
>>>
>>> * gnu/packages/game-development.scm (urho3d): New public variable.
>>
>> [...]
>>
>>> +           (lambda* (#:key inputs #:allow-other-keys)
>>> +             (substitute* (string-append "../build/Source/ThirdParty"
>>> +                                         "/SDL/include/generated/SDL_config.h")
>>
>> IIUC there’s a bundled copy of SDL, right?  Can we instead build against
>> our SDL?
>
> Yes, it's a bundled copy.  We probably can, but how?  The build system
> probably configured look for 'Source/ThirdParty/SDL'.  So should we make
> a symbolic link like 'Source/ThirdParty/SDL' -> '/gnu/store/…-SDL'?

Rather, we should adjust CMakeLists.txt (if needed) so that it links
against our copy of SDL, like Fis Trivial did with ‘rct’ today.

>> Ideally, to be safe from bundling, we should “rm -rf ThirdParty” in a
>> snippet.  Is that possible?
>
> Unfortunately no.  The contents of the 'Source/ThirdParty' has much more
> than just SDL.  It's too much work for now, but a good TODO.
>
> Source/ThirdParty/SDL
>
>     AngelScript Assimp boost Box2D Bullet Civetweb Detour DetourCrowd
>     DetourTileCache FreeType GLEW ik JO kNet LibCpuId LICENSES Lua
>     LuaJIT LZ4 MojoShader Mustache nanodbc PugiXml rapidjson Recast SDL
>     SQLite StanHull STB toluapp WebP

Ouch, that’s a lot of stuff!  We should at least remove boost, FreeType,
GLEW, Lua, LuaJIT, LZ4, SDL, and SQLite, for which we have packages.

> Actually I wonder will those libraries and the engine overall play nice
> with OUR SDL library?  Should we provide a Guix version and bundled
> libraries version?

We’ll have to try; hopefully they’re shipping an unmodified SDL.

> From 5a906d8a8a9ff50ed46b5ffc33714b11517e23ca Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Thu, 11 Jan 2018 01:14:41 +0300
> Subject: [PATCH] gnu: Add urho3d.
>
> * gnu/packages/game-development.scm (urho3d): New public variable.

Could you please try unbundling the things mentioned above, and add a
FIXME for those we’re not unbundling yet?  We should try and see how
difficult it is; for ‘rct’ it was OK.

Thank you!

Ludo’.

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

* [bug#30084] [PATCH] gnu: Add urho3d.
  2018-01-10 22:24 [bug#30084] [PATCH] gnu: Add urho3d Oleg Pykhalov
  2018-01-12 14:01 ` Ludovic Courtès
@ 2020-03-22 20:42 ` Leo Famulari
  2020-03-23  7:54   ` bug#30084: " Oleg Pykhalov
  1 sibling, 1 reply; 6+ messages in thread
From: Leo Famulari @ 2020-03-22 20:42 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 30084

On Thu, Jan 11, 2018 at 01:24:16AM +0300, Oleg Pykhalov wrote:
> From 186090075a1ae515bb4893763e7c528568e15939 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Thu, 11 Jan 2018 01:14:41 +0300
> Subject: [PATCH] gnu: Add urho3d.
> 
> * gnu/packages/game-development.scm (urho3d): New public variable.

What is the status of this patch? Do you still intend to add it to Guix
or can we close the ticket?

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

* bug#30084: [PATCH] gnu: Add urho3d.
  2020-03-22 20:42 ` Leo Famulari
@ 2020-03-23  7:54   ` Oleg Pykhalov
  0 siblings, 0 replies; 6+ messages in thread
From: Oleg Pykhalov @ 2020-03-23  7:54 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 30084, 30084-close

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

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

> On Thu, Jan 11, 2018 at 01:24:16AM +0300, Oleg Pykhalov wrote:
>> From 186090075a1ae515bb4893763e7c528568e15939 Mon Sep 17 00:00:00 2001
>> From: Oleg Pykhalov <go.wigust@gmail.com>
>> Date: Thu, 11 Jan 2018 01:14:41 +0300
>> Subject: [PATCH] gnu: Add urho3d.
>> 
>> * gnu/packages/game-development.scm (urho3d): New public variable.
>
> What is the status of this patch? Do you still intend to add it to Guix
> or can we close the ticket?

I'm not sure about the time when I will prepare the package without
built-in third-party dependencies. So we could close the ticket until.

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

end of thread, other threads:[~2020-03-23  7:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-10 22:24 [bug#30084] [PATCH] gnu: Add urho3d Oleg Pykhalov
2018-01-12 14:01 ` Ludovic Courtès
2018-01-23 13:29   ` Oleg Pykhalov
2018-01-23 14:07     ` Ludovic Courtès
2020-03-22 20:42 ` Leo Famulari
2020-03-23  7:54   ` bug#30084: " Oleg Pykhalov

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).