unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#34497] Add odamex
@ 2019-02-16  6:04 pkill9
  2019-02-17 10:25 ` Efraim Flashner
  0 siblings, 1 reply; 6+ messages in thread
From: pkill9 @ 2019-02-16  6:04 UTC (permalink / raw)
  To: 34497

This patch adds Odamex, a port of Doom focused on multiplayer support. https://odamex.net/

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

* [bug#34497] Add odamex
  2019-02-16  6:04 [bug#34497] Add odamex pkill9
@ 2019-02-17 10:25 ` Efraim Flashner
  2019-02-17 14:28   ` pkill9
  0 siblings, 1 reply; 6+ messages in thread
From: Efraim Flashner @ 2019-02-17 10:25 UTC (permalink / raw)
  To: pkill9; +Cc: 34497

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

On Sat, Feb 16, 2019 at 06:04:05AM +0000, pkill9@runbox.com wrote:
> This patch adds Odamex, a port of Doom focused on multiplayer support. https://odamex.net/
> 

Looks like you forgot to attach the patch :)

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

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

* [bug#34497] Add odamex
  2019-02-17 10:25 ` Efraim Flashner
@ 2019-02-17 14:28   ` pkill9
  2019-02-20 20:47     ` Ricardo Wurmus
  0 siblings, 1 reply; 6+ messages in thread
From: pkill9 @ 2019-02-17 14:28 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 34497

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

Oops! Here it is

On Sun, 17 Feb 2019 12:25:41 +0200, Efraim Flashner <efraim@flashner.co.il> wrote:

> On Sat, Feb 16, 2019 at 06:04:05AM +0000, pkill9@runbox.com wrote:
> > This patch adds Odamex, a port of Doom focused on multiplayer support. https://odamex.net/
> > 
> 
> Looks like you forgot to attach the patch :)
> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-odamex.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-odamex.patch", Size: 1827 bytes --]

From 8613bd3ae3f73cd45fd1b17ee5e9f3d3e23b76fd Mon Sep 17 00:00:00 2001
From: Pkill -9 <pkill9@runbox.com>
Date: Sat, 16 Feb 2019 05:57:07 +0000
Subject: [PATCH] gnu: Add odamex.

* gnu/packages/games.scm (odamex): New variable.
---
 gnu/packages/games.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6d9e63c4e..9dc19bda1 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5378,6 +5378,37 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
                     "file://dumb/licence.txt"
                     "Dumb license, explicitly GPL compatible.")))))
 
+(define-public odamex
+  (package
+    (name "odamex")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/odamex/Odamex/"
+             version
+             "/odamex-src-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j"))))
+    (build-system cmake-build-system)
+    (arguments `(#:tests? #f)) ;; No tests
+    (inputs
+     `(("sdl" ,(@ (gnu packages sdl) sdl))
+       ("sdl-mixer" ,(@ (gnu packages sdl) sdl-mixer))
+       ("zlib" ,(@ (gnu packages compression) zlib))
+       ("libpng" ,(@ (gnu packages image) libpng))
+       ("alsa-lib" ,(@ (gnu packages linux) alsa-lib))))
+    (home-page "https://odamex.net/")
+    (synopsis "Multiplayer Doom port")
+    (description "Odamex is a free, cross-platform modification of the Doom
+engine that allows players to easily join servers dedicated to playing Doom
+online.")
+    (license license:gpl2)))
+
 (define-public fortune-mod
   (package
     (name "fortune-mod")
-- 
2.20.1


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

* [bug#34497] Add odamex
  2019-02-17 14:28   ` pkill9
@ 2019-02-20 20:47     ` Ricardo Wurmus
  2019-02-21 13:04       ` pkill9
  0 siblings, 1 reply; 6+ messages in thread
From: Ricardo Wurmus @ 2019-02-20 20:47 UTC (permalink / raw)
  To: pkill9; +Cc: 34497


Hi pkill9,

> * gnu/packages/games.scm (odamex): New variable.
[…]
> +       (uri (string-append
> +             "mirror://sourceforge/odamex/Odamex/"
> +             version
> +             "/odamex-src-"
> +             version
> +             ".tar.gz"))

Please put this on fewer lines.

> +       (sha256
> +        (base32
> +         "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j"))))
> +    (build-system cmake-build-system)
> +    (arguments `(#:tests? #f)) ;; No tests

Please use just one semicolon.

> +    (inputs
> +     `(("sdl" ,(@ (gnu packages sdl) sdl))
> +       ("sdl-mixer" ,(@ (gnu packages sdl) sdl-mixer))
> +       ("zlib" ,(@ (gnu packages compression) zlib))
> +       ("libpng" ,(@ (gnu packages image) libpng))
> +       ("alsa-lib" ,(@ (gnu packages linux) alsa-lib))))

This is not okay.  Please just use the plain variable names.

> +    (home-page "https://odamex.net/")
> +    (synopsis "Multiplayer Doom port")
> +    (description "Odamex is a free, cross-platform modification of the Doom
> +engine that allows players to easily join servers dedicated to playing Doom
> +online.")

Please remove “free” — all software in Guix is Free Software.

> +    (license license:gpl2)))

Looks like this is actually gpl2+ as evidenced by files like this:

    https://github.com/odamex/odamex/blob/master/server/src/d_netinfo.cpp#L12

Could you please send an updated patch?

-- 
Ricardo

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

* [bug#34497] Add odamex
  2019-02-20 20:47     ` Ricardo Wurmus
@ 2019-02-21 13:04       ` pkill9
  2019-03-23 20:57         ` bug#34497: " Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: pkill9 @ 2019-02-21 13:04 UTC (permalink / raw)
  To: Ricardo Wurmus; +Cc: 34497

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

Here is an updated patch.

On Wed, 20 Feb 2019 21:47:00 +0100, Ricardo Wurmus <rekado@elephly.net> wrote:

> 
> Hi pkill9,
> 
> > * gnu/packages/games.scm (odamex): New variable.
> […]
> > +       (uri (string-append
> > +             "mirror://sourceforge/odamex/Odamex/"
> > +             version
> > +             "/odamex-src-"
> > +             version
> > +             ".tar.gz"))
> 
> Please put this on fewer lines.
> 
> > +       (sha256
> > +        (base32
> > +         "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j"))))
> > +    (build-system cmake-build-system)
> > +    (arguments `(#:tests? #f)) ;; No tests
> 
> Please use just one semicolon.
> 
> > +    (inputs
> > +     `(("sdl" ,(@ (gnu packages sdl) sdl))
> > +       ("sdl-mixer" ,(@ (gnu packages sdl) sdl-mixer))
> > +       ("zlib" ,(@ (gnu packages compression) zlib))
> > +       ("libpng" ,(@ (gnu packages image) libpng))
> > +       ("alsa-lib" ,(@ (gnu packages linux) alsa-lib))))
> 
> This is not okay.  Please just use the plain variable names.
> 
> > +    (home-page "https://odamex.net/")
> > +    (synopsis "Multiplayer Doom port")
> > +    (description "Odamex is a free, cross-platform modification of the Doom
> > +engine that allows players to easily join servers dedicated to playing Doom
> > +online.")
> 
> Please remove “free” — all software in Guix is Free Software.
> 
> > +    (license license:gpl2)))
> 
> Looks like this is actually gpl2+ as evidenced by files like this:
> 
>     https://github.com/odamex/odamex/blob/master/server/src/d_netinfo.cpp#L12
> 
> Could you please send an updated patch?
> 
> -- 
> Ricardo



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-odamex.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-odamex.patch", Size: 1638 bytes --]

From 353f9444cd71c1e93978cf9b113e3f8743f385a8 Mon Sep 17 00:00:00 2001
From: Pkill -9 <pkill9@runbox.com>
Date: Thu, 21 Feb 2019 13:02:07 +0000
Subject: [PATCH] gnu: Add odamex.

* gnu/packages/games.scm (odamex): New variable.
---
 gnu/packages/games.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6d9e63c4e..bec38dd41 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5378,6 +5378,34 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
                     "file://dumb/licence.txt"
                     "Dumb license, explicitly GPL compatible.")))))
 
+(define-public odamex
+  (package
+    (name "odamex")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/odamex/Odamex/" version "/"
+             "odamex-src-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j"))))
+    (build-system cmake-build-system)
+    (arguments `(#:tests? #f)) ; no tests.
+    (inputs
+     `(("sdl" ,sdl)
+       ("sdl-mixer" ,sdl-mixer)
+       ("zlib" ,zlib)
+       ("libpng" ,libpng)
+       ("alsa-lib" ,alsa-lib)))
+    (home-page "https://odamex.net/")
+    (synopsis "Multiplayer Doom port")
+    (description "Odamex is a modification of the Doom engine that
+allows players to easily join servers dedicated to playing Doom
+online.")
+    (license license:gpl2+)))
+
 (define-public fortune-mod
   (package
     (name "fortune-mod")
-- 
2.20.1


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

* bug#34497: Add odamex
  2019-02-21 13:04       ` pkill9
@ 2019-03-23 20:57         ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2019-03-23 20:57 UTC (permalink / raw)
  To: pkill9; +Cc: 34497

Hello pkill9,

<pkill9@runbox.com> skribis:

> Here is an updated patch.

> From 353f9444cd71c1e93978cf9b113e3f8743f385a8 Mon Sep 17 00:00:00 2001
> From: Pkill -9 <pkill9@runbox.com>
> Date: Thu, 21 Feb 2019 13:02:07 +0000
> Subject: [PATCH] gnu: Add odamex.
>
> * gnu/packages/games.scm (odamex): New variable.

Applied, finally.  Thank you and apologies for the delay!

Ludo’.

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

end of thread, other threads:[~2019-03-23 20:59 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-16  6:04 [bug#34497] Add odamex pkill9
2019-02-17 10:25 ` Efraim Flashner
2019-02-17 14:28   ` pkill9
2019-02-20 20:47     ` Ricardo Wurmus
2019-02-21 13:04       ` pkill9
2019-03-23 20:57         ` bug#34497: " Ludovic Courtès

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).