From patchwork Tue Jan 2 23:59:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 58338 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 EC85D27BBE2; Wed, 3 Jan 2024 00:03:32 +0000 (GMT) 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_ADSP_CUSTOM_MED, 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 3BD5427BBE9 for ; Wed, 3 Jan 2024 00:03:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKois-0006RS-GV; Tue, 02 Jan 2024 19:03:02 -0500 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 1rKoiq-0006Qu-N6 for guix-patches@gnu.org; Tue, 02 Jan 2024 19:03:00 -0500 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 1rKoiq-0000KJ-El for guix-patches@gnu.org; Tue, 02 Jan 2024 19:03:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKoir-0005D8-Rl; Tue, 02 Jan 2024 19:03:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps. References: In-Reply-To: Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 03 Jan 2024 00:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68199 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68199@debbugs.gnu.org Cc: gemmaro , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 68199-submit@debbugs.gnu.org id=B68199.170424014519967 (code B ref 68199); Wed, 03 Jan 2024 00:03:01 +0000 Received: (at 68199) by debbugs.gnu.org; 3 Jan 2024 00:02:25 +0000 Received: from localhost ([127.0.0.1]:51576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKoiG-0005By-Rt for submit@debbugs.gnu.org; Tue, 02 Jan 2024 19:02:25 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:61549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKoiC-0005Bc-PI for 68199@debbugs.gnu.org; Tue, 02 Jan 2024 19:02:23 -0500 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6d77c6437f0so3157000b3a.2 for <68199@debbugs.gnu.org>; Tue, 02 Jan 2024 16:02:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704240132; x=1704844932; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=yWKJuhSKkMuu4Q54kYVceva0CKBlMfu6yDmAf7qGRas=; b=h/lSMO/dA45hsixG0g//3quSQnfJJCdjpZoCdxpdv5w9COfnTxCkzV4wFrSyTPqjZl yx+PD3JRd8axeHlPwxAFRMnzR3leH7BXbBSNC3Ba7HDOhfetxop7S5mKhCmHeE9SpOz5 Wnd5ZmMrlT4M8KddygiXyyX7ZOHtjhXk5crDa1HWbn7xL7PpoX2jtmcbc9389qnzz04o sjQVuEeDXUsjpoEW1uZ2omgIt+OlSQPEfXwTS3l6JFlelpR7BOHQuWwRnOw4eosmShyd bRm8AIWzZ/1ka+KqcVc/QJxo8UIWQfYGBSRdgt+qurCPrcL9RUpIie4oH+5JaKEWqq/b BWCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704240132; x=1704844932; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yWKJuhSKkMuu4Q54kYVceva0CKBlMfu6yDmAf7qGRas=; b=WBpLrQnaenNnowh5mOmAkfJuMPxSGqUvD8bDQ82LA3sz8kWg7wlrMi6SA0kiOxXsbu q+AEW2u10HWH6/K6tKmdVK1Y39jp20R6hMIKIniISBFdR1YXupGPui9nE5LKc/5oJ4Zo DRNt3R1h2T1c5FUtRMzYNfmiJIhAWWYYyQ11fZWHxZ5SWxBORyhwjUSuoq1qQnXuqTF8 5eb7mDX6gdn91s693Z+gN9hIKso21VwQdJGEF81OonTDfFa1b42hzTh/ZT48S6dfuhdB rHCLdu9/gUWZa1QIQ/eGir+tJkUAbto0IYrhP+I8jlQp79w4Kor/Q9ljUvH2chJESrdX oxtw== X-Gm-Message-State: AOJu0YwRapRCxf88bmdS5F82L7uYpVu5nreO0/cA2MoBmRvAaf0b0kMC bwaK4iU82ilZjjheC7+DqwNCGqJTkDBC+A== X-Google-Smtp-Source: AGHT+IFVM7yny0DtS1eKHUzcyXU6tAXSVfreiE7wxqsqFLq8TLRjR4yhO/UWp/IQhChsHF+keCcGkA== X-Received: by 2002:a17:902:e885:b0:1d4:2c93:39ae with SMTP id w5-20020a170902e88500b001d42c9339aemr9241847plg.91.1704240131959; Tue, 02 Jan 2024 16:02:11 -0800 (PST) Received: from mac.gemmaro.name ([240f:74:d1f0:1:219f:4522:3a10:1fb3]) by smtp.gmail.com with ESMTPSA id d5-20020a170902854500b001d49f61cb64sm8079768plo.262.2024.01.02.16.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 16:02:11 -0800 (PST) From: gemmaro Date: Wed, 3 Jan 2024 08:59:58 +0900 Message-ID: <3c76ff811b93f7e84067c1e2247e6b9acec829a4.1704239998.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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: , 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 (taisei): Reformat with guix style. [arguments]: Use gexps. Change-Id: If542566f43e581968f73537e90101a18d3b1bca1 --- gnu/packages/games.scm | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) base-commit: 86b5fa100992527c434616482ba9cfd92b636d12 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c7813790a1..4bbe97c3f9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -78,7 +78,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Florian Pelz ;;; Copyright © 2023 Ivana Drazovic -;;; Copyright © 2023 gemmaro +;;; Copyright © 2023, 2024 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -3390,48 +3390,48 @@ (define-public taisei (origin (method url-fetch) (uri (string-append "https://github.com/taisei-project/" - "taisei/releases/download/v" version - "/taisei-v" version ".tar.xz")) + "taisei/releases/download/v" + version + "/taisei-v" + version + ".tar.xz")) (sha256 (base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v")))) (build-system meson-build-system) (arguments - `(#:build-type "release" ;comment out for bug-reporting (and cheats) - #:configure-flags - (list "-Dr_default=gles30" - "-Dr_gles20=true" - "-Dr_gles30=true" - "-Dshader_transpiler=true"))) - (native-inputs - (list pkg-config python python-docutils python-pygments)) - (inputs - (list cglm - freetype - libpng - libwebp - libzip - mesa - openssl - opusfile - sdl2 - sdl2-mixer - shaderc - spirv-cross - zlib)) + (list + #:build-type "release" ;comment out for bug-reporting (and cheats) + #:configure-flags #~(list "-Dr_default=gles30" "-Dr_gles20=true" + "-Dr_gles30=true" "-Dshader_transpiler=true"))) + (native-inputs (list pkg-config python python-docutils python-pygments)) + (inputs (list cglm + freetype + libpng + libwebp + libzip + mesa + openssl + opusfile + sdl2 + sdl2-mixer + shaderc + spirv-cross + zlib)) (home-page "https://taisei-project.org/") (synopsis "Shoot'em up fangame and libre clone of Touhou Project") (description "The player controls a character (one of three: Good, Bad, and Dead), dodges the missiles (lots of it cover the screen, but the character's hitbox is very small), and shoot at the adversaries that keep appear on the screen.") - (license (list ;;game - license:expat - ;;resources/00-taisei.pkgdir/bgm/ - ;;atlas/portraits/ - license:cc-by4.0 - ;;miscellaneous - license:cc0 - license:public-domain)))) + (license (list + ;; game + license:expat + ;; resources/00-taisei.pkgdir/bgm/ + ;; atlas/portraits/ + license:cc-by4.0 + ;; miscellaneous + license:cc0 + license:public-domain)))) (define-public cmatrix (package From patchwork Tue Jan 2 23:59:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 58337 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 7D9A827BBE2; Wed, 3 Jan 2024 00:03:29 +0000 (GMT) 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_ADSP_CUSTOM_MED, 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 8619E27BBE9 for ; Wed, 3 Jan 2024 00:03:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKois-0006Rv-Rb; Tue, 02 Jan 2024 19:03:02 -0500 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 1rKoir-0006RE-LT for guix-patches@gnu.org; Tue, 02 Jan 2024 19:03:01 -0500 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 1rKoir-0000KS-0n for guix-patches@gnu.org; Tue, 02 Jan 2024 19:03:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKois-0005DE-8K; Tue, 02 Jan 2024 19:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68199] [PATCH v2 2/2] gnu: taisei: Update to 1.4. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 03 Jan 2024 00:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68199 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68199@debbugs.gnu.org Cc: gemmaro , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 68199-submit@debbugs.gnu.org id=B68199.170424014519974 (code B ref 68199); Wed, 03 Jan 2024 00:03:02 +0000 Received: (at 68199) by debbugs.gnu.org; 3 Jan 2024 00:02:25 +0000 Received: from localhost ([127.0.0.1]:51578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKoiH-0005C0-Cf for submit@debbugs.gnu.org; Tue, 02 Jan 2024 19:02:25 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:42261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKoiE-0005Bf-AO for 68199@debbugs.gnu.org; Tue, 02 Jan 2024 19:02:23 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1d3ef33e68dso64160915ad.1 for <68199@debbugs.gnu.org>; Tue, 02 Jan 2024 16:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704240134; x=1704844934; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1bu1ytK/+xvhbumQaqcbpcrha7M7gA4CM/2YZQEVlMI=; b=mPLn8E2OMMXFr2dajRWHj2DNjbCXIgcY5NVbGLdME4K+7zBNH2iq2qiVe9eu7qCvq8 gFgWTDt+n6C6lxJBSeHMDoI0o+Ocm6ZjkPkTYkUzGxSf+TwTox35al5gXOhqhGCY9u4o YJOGAcRcBG3ozkPyyp81WfzCFEC7GsReNoKz5t5Ij5Z0w6NS5FQF7m0tLNRqUpVGM+q8 UUQUEa+mZbeQ0dpWvPhzonTXw2im+ZM09J3nIzr/v8jBRaqOmUl82j2yT06/H3Cuz+MX k5/7MU8syakejkURkre+X0ThdzXKmJ78wibZYrwV6qk52ISz85I0NrQkwZRmJ8ivjf8z /dzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704240134; x=1704844934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1bu1ytK/+xvhbumQaqcbpcrha7M7gA4CM/2YZQEVlMI=; b=pRX/Cek8iqFuY15xfQvzszsunpPBwkomhMqDHiDoVUwsGNQnki13VjFIynwWOsUavY 8XiNIvBj9uUSSdcOkgcnm3J5lbIop+8e3xjNWrGBefzNlnMHu8WXP5MuiNCccAzrvBBA GhHIw6TCdVhT+hJePdZHy3gVVUZUAZ/iy2clXt+AxDPApoaGezsBsoyh8UFS0xoMHizi 1jEUm7kKRyIjbDlJnRToX1un8wj83uPG5ufbrzmOBBOccWwiRCgYUyC7sWh1+bQD++23 4SJ6f2DBmGlEbWIV+/GlX2rAdjs7jEntcUQ9q8qwwD+RXpKdmtybrEXH8EVaA+he1bug fWAw== X-Gm-Message-State: AOJu0YzfxN/AJY0JNwv50qqkw6ntKQngUapn7k3ZRax5/VyBGjkMg9nG sDacAM01hlE+eh6sU8ug/Ri++g8R3ZWpaQ== X-Google-Smtp-Source: AGHT+IGOqh6mouUqPG2x4iwzoHnAYqX0joa8UG5CUvnIDxiuFEmkYVsYNz3VHEnY3Le1mi6uWIhm5g== X-Received: by 2002:a17:903:2441:b0:1d4:81bc:a2c2 with SMTP id l1-20020a170903244100b001d481bca2c2mr367935pls.2.1704240133715; Tue, 02 Jan 2024 16:02:13 -0800 (PST) Received: from mac.gemmaro.name ([240f:74:d1f0:1:219f:4522:3a10:1fb3]) by smtp.gmail.com with ESMTPSA id d5-20020a170902854500b001d49f61cb64sm8079768plo.262.2024.01.02.16.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 16:02:13 -0800 (PST) From: gemmaro Date: Wed, 3 Jan 2024 08:59:59 +0900 Message-ID: <7ee1344af48e9cb20c53ac6b4c943aafa0a6f7e8.1704239998.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <3c76ff811b93f7e84067c1e2247e6b9acec829a4.1704239998.git.gemmaro.dev@gmail.com> References: <3c76ff811b93f7e84067c1e2247e6b9acec829a4.1704239998.git.gemmaro.dev@gmail.com> MIME-Version: 1.0 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: , 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 (taisei): Update to 1.4. Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28 --- 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 4bbe97c3f9..84aa17b3be 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -193,6 +193,7 @@ (define-module (gnu packages games) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -3385,12 +3386,12 @@ (define-public talkfilters (define-public taisei (package (name "taisei") - (version "1.3.2") + (version "1.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/taisei-project/" - "taisei/releases/download/v" + "taisei/releases/download/" version "/taisei-v" version @@ -3416,7 +3417,8 @@ (define-public taisei sdl2-mixer shaderc spirv-cross - zlib)) + zlib + (list zstd "lib"))) (home-page "https://taisei-project.org/") (synopsis "Shoot'em up fangame and libre clone of Touhou Project") (description