diff options
author | Pierre Langlois <pierre.langlois@gmx.com> | 2019-04-21 19:09:48 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2019-04-21 22:50:22 +0100 |
commit | 56a4858210ebaf45c32dc99bdfbd12b9bc5a234e (patch) | |
tree | 82ecc2498584b40e129fd07c27c17efc6137066c /gnu/packages | |
parent | 60af1822d40c4bc7f33de46895741032dc3db80a (diff) | |
download | guix-patches-56a4858210ebaf45c32dc99bdfbd12b9bc5a234e.tar guix-patches-56a4858210ebaf45c32dc99bdfbd12b9bc5a234e.tar.gz |
gnu: supertuxkart: Simplify unbundling and unbundle enet.
* 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.
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/games.scm | 42 |
1 files 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/") |