pkill9 wrote 6 years ago
(name . guix-patches)(address . guix-patches@gnu.org)
E1gut54-0006bR-0W@rmmprod05.runbox
This patch adds Odamex, a port of Doom focused on multiplayer support. https://odamex.net/
Add odamex
- Done
Details
- 4 participants
- Efraim Flashner
- Ludovic Courtès
- pkill9
- Ricardo Wurmus
- Owner
- unassigned
- Submitted by
- pkill9
- Severity
- normal
Efraim Flashner wrote 6 years ago
(address . pkill9@runbox.com)(address . 34497@debbugs.gnu.org)
20190217102541.GB7206@macbook41
On Sat, Feb 16, 2019 at 06:04:05AM +0000, pkill9@runbox.com wrote:
Toggle quote (3 lines)
> 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
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlxpNqUACgkQQarn3Mo9
g1HVNw//UIygDSxYwh66sDaOoc/8GCqajKnzvRjC94GPppvTfvPE+RcQ0kWXWzpX
foaw2hoPc+v7U7h1Do3H0cXgBBPl+y1PRpP9SSXapaJulYGZAKb/LzyavKpamFAL
GQJ/FfubY3Yb68PPL+GvDNXiTtWlcQS05O/9VdBOwpD62iSMZ+9tbb12U8sDkuvf
4ucwdVbTBymsShu6NekUqfBNZHm5FPNHWO/WXX0WvU2sdbfkG3xloykDAVpCSbJT
OXPQwZoAW5ty4RWmUiqsmxjfongXxhjdrnmk6wG1pAESzE9BUPVPbFnYuGsOGb/P
qNExppf+ry3FcdqCL4yv2JfiLJ7E6Wxs3IVN+kgFDjfCMg8C0loj5DwYlb/iELd3
zXP/NuLXitbG99qGVEJ3CTxPB7U2GicPMakL7XZjSzXTdH4uY/1JHKNY0bZQ0ttb
uzXcTurWnYCZL6+z/XHsBtI/NqLOjQ4ZCHo59JkAoojvyCO1MOXu4WAO/yY8FPut
vDEJxWR12MgikRCSEC9F5I5UQTekR9Cw3HzHLJo1kvAQHbpwv8nqRmQtfh+MIWSn
6qyf4crt1c69T8x7U+ofYAoq99j02Q+St7klkREWvh0rqba+/EdSkBRUGAsfWL4p
GZ/9m3Hes6VJds8PxK8tkaWmGvrvqCwHNN7FW5U7dr41k08FnT8=
=XOLK
-----END PGP SIGNATURE-----
pkill9 wrote 6 years ago
(name . Efraim Flashner)(address . efraim@flashner.co.il)(name . 34497)(address . 34497@debbugs.gnu.org)
E1gvNRB-0003UF-5z@rmmprod05.runbox
Oops! Here it is
On Sun, 17 Feb 2019 12:25:41 +0200, Efraim Flashner <efraim@flashner.co.il> wrote:
Toggle quote (10 lines)
> 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
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(+)
Toggle diff (44 lines)
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
Ricardo Wurmus wrote 6 years ago
(address . pkill9@runbox.com)(name . 34497)(address . 34497@debbugs.gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
87bm365gsb.fsf@elephly.net
Hi pkill9,
Toggle quote (1 lines)
> * gnu/packages/games.scm (odamex): New variable.
[…]
Toggle quote (7 lines)
> + (uri (string-append
> + "mirror://sourceforge/odamex/Odamex/"
> + version
> + "/odamex-src-"
> + version
> + ".tar.gz"))
Please put this on fewer lines.
Toggle quote (6 lines)
> + (sha256
> + (base32
> + "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j"))))
> + (build-system cmake-build-system)
> + (arguments `(#:tests? #f)) ;; No tests
Please use just one semicolon.
Toggle quote (7 lines)
> + (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.
Toggle quote (6 lines)
> + (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.
Toggle quote (2 lines)
> + (license license:gpl2)))
Looks like this is actually gpl2+ as evidenced by files like this:
Could you please send an updated patch?
--
Ricardo
pkill9 wrote 6 years ago
(name . Ricardo Wurmus)(address . rekado@elephly.net)(name . 34497)(address . 34497@debbugs.gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
E1gwo1z-0006LE-36@rmmprod05.runbox
Here is an updated patch.
On Wed, 20 Feb 2019 21:47:00 +0100, Ricardo Wurmus <rekado@elephly.net> wrote:
Toggle quote (49 lines)
>
> 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
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(+)
Toggle diff (41 lines)
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
Ludovic Courtès wrote 6 years ago
(address . pkill9@runbox.com)(name . Ricardo Wurmus)(address . rekado@elephly.net)(name . 34497)(address . 34497-done@debbugs.gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
87bm21ux5v.fsf@gnu.org
Hello pkill9,
<pkill9@runbox.com> skribis:
Toggle quote (9 lines)
> 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’.
Closed
?