[PATCH] gnu: Add warzone2100.

[PATCH] gnu: Add warzone2100.

[Kei Kebreau]

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


This is one of the games dependent on quesoglc!


[-- Attachment #1.2: 0001-gnu-Add-warzone2100.patch --]
[-- Type: text/plain, Size: 2958 bytes --]

From 24da9bb0a8b021d3be00a94bc11ef6a6cf2d26a0 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Wed, 15 Jun 2016 20:33:00 -0400
Subject: [PATCH] gnu: Add warzone2100.

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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b0bf4e3..046b9be 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2396,3 +2396,55 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
 your way through an underground cave system in search of the Grue.  Can you
 capture it and get out alive?")
     (license license:agpl3+)))
+
+(define-public warzone2100
+  (package
+    (name "warzone2100")
+    (version "3.1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/" name
+                                  "/releases/" version "/" name "-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'set-paths 'set-sdl-paths
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (setenv "CPATH"
+                              (string-append (assoc-ref inputs "sdl-union")
+                                             "/include/SDL"))
+                      #t)))))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("fontconfig" ,fontconfig)
+              ("font-dejavu" ,font-dejavu)
+              ("freetype" ,freetype)
+              ("fribidi" ,fribidi)
+              ("glew" ,glew)
+              ("libtheora" ,libtheora)
+              ("libvorbis" ,libvorbis)
+              ("libxrandr" ,libxrandr)
+              ("openal" ,openal)
+              ("physfs" ,physfs)
+              ("qt", qt-4)
+              ("quesoglc" ,quesoglc)
+              ("sdl-union" ,(sdl-union))
+              ("zip" ,zip)
+              ("unzip" ,unzip)))
+    (home-page "http://wz2100.net")
+    (synopsis "3D Real-time strategy and real-time tactics game")
+    (description
+     "Warzone 2100 offers campaign, multi-player, and single-player skirmish
+modes. An extensive tech tree with over 400 different technologies, combined
+with the unit design system, allows for a wide variety of possible units and
+tactics.")
+    ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL
+    (license (list license:bsd-3
+                   license:cc0
+                   license:cc-by-sa3.0
+                   license:expat
+                   license:gpl2+
+                   license:lgpl2.1+))))
-- 
2.8.3


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

-- 
Kei (GPG Key: 4096R/E6A5EE3C19467A0D)

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

Re: [PATCH] gnu: Add warzone2100.

[Leo Famulari]

On Wed, Jun 15, 2016 at 09:39:36PM -0400, Kei Kebreau wrote:
> * gnu/packages/games.scm (warzone2100): New variable.

Cool, it's nice to see games like this continuing to be developed!

> +    (inputs `(("fontconfig" ,fontconfig)

Can you double-check that all these inputs are needed at run-time with
`guix gc --references`?

> +              ("font-dejavu" ,font-dejavu)
> +              ("freetype" ,freetype)
> +              ("fribidi" ,fribidi)
> +              ("glew" ,glew)
> +              ("libtheora" ,libtheora)
> +              ("libvorbis" ,libvorbis)
> +              ("libxrandr" ,libxrandr)
> +              ("openal" ,openal)
> +              ("physfs" ,physfs)
> +              ("qt", qt-4)

Can it run with qt-5? My understanding is that qt-4 is no longer
supported by upstream and is thus risky from a security perspective.  We
are slowly working to eliminate dependencies on qt-4 in Guix.

If it can't use qt-5, I guess it's okay, with a friendly bug report to
upstream :)

If it can use qt-5, then it can take advantage of the modularization
that Efraim has been working on.

Re: [PATCH] gnu: Add warzone2100.

[Kei Kebreau]

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

Leo Famulari <leo@famulari.name> writes:

> On Wed, Jun 15, 2016 at 09:39:36PM -0400, Kei Kebreau wrote:
>> * gnu/packages/games.scm (warzone2100): New variable.
>
> Cool, it's nice to see games like this continuing to be developed!
>

Indeed it is! Especially since it started out on proprietary consoles
and such.

>> +    (inputs `(("fontconfig" ,fontconfig)
>
> Can you double-check that all these inputs are needed at run-time with
> `guix gc --references`?
>

The binary links to all of the libraries, but doesn't seem to require
the DejaVu fonts. I've also moved the unzip and zip binaries to
native-inputs.

>> +              ("font-dejavu" ,font-dejavu)
>> +              ("freetype" ,freetype)
>> +              ("fribidi" ,fribidi)
>> +              ("glew" ,glew)
>> +              ("libtheora" ,libtheora)
>> +              ("libvorbis" ,libvorbis)
>> +              ("libxrandr" ,libxrandr)
>> +              ("openal" ,openal)
>> +              ("physfs" ,physfs)
>> +              ("qt", qt-4)
>
> Can it run with qt-5? My understanding is that qt-4 is no longer
> supported by upstream and is thus risky from a security perspective.  We
> are slowly working to eliminate dependencies on qt-4 in Guix.
>
> If it can't use qt-5, I guess it's okay, with a friendly bug report to
> upstream :)
>
> If it can use qt-5, then it can take advantage of the modularization
> that Efraim has been working on.

It can't use qt-5 at the moment. Debian is still using the Qt4 script
library and Arch Linux uses a Qt5 compatibility layer of some sort.

An updated patch is attached for review.


[-- Attachment #1.2: updated patch --]
[-- Type: text/plain, Size: 2927 bytes --]

From 7e24cc9f998cb13330bbc1d38a3da638cc6135b6 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Sat, 18 Jun 2016 11:07:37 -0400
Subject: [PATCH] gnu: Add warzone2100.

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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b0bf4e3..4141d5e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2396,3 +2396,54 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
 your way through an underground cave system in search of the Grue.  Can you
 capture it and get out alive?")
     (license license:agpl3+)))
+
+(define-public warzone2100
+  (package
+    (name "warzone2100")
+    (version "3.1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/" name
+                                  "/releases/" version "/" name "-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'set-paths 'set-sdl-paths
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (setenv "CPATH"
+                              (string-append (assoc-ref inputs "sdl-union")
+                                             "/include/SDL"))
+                      #t)))))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("unzip" ,unzip)
+                     ("zip" ,zip)))
+    (inputs `(("fontconfig" ,fontconfig)
+              ("freetype" ,freetype)
+              ("fribidi" ,fribidi)
+              ("glew" ,glew)
+              ("libtheora" ,libtheora)
+              ("libvorbis" ,libvorbis)
+              ("libxrandr" ,libxrandr)
+              ("openal" ,openal)
+              ("physfs" ,physfs)
+              ("qt", qt-4)
+              ("quesoglc" ,quesoglc)
+              ("sdl-union" ,(sdl-union))))
+    (home-page "http://wz2100.net")
+    (synopsis "3D Real-time strategy and real-time tactics game")
+    (description
+     "Warzone 2100 offers campaign, multi-player, and single-player skirmish
+modes. An extensive tech tree with over 400 different technologies, combined
+with the unit design system, allows for a wide variety of possible units and
+tactics.")
+    ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL
+    (license (list license:bsd-3
+                   license:cc0
+                   license:cc-by-sa3.0
+                   license:expat
+                   license:gpl2+
+                   license:lgpl2.1+))))
-- 
2.8.3


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


-- 
Kei (GPG Key: 4096R/E6A5EE3C19467A0D)

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

Re: [PATCH] gnu: Add warzone2100.

[Leo Famulari]

On Sat, Jun 18, 2016 at 11:17:40AM -0400, Kei Kebreau wrote:
> * gnu/packages/games.scm (warzone2100): New variable.

Looks good to me, as long as we're sure it needs both zip and unzip to
build.

Re: [PATCH] gnu: Add warzone2100.

[Kei Kebreau]

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

Leo Famulari <leo@famulari.name> writes:

> On Sat, Jun 18, 2016 at 11:17:40AM -0400, Kei Kebreau wrote:
>> * gnu/packages/games.scm (warzone2100): New variable.
>
> Looks good to me, as long as we're sure it needs both zip and unzip to
> build.

I'm sure. I added them both after it refused to build otherwise. Will
push soon!

-- 
Kei (GPG Key: 4096R/E6A5EE3C19467A0D)

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