From patchwork Mon Sep 4 23:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 53445 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 3D87B27BBE2; Tue, 5 Sep 2023 00:10:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4CAD427BBE9 for ; Tue, 5 Sep 2023 00:10:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdIhp-000676-BH; Mon, 04 Sep 2023 19:10:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qdIhm-00066g-W3 for guix-patches@gnu.org; Mon, 04 Sep 2023 19:10:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdIhm-0005US-Nm for guix-patches@gnu.org; Mon, 04 Sep 2023 19:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdIhm-00063Q-EH for guix-patches@gnu.org; Mon, 04 Sep 2023 19:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65747] [PATCH] gnu: tennix: Update to 1.3.4. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Sep 2023 23:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65747 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65747@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169386899423252 (code B ref -1); Mon, 04 Sep 2023 23:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Sep 2023 23:09:54 +0000 Received: from localhost ([127.0.0.1]:52908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdIhd-00062y-CL for submit@debbugs.gnu.org; Mon, 04 Sep 2023 19:09:53 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdIhc-00062i-6I for submit@debbugs.gnu.org; Mon, 04 Sep 2023 19:09:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qdIhW-00061m-8h for guix-patches@gnu.org; Mon, 04 Sep 2023 19:09:46 -0400 Received: from sonic305-22.consmr.mail.ne1.yahoo.com ([66.163.185.148]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdIhT-0005QN-HE for guix-patches@gnu.org; Mon, 04 Sep 2023 19:09:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1693868979; bh=Z+tb0R+wjuqotG3w5KFufqC+PEXcepQnr6/Z4FGN3UM=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=kmS0FQm4PXr+SyuyzToeea1R64lVFjNFMxb91eb7C1sdmpFaI/+7rl3FL0QhJcDtgGhmEazpPDA4UVa9bQe6sJgXY/08kQOdj2NZeeSIZO8FXtDvjdCZTweKMZcaRsgEn60DnAsSVZVClJrJW6YXx3kjXd2tAVxOreeUWqbwz/hST+ad/nZ2LT1e5UWLoSrsRluEC4KwLBWswChf6PZinJlJ1AqbKYSkOlMPkRVSf5Mr9RGEMbV6IDhBUKc3iO21vdermLdLmtoI36XU+tI3L5gf/l/8oY9nIOTHvTU9TO72Zqkt6cMmfySw3drna5VX7Ht+CVwiSQ6WItCODTm0vg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1693868979; bh=u8cyzitcQd30vWZMdYCc1S6CJUj9OeHBuLjbzPtFRMi=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=ViwSl4ychbMdgWFSDTY846fad6216owdmEZqlET477Z1NoQ06NAY6LPutrYOGE/yjgiRlBCaQ3pM2UyShvy8vN1wqSMjfOP9AL/4WzUKNl/CZv5uZx9tzRoh3e8aa2bAqLisMrHTgkHh9ytfsL7B8oxdLJSELS0wzrYXZIslrL0BC/Nl+VNkGjM+RzHiYusy+MkN4xeFxJRTXt0NsiwRO1D7M5A0xugHe3YU/XiGSxSwkdBe2QH2ZO9DMXBxvbGJqooFwYL3LFEkxe229qKT1guLB1aLE+7/SxqGSNsCzd25OliHCUc4cwkQht8dKIDpGJhxS/FgRWMdyFih6czzgQ== X-YMail-OSG: 9CysscwVM1nXtrMNJlKg1fWbzv5XDHlA0qdIaPNsa0XexEyRmOv8fHBpDhxK9J2 fP3qcghN0hi9ImrwYBexd0k53CK6RFPWyJHZtdgU7yzyHZMkU4xSlsZ9tMbFK6kdE4TCUKENS2Cf V7R24ECTrOpx1gicqJ4W0FrrqPR6EcxG3vpWyR_YqBwqIcq6_A5uE80BzPz4dzF39.GCcAg1XmNI uiAgCS6hStJUEzTwTz2v1ZGPAYwYSMb11MGW7xYVngcmnfBwb1OoZtYQPwDZAjLOA_i_q4Xo_pHX 1T1UgPBK8G5qANtnYGfd4xhA3If1fxEaftcy1YuVKNfFY6.R6963IR1NmpN8A.AR3uzwMW3AE1Hu ThC5Ofq92e9NVF6HFz_Lfs7jw4AnUwgomd24V0L2MZ5jLb39YMpn_PMdPlPAbFhgSOKy26iyaVQ5 nDrrdPvAeE8FH.RPTxXtV3zGVyRq3v2NbENhwGUr_kIFTtyBh10QmJ5ghZfJcqgpsCpu4SWFrn8P _LYVgzCsMq78olhn5JXS.HoaR97bEwqK15fuy2ARTfglZrlsAhdk9NeYUmgtLq5TkCdvVl_jyk7r 7og8sQzc5zDUvfWrb3r4rlqyM9RbPvX7foilkDkoPz8Ff11CfQqDD6mNXjFS1KDWH3rQXcFIl3Jo Dh3h.fTNjxKNAKCBHp4wI8U0w3K2XSkaAy4ZukxRHQkUPnPX23GEBNqDwfTagYcjk.HyUX.zIa_R qQd0lb3eGCpxm4CtsM54pCFqraJT.EyAxShjId7RaGXZ_iX3RObA7UpkK.bJ8YWD_ela3jf_CNKC EQVIBlGxh.d5ARUgJuVZt8K9k7D7qRJ_wh57T5Pi8kFl2mUBEhWa.qfAbyItqK5GdW3m6Rln9n_5 oRc3yA6aZxF36727DMw1x0PzYeAZcKgY3UyNr0YdvwGu2vdhNSKXrUA738Gui26qfQcEYSwiTIQ8 EwjxmCTH8RB5QAvx50xaSkwTWgAvxZpRcJsP3ohKYvLYmnDyuyLeub.qBvfQ6iE0r975yZTNw5yL Os9nGxrtW5RmgL_UnFMZG3clJ0RapLf8eY7qb9x4y7e6xNZsO7XIvEiQMWoGRhEoOPY9zrnPJXcp UXvrDyCvQwTKCn3rzFxca_72F4kJpSruuwKP9oqEuGbLjGioF.QnFi3RAHPYkyvFJPHN7pGg3eXs TPVLylW1Yy67PXCECLJDX75HNPuKqempPSGoeXO5J1gRWtvOqLX.7Ie4qNmABM7EK8F1V_SnhaB7 tegbbXQ8c6PbeUs.AkZcczI9ffC6UNsxtlJfQudncIXkfHQ4q7KKRbpvepaaDlkFNdEs_izEYoTA ygJYCLNsYK1swD4imiR4.ctrsr_iqcu2kZ5D6bPQbzasBCiqEC9hXG_8afwUZGClWoRbHBbpu0W_ DrBoRd6PSqySnMWfhq9paYbxLDVUKfpmTf.ygyLisoIlYrxAea4j9dYCBD2rXvDbLXZOfkm3dW7d LOgr_WbfU.rEjXYTTuqynjeD8Z3oEU8c0f.1SiEZ_ASfNo2dvI_hlHASKw1ovwETit28okdKhU9L UbEA5Sf..BMaWnamlY4ENXCB5gErKYqQbmu5eQd2D6UvVrHes.3qmL.y_GuvON_cwoBHBthc8i.e 0oDJ2CyEXEdYZWnGVfGaU498DrNp6F4RxhYbzFgfyRYPuT7rzsZi5WkCeddVMJ4k5lSZaCikKB2r Sb7eCpzGGATocW96aCiCVyRb3VQ1uNX.J_zeqyF9Vzqm.trMD5gpS_if7vVSPHL2atHfelshhY68 Aq5.hvXGWgQfJDANV0nNvoVyEnbyjb7YUgcKCNbzIv6zKjrddZciPiG1vP9xN9xXVKLvIJmRtPUb 47IOQGdxLIH2sTGYXA99y4SLd0jei5gABClsxmQgc.nJVtRd_.8bXMHWf1pSWxL3eGPihaeCdRr1 EXWrTcdiRWKao4o_ahifKw9PuiaNGws0Xm6vGk_VHqOKIMBvijvIaRU6CTp3p9o8ZSVU2Cn3OGok 6AL7zF2EPNnOYBgoS8RqLirajrhAJpUJyeDeNngWeKZDfBbfe7lSUBcboL56MVJyAkLrVfDvtiBd wBAQoEA634B7wB6LjNsoIDQ8ziGColHDhHI2VRb1BS8AMx4KSG7Gp5jfM0InYCd31ShARRbJJdZS UrDDVHH3JRTntphPg4ou5j.DNO1QoCys2xyqVlCKVJnDqgtykfa750q1ZKDg6HP.POo8D4ongJWU - X-Sonic-MF: X-Sonic-ID: a498e00e-0b5d-432b-bddd-3955ce4ef8a5 Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.ne1.yahoo.com with HTTP; Mon, 4 Sep 2023 23:09:39 +0000 Received: by hermes--production-ne1-7b767b77cc-6vm8t (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 39548af6e46e0bf68465448246645dc1; Mon, 04 Sep 2023 23:09:35 +0000 (UTC) Date: Mon, 4 Sep 2023 19:09:12 -0400 Message-Id: <1a5cc4e1d451255097b09d7551701109c19e63fb.1693867030.git.hendursaga@aol.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 References: <1a5cc4e1d451255097b09d7551701109c19e63fb.1693867030.git.hendursaga.ref@aol.com> Received-SPF: pass client-ip=66.163.185.148; envelope-from=hendursaga@aol.com; helo=sonic305-22.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (tennix): Update to 1.3.4. [arguments]<#:phases>: Remove fix-include phase. [inputs]: Remove labels, update to SDL2, add SDL2_gfx dependency. [license]: Remove LGPL license, as SDL_rotozoom is no longer included. --- gnu/packages/games.scm | 95 +++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 52 deletions(-) base-commit: 31baada26332b5b72a8fa75e02c75e5f06274f89 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 760234b031..64fa9684ff 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5571,65 +5571,56 @@ (define-public lierolibre (define-public tennix (package (name "tennix") - (version "1.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://repo.or.cz/tennix.git") - (commit (string-append "tennix-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk")) - ;; Remove non-free images. - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file - '("data/loc_training_camp.png" - "data/loc_austrian_open.png" - "data/loc_olympic_green_tennis.png")) - #t)))) + (version "1.3.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://repo.or.cz/tennix.git") + (commit (string-append "tennix-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fmg0vw8c2spyxy4k64nwky80jsw9mc3vnlch49q6cagjsg9y8dj")) + ;; Remove non-free images. + (modules '((guix build utils))) + (snippet '(begin + (for-each delete-file + '("data/loc_training_camp.png" + "data/loc_austrian_open.png" + "data/loc_olympic_green_tennis.png")) #t)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no test - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-include - (lambda _ - (substitute* '("src/graphics.h" "src/sound.h") - (("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header) - (string-append "#include \"SDL/" header "\""))) - (substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h") - (("#include ") "#include ") - (("#include ") "#include ")) - #t)) - (add-after 'unpack 'locate-install - ;; Build process cannot expand "$(INSTALL)" in Makefile. - (lambda _ - (substitute* "makefile" - (("^CONFIGURE_OUTPUT :=.*" all) - (string-append "INSTALL := install -c\n" all))) - #t)) - (replace 'configure - ;; The "configure" script is picky about the arguments it - ;; gets. Call it ourselves. - (lambda _ - (invoke "./configure" "--prefix" (assoc-ref %outputs "out"))))))) - (native-inputs - (list which)) - (inputs - `(("python" ,python-wrapper) - ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net))))) + `(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (add-after 'unpack 'locate-install + ;; Build process cannot expand "$(INSTALL)" in Makefile. + (lambda _ + (substitute* "makefile" + (("^CONFIGURE_OUTPUT :=.*" all) + (string-append "INSTALL := install -c\n" all))) #t)) + (replace 'configure + ;; The "configure" script is picky about the arguments it + ;; gets. Call it ourselves. + (lambda _ + (invoke "./configure" "--prefix" + (assoc-ref %outputs "out"))))))) + (native-inputs (list which)) + (inputs (list python + (sdl-union (list sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf + sdl2-net + sdl2-gfx)))) (home-page "https://icculus.org/tennix/") (synopsis "Play tennis against the computer or a friend") - (description "Tennix is a 2D tennis game. You can play against the + (description + "Tennix is a 2D tennis game. You can play against the computer or against another player using the keyboard. The game runs in-window at 640x480 resolution or fullscreen.") ;; Project is licensed under GPL2+ terms. It includes images - ;; released under Public Domain terms, and SDL_rotozoom, released - ;; under LGPL2.1 terms. - (license (list license:gpl2+ license:public-domain license:lgpl2.1)))) + ;; released under Public Domain terms. + (license (list license:gpl2+ license:public-domain)))) (define-public warzone2100 (package