[bug#35364] [PATCH 0/2] gnu: supertuxkart: Update to 1.0

[bug#35364] [PATCH 0/2] gnu: supertuxkart: Update to 1.0

[Pierre Langlois]

Hello Guix!

Here's an update for SuperTuxKart, and it brings networking support!  I think
I've been waiting for this for close to 10 years now! :-D

http://blog.supertuxkart.net/2019/04/supertuxkart-10-release.html

I've taken the opportunity to remove the bundled "enet" and simplify how GLEW
was unbundled. It looks like upstream have simplified things since this was
first packaged.

Thanks!
Pierre

Pierre Langlois (2):
  gnu: supertuxkart: Update to 1.0.
  gnu: supertuxkart: Simplify unbundling and unbundle enet.

 gnu/packages/games.scm | 48 ++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

--
2.21.0

[bug#35364] [PATCH 1/2] gnu: supertuxkart: Update to 1.0.

[Pierre Langlois]

* gnu/packages/games.scm (supertuxkart): Update to 1.0.
[inputs]: Add openssl.
---
 gnu/packages/games.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 378bbc2eec..0ca3cdcf8c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2116,7 +2117,7 @@ This game is based on the GPL version of the famous game TuxRacer.")
 (define-public supertuxkart
   (package
     (name "supertuxkart")
-    (version "0.9.3")
+    (version "1.0")
     (source
      (origin
        (method url-fetch)
@@ -2124,7 +2125,7 @@ This game is based on the GPL version of the famous game TuxRacer.")
                            version "/supertuxkart-" version "-src.tar.xz"))
        (sha256
         (base32
-         "1c4w47ibj87lgwiqygq8qi7jiz6gklj4dwf5bs5zk15s0rqlw0fq"))
+         "106rlp99hq18b4q1kdri3pl06cc4v7iqfp1hp9k2f8751lzz923d"))
        (modules '((guix build utils)))
        (snippet
         ;; Delete bundled library sources
@@ -2186,7 +2187,8 @@ This game is based on the GPL version of the famous game TuxRacer.")
        ("curl" ,curl)
        ;; The following input is needed to build the bundled and modified
        ;; version of irrlicht.
-       ("libjpeg" ,libjpeg)))
+       ("libjpeg" ,libjpeg)
+       ("openssl" ,openssl)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://supertuxkart.net/")
--
2.21.0

[bug#35364] [PATCH 2/2] gnu: supertuxkart: Simplify unbundling and unbundle enet.

[Pierre Langlois]

* gnu/packages/games.scm (supertuxkart)[source](snippet): Delete "lib/enet".
Remove "CMakeList.txt" substitution.
[arguments]<#:configure-flags>: Add "-DUSER_SYSTEM_GLEW=TRUE" and
"-DUSE_SYSTEM_ENET=TRUE".
<#:phases>: Delete.
---
 gnu/packages/games.scm | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0ca3cdcf8c..6a782b27e9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2130,50 +2130,31 @@ This game is based on the GPL version of the famous game TuxRacer.")
        (snippet
         ;; Delete bundled library sources
         '(begin
-           ;; FIXME: try to unbundle enet, and angelscript
+           ;; Supertuxkart uses modified versions of the Irrlicht engine
+           ;; and the bullet library.  The developers gave an explanation
+           ;; here: http://forum.freegamedev.net/viewtopic.php?f=17&t=3906
+           ;; FIXME: try to unbundle angelscript
            (for-each delete-file-recursively
                      '("lib/zlib"
                        "lib/libpng"
                        "lib/jpeglib"
                        "lib/glew"
-                       "lib/wiiuse"))
-           (substitute* "CMakeLists.txt"
-             ;; Supertuxkart uses modified versions of the Irrlicht engine
-             ;; and the bullet library.  The developers gave an explanation here:
-             ;; http://forum.freegamedev.net/viewtopic.php?f=17&t=3906
-             (("add_subdirectory\\(.*/(glew|zlib)\"\\)") ""))
+                       "lib/wiiuse"
+                       "lib/enet"))
            #t))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; no check target
        #:configure-flags
        (list "-DUSE_WIIUSE=0"
-             ;; Do not use the bundled zlib
+             ;; Do not use the bundled zlib, glew and enet.
              "-DNO_IRR_COMPILE_WITH_ZLIB_=TRUE"
+             "-DUSE_SYSTEM_GLEW=TRUE"
+             "-DUSE_SYSTEM_ENET=TRUE"
              ;; FIXME: needs libopenglrecorder
              "-DBUILD_RECORDER=0"
              ;; Irrlicht returns an integer instead of a boolean
-             "-DCMAKE_C_FLAGS=-fpermissive")
-       #:phases
-       (modify-phases %standard-phases
-         ;; see https://github.com/supertuxkart/stk-code/issues/3557
-         (add-after 'unpack 'patch-for-mesa-18.3
-           (lambda _
-             (substitute* "src/graphics/gl_headers.hpp"
-               (("#if !defined\\(USE_GLES2\\)")
-                "#if !defined(USE_GLES2)\n#   define __gl_glext_h_"))
-             #t))
-         (add-after 'unpack 'unbundle
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "CMakeLists.txt"
-               (("glew")
-                (string-append (assoc-ref inputs "glew")
-                               "/lib/libGLEW.a"))
-               (("include_directories\\(\"\\$\\{PROJECT_SOURCE_DIR\\}/lib/glew/include\"\\)")
-                (string-append "include_directories(\""
-                               (assoc-ref inputs "glew")
-                               "/include\")")))
-             #t)))))
+             "-DCMAKE_C_FLAGS=-fpermissive")))
     (inputs
      `(("glew" ,glew)
        ("zlib" ,zlib)
@@ -2188,7 +2169,8 @@ This game is based on the GPL version of the famous game TuxRacer.")
        ;; The following input is needed to build the bundled and modified
        ;; version of irrlicht.
        ("libjpeg" ,libjpeg)
-       ("openssl" ,openssl)))
+       ("openssl" ,openssl)
+       ("enet" ,enet)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://supertuxkart.net/")
--
2.21.0

bug#35364: [PATCH 0/2] gnu: supertuxkart: Update to 1.0

[Christopher Baines]

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


Pierre Langlois <pierre.langlois@gmx.com> writes:

> Here's an update for SuperTuxKart, and it brings networking support!  I think
> I've been waiting for this for close to 10 years now! :-D
>
> http://blog.supertuxkart.net/2019/04/supertuxkart-10-release.html
>
> I've taken the opportunity to remove the bundled "enet" and simplify how GLEW
> was unbundled. It looks like upstream have simplified things since this was
> first packaged.
>
> Thanks!
> Pierre
>
> Pierre Langlois (2):
>   gnu: supertuxkart: Update to 1.0.
>   gnu: supertuxkart: Simplify unbundling and unbundle enet.
>
>  gnu/packages/games.scm | 48 ++++++++++++++----------------------------
>  1 file changed, 16 insertions(+), 32 deletions(-)

Thanks Pierre, I've built supertuxkart with these patches, and it looks
to work fine to me. The simplification of the package also looks
great. I haven't tested the network functionality though.

I've pushed them now, thanks again :)

Chris

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