From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:41813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIGvf-0007PT-Q4 for guix-patches@gnu.org; Sun, 21 Apr 2019 14:11:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIGve-0000UR-N6 for guix-patches@gnu.org; Sun, 21 Apr 2019 14:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hIGve-0000UM-KE for guix-patches@gnu.org; Sun, 21 Apr 2019 14:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hIGve-0002xA-E2 for guix-patches@gnu.org; Sun, 21 Apr 2019 14:11:02 -0400 Subject: [bug#35364] [PATCH 2/2] gnu: supertuxkart: Simplify unbundling and unbundle enet. Resent-Message-ID: From: Pierre Langlois Date: Sun, 21 Apr 2019 19:09:48 +0100 Message-Id: <20190421180948.27338-2-pierre.langlois@gmx.com> In-Reply-To: <20190421180948.27338-1-pierre.langlois@gmx.com> References: <20190421180129.26873-1-pierre.langlois@gmx.com> <20190421180948.27338-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35364@debbugs.gnu.org * gnu/packages/games.scm (supertuxkart)[source](snippet): Delete "lib/enet= ". Remove "CMakeList.txt" substitution. [arguments]<#:configure-flags>: Add "-DUSER_SYSTEM_GLEW=3DTRUE" and "-DUSE_SYSTEM_ENET=3DTRUE". <#:phases>: Delete. =2D-- 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 =2D-- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2130,50 +2130,31 @@ This game is based on the GPL version of the famou= s 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=3D17&t= =3D3906 + ;; 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 engin= e - ;; and the bullet library. The developers gave an explanati= on here: - ;; http://forum.freegamedev.net/viewtopic.php?f=3D17&t=3D390= 6 - (("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=3D0" - ;; Do not use the bundled zlib + ;; Do not use the bundled zlib, glew and enet. "-DNO_IRR_COMPILE_WITH_ZLIB_=3DTRUE" + "-DUSE_SYSTEM_GLEW=3DTRUE" + "-DUSE_SYSTEM_ENET=3DTRUE" ;; FIXME: needs libopenglrecorder "-DBUILD_RECORDER=3D0" ;; Irrlicht returns an integer instead of a boolean - "-DCMAKE_C_FLAGS=3D-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=3D-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/") =2D- 2.21.0