From patchwork Sun Apr 21 18:09:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 13725 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B983016EDB; Sun, 21 Apr 2019 19:11:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E308D16ED9 for ; Sun, 21 Apr 2019 19:11:06 +0100 (BST) Received: from localhost ([127.0.0.1]:55745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIGvi-0007Pk-Hc for patchwork@mira.cbaines.net; Sun, 21 Apr 2019 14:11:06 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35364] [PATCH 2/2] gnu: supertuxkart: Simplify unbundling and unbundle enet. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Apr 2019 18:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35364 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35364@debbugs.gnu.org Received: via spool by 35364-submit@debbugs.gnu.org id=B35364.155587020311263 (code B ref 35364); Sun, 21 Apr 2019 18:11:02 +0000 Received: (at 35364) by debbugs.gnu.org; 21 Apr 2019 18:10:03 +0000 Received: from localhost ([127.0.0.1]:49059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIGug-0002vU-5V for submit@debbugs.gnu.org; Sun, 21 Apr 2019 14:10:02 -0400 Received: from mout.gmx.net ([212.227.15.15]:33849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIGud-0002ut-Vw for 35364@debbugs.gnu.org; Sun, 21 Apr 2019 14:10:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1555870194; bh=9dPG4uRMuMqC+3ysfWNZJW763w0rRRPb9t/KXxSJAXk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LNRZAxvZ2xs95QbTAVrmVhGMXl3xp2DfWgbRnY4BN7NTuyqNGqVKaQ4qx2gyJutw0 G3lqyuZpqtWHjYY7DM0r/3TX+kgDI2dIBtKgN4SGKY/60Px8tIx9pOtfmPfDda7RYR 4zs2064fpjYcTraGtfLX7OaAs+ohn7hxk76+zSAQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere.lan ([92.6.236.193]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LreCz-1gokxj02vN-013N2I; Sun, 21 Apr 2019 20:09:54 +0200 From: Pierre Langlois Date: Sun, 21 Apr 2019 19:09:48 +0100 Message-Id: <20190421180948.27338-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.21.0 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 X-Provags-ID: V03:K1:oBZsBNrtq071aHKG7y17vbhhugl/525RSWWXSq8P8wos+/74HUJ kUWIhIWPk/PbN+f15+R1n5sTayLXiXV53TqM5cLJilYeF0cPpduhsX3ZdC1hKs+UnNsxq9R BNFZGpmmrFS2lR59lZzzYEItnBftxalBz7mosRM+NjchI+1SdWPYUOHkiwRFN5Vv+CFttE4 1q9qcE3B7ujo2LZG3gdLg== X-UI-Out-Filterresults: notjunk:1;V03:K0:s647H2hwpgU=:03RuwKrIus+Fj6JApgRFJt aRYM8yI15n4hCjpAcn2FFDjZHrxMX3oSAFwCTWyRr/bzmpTsEu7HLpfVDCyGs1Z/1PR9iATpA U1zK3F2/Ly2YOasv2okrI2B91SrFoDuI0P25q3vJ1WLWqPftkBN4qsPP+HUWNGSOFpHJ/lv+O EjzEeTYzDQS0b+TH73hqfDXD9xPo35xWAJ7X0rDxp15zCY5Lh0J2QCDKOR1bGWz2PvmFfjstu UHbBr48N16AF5wKXBzP3MGrit0OphVZhGxFO0XMfeOCt0VVryogUpIE7l8WS959lXakBiAr0Q k+VwOQsxWU7MfjmSsGrORFl5Ja2QV7PHHFN/tT0FIIFkq2khQgxDX/vRcV0ic3S1+pl7zsHtc emBwJLGFTKkl1hIZEkFQYQqkFhO8tvFjOgo42eJ9wt+hVOslu4JUkLYwuxHPMJykbZJhduNRL Ta54cDw4Icp5/+WGpoKs9sRsozdKOBsZkKpOkjPj+Rbcb90jLBaoUzUzZyGHYFFayC8xFwQL+ yashdvQQqqx2h6XQYN6A9956GGkwvGxXCDZwZYuZvIkaq1AhQ76E4fLBE9lH9k+1LZH2XzoHq h1oKvBzE98uTIIWf8MTwWloc4bR5iQ+Jd7sMzySoB/5yJ8i2n86AJFrIKBrHEU4Mw53zRwzyc wAwkBRuDhWv1v79e8VA6wmRBxwmaaWIULp9T2YzDsOyMjYlUWnEg1oFSzw//hxI5RpIOuRyTW hP+hsLSrbHD6f7bCZcEmKmhxQgQHOji9x8vUEJZ/2W12rFElIbd2YIbwGTrN3lKqvrvHo7gtD 7ZzcfZdLQGxeIGdcSpxmm8SAXGuEOW1Z3aTPtRqbsYio5WzKxQtJyJfnnO9e2fhYSq9G9r5o2 Zu7W5Hxwz9QrNGFE3AuUJo737hPfStjCTE/D7YCbt7VN3zvZScwrAyD6auqqbU X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) -- 2.21.0 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/")