From patchwork Tue Mar 4 06:16:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ngraves--- via Guix-patches via X-Patchwork-Id: 39656 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 7DA8E27BBE9; Tue, 4 Mar 2025 06:13:58 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 EEAB327BBE2 for ; Tue, 4 Mar 2025 06:13:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpLWl-0000Ov-3z; Tue, 04 Mar 2025 01:13:15 -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 1tpLWa-0000K1-27 for guix-patches@gnu.org; Tue, 04 Mar 2025 01:13:06 -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 1tpLWZ-0004vK-MR for guix-patches@gnu.org; Tue, 04 Mar 2025 01:13:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=XVLEd3CgeFkNpFD476UxC7apF/D8XI0+g9Lv3E7L24k=; b=k1p6RS2fM+seq9kPxcAwAYG9b8Z1xSwCn1un1xS7RnXAKb8SQDS7R97jvlsMCKbXfUujJfIpc0cNsnzG9yKjyasDRHnM55CMq4wdDfjUtKLsaf1JPXNEKc/L+sVIJEXu4jHc3Kew7Xh2+ngfw5JeogawY4tBa+o6VL8WH108rFlh6X/iZMQNy7KIfQLsjTKpjsmOekUwNDWeTzfMR46fWBIDDdviaHhIxD/XfZQV9C5bbNQAQqIeYEMzwaGnpmLjUUS33a26bJrVk+vyIngpY785LyVWMBs8ICCqQl/ZHkecsxdREps4nPjq4f3LZslqMAMeMdgfmeRYJt+1ItCqpA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tpLWZ-0004G7-6Y; Tue, 04 Mar 2025 01:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76642] [PATCH v2] gnu: grafx2: Update to 2.9. References: <853611ad97a112d3699352d0f3e69e4e85872db0.1740751610.git.iyzsong@member.fsf.org> In-Reply-To: <853611ad97a112d3699352d0f3e69e4e85872db0.1740751610.git.iyzsong@member.fsf.org> Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 04 Mar 2025 06:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76642 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76642@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 76642-submit@debbugs.gnu.org id=B76642.174106873116238 (code B ref 76642); Tue, 04 Mar 2025 06:13:03 +0000 Received: (at 76642) by debbugs.gnu.org; 4 Mar 2025 06:12:11 +0000 Received: from localhost ([127.0.0.1]:54503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tpLVj-0004Dq-3t for submit@debbugs.gnu.org; Tue, 04 Mar 2025 01:12:11 -0500 Received: from mail.envs.net ([5.199.136.28]:44416) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tpLVf-0004Db-Aj for 76642@debbugs.gnu.org; Tue, 04 Mar 2025 01:12:08 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 3321938A3F88; Tue, 4 Mar 2025 06:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1741068725; bh=XVLEd3CgeFkNpFD476UxC7apF/D8XI0+g9Lv3E7L24k=; h=From:To:Cc:Subject:Date:From; b=TcnHW90Zboo/6tCgDzHOLPPBP/G7O7T090FND7CA2y/hfrxtOCFE5ThSc7Xq0DEN2 UI26RNzkss6sK2QBlD+tU+AhyqZXT/gpqvE8GVOMtioD2t4xTwV+ODM7VUdeKGnOLJ OwYwTfjzKGETcOhRS12VDhKb+YR9qTcCt3/dGNIkhbpcrTbCnliCvOx33aHK4cld5z p95xg207g9+U+vOksLrtvV+7reHdqx6tTkC1OtD5ejSpaP7kyA6lVZRHdCNLEaYkb1 L58Vb7qU9POJ5y2BBLBXz7X5rTaEUwKPzZZ+YwBEnELwRGmALrD7Zg7Y7LAdtgZo3l 39WBKPyzUEmS/ocYXZy+Q+pfdxh9fqo1YDCJoDDnv+BAF215BBaW+GAy4rmX3pmrFi v7jeV+N1PaSTzbjEmw4X/46FT9qt4ONqUEhNXCWmzKdxtFz+q3UfqBHzMYu/JkYoz5 4CZcpQPNAR7E26L958P+Qhbfaxplp808rI1xdOAxn+dwJmVolc/uUy0B/tJtV6osfZ aLEEZtzI10cYIvTuIwF2T4cdDvr5/bfZvUW+i2cDC7yiMABUHf9tZxvZ9Hi8kGTP8D yJ+yfZIrOTCWdrXhCvgCHzP3ZyuoLw0/U4tMcJvgkUXt4OYxlDzmBlRRImcjpq/Ykj MNmn9T9Ws3VGPotUA0jbGAVY= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id OveXSj4CuK0w; Tue, 4 Mar 2025 06:12:01 +0000 (UTC) Received: from localhost (unknown [112.44.104.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 4 Mar 2025 06:12:00 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1728ad2b; Tue, 4 Mar 2025 06:16:07 +0000 (UTC) Date: Tue, 4 Mar 2025 14:16:04 +0800 Message-ID: <15caf8117b5b67f3c77a9da8fb49cfd1da1db83f.1741068934.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.48.1 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: ngraves--- via Guix-patches via 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 From: 宋文武 * gnu/packages/game-development.scm (grafx2): Update to 2.9. [source]: Use git-fetch. [native-inputs]: Add which. [inputs]: Use SDL2 libraries. Add fontconfig. Replace lua@5.1 with lua@5.3. Remove libpng. Change-Id: I8e731d51d430b6a68f786d0a6320f2e1b7b92dae --- gnu/packages/game-development.scm | 92 ++++++++++++++++++------------- 1 file changed, 54 insertions(+), 38 deletions(-) base-commit: 56ad75cdabe759d8cc004a369ae9c845d34ae896 diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a026e114c4..ae5fe47ee6 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2024,48 +2024,64 @@ (define-public python-pyxel (license license:expat)))) (define-public grafx2 - (package - (name "grafx2") - (version "2.4") - (source (origin - (method url-fetch) - ;; XXX: There is no URL that contains the version. :( - (uri "http://pulkomandy.tk/projects/GrafX2/downloads/21") - (file-name (string-append "grafx2-" version ".tgz")) - (sha256 - (base32 - "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-before 'build 'change-to-src-directory - (lambda _ - (chdir "src") - #t))) - #:make-flags - ;; SDL header files are referenced without the preceeding "SDL/". - (list (string-append "CFLAGS=-I" - (assoc-ref %build-inputs "sdl-union") - "/include/SDL" - " -fcommon") - (string-append "prefix=" - (assoc-ref %outputs "out"))) - #:tests? #f)) ; no check target - (native-inputs - (list pkg-config)) - (inputs - (list libpng lua-5.1 - (sdl-union (list sdl sdl-image sdl-ttf)))) - (synopsis "Bitmap paint program") - (description "GrafX2 is a bitmap paint program inspired by the Amiga + (let ((3rd/6502 ;GPLv3+, used in source form + (origin + (method url-fetch) + (uri "https://github.com/redcode/6502/releases/download/v0.1/6502-v0.1.tar.xz") + (sha256 + (base32 "03wlndlmfsz51x7hmrfs02r3fzqk8a0grbzm2h80pm33f4r0z9dv")))) + (3rd/recoil ;GPLv2+, does not install a library + (origin + (method url-fetch) + (uri "https://downloads.sourceforge.net/project/recoil/recoil/6.4.2/recoil-6.4.2.tar.gz") + (sha256 + (base32 "1p73cgfacia2gxvswhdixk6grpp9rs2n5258axh5vdb6ly8w3pi3"))))) + (package + (name "grafx2") + (version "2.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/GrafX2/grafX2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rf85pm40nmp9f95adbzzfx2ypvqjl51wqvk461c4bk8z7anlniz")) + (modules '((guix build utils))) + (snippet + #~(begin + (mkdir "3rdparty/archives") + (copy-file #$3rd/6502 + "3rdparty/archives/6502-v0.1.tar.xz") + (copy-file #$3rd/recoil + "3rdparty/archives/recoil-6.4.2.tar.gz"))))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'build 'change-to-src-directory + (lambda _ + (chdir "src")))) + #:make-flags + #~(list "API=sdl2" + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + #:tests? #f)) ; no check target + (native-inputs + (list pkg-config which)) + (inputs + (list fontconfig lua (sdl-union (list sdl2 sdl2-image sdl2-ttf)))) + (synopsis "Bitmap paint program") + (description "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance. Specializing in 256-color drawing, it includes a very large number of tools and effects that make it particularly suitable for pixel art, game graphics, and generally any detailed graphics painted with a mouse.") - (home-page "http://pulkomandy.tk/projects/GrafX2") - (license license:gpl2))) ; GPLv2 only + (home-page "http://pulkomandy.tk/projects/GrafX2") + (license license:gpl2)))) ; GPLv2 only (define-public ois (package