From patchwork Wed Nov 13 09:05:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 70335 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 F329527BBEA; Wed, 13 Nov 2024 09:06:30 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 745A727BBE2 for ; Wed, 13 Nov 2024 09:06:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tB9KA-0005pe-M4; Wed, 13 Nov 2024 04:06:06 -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 1tB9K7-0005oL-QL for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:04 -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 1tB9K7-00014f-Cx for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06: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=OkABN5IY8gUlfDuwtc7hTEO9dPtWqij2qCljQ/AFSwY=; b=ELHzwlYIyscuqSJt90kezOL+7m1gbCeHxGIHtsKxQOY/v5DrFh8YRiCcuwcX/LusODo8cXkInHRrDD/hod+XCzk+VFEkEYz1nYKDLeuYseJIeaPRSJ+nXjyT8uQotQM55RXuHmeTawSK3xyOGM8J28/PEZ3dvneucCizuktcyPOqL3bOyUPJkokIFE8xO9RTLFgBxgvv6vRq0PIXwr4jZVTAzLGI/bWJ1KDZ9OhWc/aomPKeYNGGRUwsh3i6z93P0KumrFbInH8x3FTEB0/fwR9YNTSdCdzFefkRqy9pOeGs28RaRBdOTrMcCXY1yoHarvdDuOpLYaVDHfhIH9hFpg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tB9K6-0003tp-6M for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74335] [PATCH v1 1/4] gnu: libresprite: Update to 1.1. References: <20241113084948.19059-1-ngraves@ngraves.fr> In-Reply-To: <20241113084948.19059-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 09:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74335@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74335-submit@debbugs.gnu.org id=B74335.173148871414654 (code B ref 74335); Wed, 13 Nov 2024 09:06:02 +0000 Received: (at 74335) by debbugs.gnu.org; 13 Nov 2024 09:05:14 +0000 Received: from localhost ([127.0.0.1]:40706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JK-0003oA-6h for submit@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:14 -0500 Received: from 10.mo583.mail-out.ovh.net ([46.105.52.148]:57133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JH-0003m8-BI for 74335@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:13 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.25.131]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XpHRn1ByWz1TCR for <74335@debbugs.gnu.org>; Wed, 13 Nov 2024 09:05:08 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-xttxb (unknown [10.110.178.126]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9114A1FEB6; Wed, 13 Nov 2024 09:05:08 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-5b5ff79f4f-xttxb with ESMTPSA id x/YjF8RrNGdsIwAAqyG1Gg (envelope-from ); Wed, 13 Nov 2024 09:05:08 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R0015852a90d-3d08-4796-8902-32ed57e5a823, E46EE4CFA6AA1EB3B0ED220F39F6A53F8FAC1481) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 13 Nov 2024 10:05:00 +0100 Message-ID: <20241113090506.21471-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 7765331659517387490 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrvddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=OkABN5IY8gUlfDuwtc7hTEO9dPtWqij2qCljQ/AFSwY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1731488709; v=1; b=dCwulONj/dCHF+Nv8hooaJlFofK267X6xZ9AuB8v225BOK7C/ehzR7EPd6f+xpFt5CS4rXRD +VMkP9s3twhSm+qn6tTkZjUG73vHQHPjAAiOiGyvRAXXPDvco8DEiuAGJ8fZMoplpt2mBIaUoJM USfxePwGU0a0scSfXYwOvGRsSRA/UYcGLWSGSaHVqiumUhAput0H3kjSUNGFQlMm+Rafl32UCZI 1toiJmz/l6ZEfiQN1VVX18qHvOY5W9ooGWD0y8gdKvwl3l02yT7+zXRRq1xWjuCIVFUtX7foTCa xd1aHmpm4bg2c/txfTkElJWtXmmiGLbp2KJta8uj8NzuQ== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/game-development.scm (libresprite): Update to 1.1. [arguments]: Improve style: use gexps. [native-inputs]: Improve style: use list. [inputs]: Improve style: use list. Add libarchive. Delete zlib. Replace tinyxml by tinyxml2. --- gnu/packages/game-development.scm | 53 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 89c6c0b75e..4d3f73c44c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -66,6 +66,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -1194,7 +1195,7 @@ (define-public aseprite (define-public libresprite (package (name "libresprite") - (version "1.0") + (version "1.1") ;; TODO: Unbundle third party software. ;; - duktape is bundled inside the project but it's hard to unbundle: ;; there are many differences from a version to the next and it is not @@ -1208,34 +1209,34 @@ (define-public libresprite (file-name (git-file-name name version)) (sha256 (base32 - "0djbjjh21ahlxzh0b0jp4mpfycam8h9157i4wbxkd618fraadhbp")))) + "0i1g730khnb8xj56c07x0b0ni6sx4n8vp3w13yazqx9anj23y856")))) (build-system cmake-build-system) (arguments - '(#:configure-flags - (list "-DWITH_WEBP_SUPPORT=1" - "-DWITH_DESKTOP_INTEGRATION=1") - ;; Tests are unmaintained - #:tests? #f)) - (native-inputs - `(("pkg-config" ,pkg-config))) + (list #:configure-flags + #~(list "-DWITH_WEBP_SUPPORT=1" + "-DWITH_DESKTOP_INTEGRATION=1") + ;; Tests are unmaintained + #:tests? #f)) + (native-inputs (list pkg-config)) (inputs - `(("curl" ,curl) - ("freetype" ,freetype) - ("giflib" ,giflib) - ("googletest" ,googletest) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxxf86dga" ,libxxf86dga) - ("libxxf86vm" ,libxxf86vm) - ("lua" ,lua) ; Optional - ("pixman" ,pixman) - ("sdl2" ,sdl2) - ("sdl2-image" ,sdl2-image) - ("tinyxml" ,tinyxml) - ("zlib" ,zlib))) + (list curl + freetype + giflib + googletest + libarchive + libjpeg-turbo + libpng + libwebp + libx11 + libxext + libxxf86dga + libxxf86vm + lua ;optional + pixman + sdl2 + sdl2-image + tinyxml2 + zlib)) (synopsis "Animated sprite editor and pixel art tool") (description "LibreSprite is a tool for creating 2D pixel art for video games. In addition to basic pixel editing features, it can assist in the From patchwork Wed Nov 13 09:05:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 70334 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 8E36C27BBEA; Wed, 13 Nov 2024 09:06:27 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 B34F727BBE2 for ; Wed, 13 Nov 2024 09:06:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tB9K9-0005oq-CI; Wed, 13 Nov 2024 04:06:05 -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 1tB9K7-0005oJ-HC for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:03 -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 1tB9K7-00014i-5k for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06: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:References:In-Reply-To:Date:From:To:Subject; bh=rV03+q834FmqTbvhtMIc/MZBmFrVvpiojqKr64Edul4=; b=QuHdvK77wKbw80vgfvpqVqxUvy7jLZzQX6OgLKOr3ndBgYRHsNS0OtkYjAwYJsKwxOO49hMT62ZtUw5cdGHef5W3zO1o69yAaUVQm0BLD7tPPY1nHiI3f3AGLIlw5hDFX8kuFS0o+DY+v6nJarbTdmBVaEAST9Fwia3aBseXAe4C/u35fltbmtNUTPqjZlm7APDAMGnbxRQoYXGhpcvqrUKpb1/gbKiG1n1+nl4BbA/hyh59RkvYIZsRO6EgvgS1iqz9VRG+yFzCVW/t6h63fYT7Ds9YKiRQLqxCEGw7DUxsHTrTH8ZxYIpxRfcob4KUIjrLXGx5u0Lgr39oOPJrtw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tB9K6-0003tw-Ni for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74335] [PATCH v1 2/4] gnu: Remove aseprite. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 09:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74335@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74335-submit@debbugs.gnu.org id=B74335.173148871814900 (code B ref 74335); Wed, 13 Nov 2024 09:06:02 +0000 Received: (at 74335) by debbugs.gnu.org; 13 Nov 2024 09:05:18 +0000 Received: from localhost ([127.0.0.1]:40710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JN-0003rg-Qt for submit@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:18 -0500 Received: from 9.mo583.mail-out.ovh.net ([178.32.96.204]:39393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JJ-0003na-IG for 74335@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:14 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.2.160]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XpHRr1Rgtz1TfM for <74335@debbugs.gnu.org>; Wed, 13 Nov 2024 09:05:12 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rt6l2 (unknown [10.108.54.148]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5CF661FE8B; Wed, 13 Nov 2024 09:05:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-5b5ff79f4f-rt6l2 with ESMTPSA id Z7vyNsZrNGc4SwAA1vKoaA (envelope-from ); Wed, 13 Nov 2024 09:05:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S0019aa76ff6-122c-4f2a-8cba-8056ba3a4ab4, E46EE4CFA6AA1EB3B0ED220F39F6A53F8FAC1481) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 13 Nov 2024 10:05:01 +0100 Message-ID: <20241113090506.21471-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241113090506.21471-1-ngraves@ngraves.fr> References: <20241113090506.21471-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7766457557898289890 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrvddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeffgfehgedvlefhleeitdffhfffffekffekvdeigedvkefgtdfgudetuefgteehnecuffhomhgrihhnpehlihgsrghllhgvghdrohhrghdpghhithhhuhgsrdgtohhmpdgrshgvphhrihhtvgdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=rV03+q834FmqTbvhtMIc/MZBmFrVvpiojqKr64Edul4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1731488712; v=1; b=lSX1PO3k2cSD1UIMjQDYLSYngo9CaGeBwG3z+bImzQGx7/xyq3DZ+tRTN+P/pCigkAMlzg2l FlfgENno0ZWlXk1cLnDnyBtHicadKnrwcXdelN75qRU5Dq7fCifUFZ8ax9gql6jhiSUnQcGzGS9 icF42B0lGfUsNsyxTx+/hiqQyCDRv7JX+iMvHxiCPJ9O3EJ0hNoeCt1Ds8VB7hP+w5NNrvEhx09 tBaOy9YSgz0rdjdw96aj3gSStLPCoNKGm6NgDCPj6NetVTG5eYvxNrdkcTRmlhPnCH2fshGVmq6 2D3lFVixKxuATnUKTJMANSxnlJXk4D+f72sOzcwA6gnMA== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 This package is a last GPL2 revision of a package that is now distributed in a nonfree license. We already have its libre fork in Guix, and it depends on allegro-4, which has a CVE and which development is not supported upstream. * gnu/packages/game-development.scm (aseprite): Delete variable. --- gnu/packages/game-development.scm | 59 ------------------------------- 1 file changed, 59 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4d3f73c44c..0ca08d5149 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1133,65 +1133,6 @@ (define-public allegro (home-page "https://liballeg.org") (license license:bsd-3))) -(define-public aseprite - (package - (name "aseprite") - (version "1.1.7") ; After 1.1.7 the source is no longer distributed under the GPL. - ;; TODO: Unbundle third party software. - (source (origin - (method url-fetch/zipbomb) - (uri (string-append "https://github.com/aseprite/aseprite" - "/releases/download/v" version - "/Aseprite-v" version "-Source.zip")) - (sha256 - (base32 - "1plss4i1lfxcznv9p0pip1bkhj7ipw7jlhsh5avd6dzw079l4nvv")))) - (build-system cmake-build-system) - (arguments - '(#:configure-flags - ;; Use shared libraries instead of building bundled source. - (list "-DWITH_WEBP_SUPPORT=1" - "-DUSE_SHARED_CURL=1" - "-DUSE_SHARED_GIFLIB=1" - "-DUSE_SHARED_JPEGLIB=1" - "-DUSE_SHARED_ZLIB=1" - "-DUSE_SHARED_LIBPNG=1" - "-DUSE_SHARED_LIBLOADPNG=1" - "-DUSE_SHARED_LIBWEBP=1" - "-DUSE_SHARED_TINYXML=1" - "-DUSE_SHARED_PIXMAN=1" - "-DUSE_SHARED_FREETYPE=1" - "-DUSE_SHARED_ALLEGRO4=1" - "-DENABLE_UPDATER=0" ; no auto-updates - (string-append "-DFREETYPE_INCLUDE_DIR=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2")))) - (native-inputs - (list pkg-config)) - ;; TODO: Use a patched Allegro 4 that supports window resizing. This - ;; patched version is bundled with Aseprite, but the patches should be - ;; extracted and applied on top of a standalone Allegro 4 package. - (inputs - `(("allegro" ,allegro-4) - ("curl" ,curl) - ("freetype" ,freetype) - ("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxxf86vm" ,libxxf86vm) - ("pixman" ,pixman) - ("tinyxml" ,tinyxml) - ("zlib" ,zlib))) - (synopsis "Animated sprite editor and pixel art tool") - (description "Aseprite is a tool for creating 2D pixel art for video -games. In addition to basic pixel editing features, Aseprite can assist in -the creation of animations, tiled graphics, texture atlases, and more.") - (home-page "https://www.aseprite.org/") - (license license:gpl2+))) - (define-public libresprite (package (name "libresprite") From patchwork Wed Nov 13 09:05:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 70336 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 BA3C927BBEA; Wed, 13 Nov 2024 09:06:38 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7FBC827BBE2 for ; Wed, 13 Nov 2024 09:06:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tB9K9-0005pE-Rk; Wed, 13 Nov 2024 04:06:05 -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 1tB9K7-0005oK-QH for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:04 -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 1tB9K7-00014n-Do for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06: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:References:In-Reply-To:Date:From:To:Subject; bh=07d002A9MkL9aJ7Il84avo0SeuGS/8PV4r97yogJNjg=; b=M14Jw2KyBpJ/BtzhJ73mfkEuPDnrgs8CexxaGV/MzFTwo0zIg/T2nTVtc7hwtTG8VQHlerdzMFUNo9fSqh9jjS9nNzjWRl/cCD+Rv3xeeoGdHWJ7T5BGpCrStcQFr++0ackdmNQI9hcziuiCkrPDqDQZABS3KKkYIdFMEEgXl+PUF9QzVYgocs8HgRm90BFvLlxocEq/R6v1aZvRcjycfeYympLBwl+PApx4Kb5Jaelr1XEQSYAj7FOG2DquRSpC/yFDuMe15rRH1lwiI8foozv2vkKaHvhdUDRgWGW1Vq+3As8J/+qze4MtO2ggoQBgEgnOeE3unE9Tfq1hp7C47A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tB9K7-0003u4-7y for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74335] [PATCH v1 3/4] gnu: Remove dumb-allegro4. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 09:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74335@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74335-submit@debbugs.gnu.org id=B74335.173148872514921 (code B ref 74335); Wed, 13 Nov 2024 09:06:03 +0000 Received: (at 74335) by debbugs.gnu.org; 13 Nov 2024 09:05:25 +0000 Received: from localhost ([127.0.0.1]:40714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JU-0003sZ-Bg for submit@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:24 -0500 Received: from 16.mo584.mail-out.ovh.net ([188.165.55.104]:45075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JS-0003sP-JS for 74335@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:23 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.140.35]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XpHS053NMz10Yv for <74335@debbugs.gnu.org>; Wed, 13 Nov 2024 09:05:20 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-5xq59 (unknown [10.110.178.52]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 40C451FEB3; Wed, 13 Nov 2024 09:05:20 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-5b5ff79f4f-5xq59 with ESMTPSA id gwnBBtBrNGfUAAAAlHkLOg (envelope-from ); Wed, 13 Nov 2024 09:05:20 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006198829be-2151-4aa4-aae3-d5505e3b6669, E46EE4CFA6AA1EB3B0ED220F39F6A53F8FAC1481) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 13 Nov 2024 10:05:02 +0100 Message-ID: <20241113090506.21471-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241113090506.21471-1-ngraves@ngraves.fr> References: <20241113090506.21471-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7768709358023402210 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudelgddvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=07d002A9MkL9aJ7Il84avo0SeuGS/8PV4r97yogJNjg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1731488720; v=1; b=wGhNq2VzBkrvjqARTFZYt7HkV4ZKGBnXCK6bFLhUxfUg04scUPI8x1eoGxKUpVMfKUC3LVw3 /z+5Zehh3/smoPEbDa+lDcYCyet1RkpmWDEocyatg6ahUjca1PNRrNPR8UsZY+p10i/SKKQpHTf uR+qaME1ypYsJ4sr6duPot5iJ7U6t8gy+UM16q4e92QkBDeZ7gXdKUx1WbA8oM/1FsFQi3O0j9q 6PcqGVGvIvXYrzUR2qwnkxWtgCEraLHWMw7QhCQr229jDr0LpmVpJHxDaWvoi4fGIoqSZgHoEcZ Qe4876iTc5M95zrnjpZIUmw++Rmx5raTf7K6LehZ5LiMw== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 This package is leaf package that depends on allegro4, which has a CVE and which development is not supported upstream anymore. * gnu/packages/music.scm (dumb-allegro4): Delete variable. --- gnu/packages/music.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 980bce6b30..aec13b25a4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -130,7 +130,6 @@ (define-module (gnu packages music) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages game-development) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -985,17 +984,6 @@ (define-public dumb ;; Therefore, the DUMB license may be considered a free software license. (license (license:fsf-free "file://LICENSE")))) -(define-public dumb-allegro4 - (package - (inherit dumb) - (name "dumb-allegro4") - (arguments - (substitute-keyword-arguments (package-arguments dumb) - ((#:configure-flags flags) - `(cons "-DBUILD_ALLEGRO4=ON" ,(delete "-DBUILD_ALLEGRO4=OFF" flags))))) - (inputs - (list allegro-4)))) - (define-public hydrogen (package (name "hydrogen") From patchwork Wed Nov 13 09:05:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 70337 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 EA41127BBEA; Wed, 13 Nov 2024 09:06:50 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7C2EF27BBE2 for ; Wed, 13 Nov 2024 09:06:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tB9KC-0005py-IK; Wed, 13 Nov 2024 04:06:08 -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 1tB9K9-0005oo-AE for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:05 -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 1tB9K7-000150-WC for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=R0XGf2hWBOsK9pstmUjayO6l0YZZZ7rh509j4mmX2bA=; b=mY3SKL3tWNklN0mbrm+Ax2/sR2RM90GTpG20cDfxes4Jf3sSu6w4VqkLV1OUQsg0HhG+YNrbk6Qc5unYbUOjYAF48zw9YsfoUe28Jx3kHvr3LnvM+lHGVgu8CSP4mEL0Z5izXLibyh+JtDr9C3wTNvTgBHF7juwLX91cwgzbKVTzO3uYKz5H3SGd2EnWczFKhdYB6wPSSg348mKgjz6PGPeSejf7AvsbG07L2YoHvCLCRleed9y+feUys4Z7ZC8g4/gBcqzSp1mkeYFS2n4GRtEE/OGDxhcPEh/HGUaScfl4Xx8xz71sfea/cehumgQP+zGNkHm1ChEroCbpeMs3Kw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tB9K7-0003uB-QS for guix-patches@gnu.org; Wed, 13 Nov 2024 04:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74335] [PATCH v1 4/4] gnu: Remove allegro-4. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 09:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74335@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74335-submit@debbugs.gnu.org id=B74335.173148872814940 (code B ref 74335); Wed, 13 Nov 2024 09:06:03 +0000 Received: (at 74335) by debbugs.gnu.org; 13 Nov 2024 09:05:28 +0000 Received: from localhost ([127.0.0.1]:40718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JX-0003st-TN for submit@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:28 -0500 Received: from 3.mo561.mail-out.ovh.net ([46.105.44.175]:57231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tB9JV-0003sa-EH for 74335@debbugs.gnu.org; Wed, 13 Nov 2024 04:05:26 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.2.12]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4XpHS40j2kz1S6c for <74335@debbugs.gnu.org>; Wed, 13 Nov 2024 09:05:23 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-r85k8 (unknown [10.110.96.35]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 81A261FD45; Wed, 13 Nov 2024 09:05:23 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-5b5ff79f4f-r85k8 with ESMTPSA id XREqF9NrNGfPiwAACFp0+g (envelope-from ); Wed, 13 Nov 2024 09:05:23 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004d73648d1-416e-48cc-8df8-1d465f40e83a, E46EE4CFA6AA1EB3B0ED220F39F6A53F8FAC1481) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 13 Nov 2024 10:05:03 +0100 Message-ID: <20241113090506.21471-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241113090506.21471-1-ngraves@ngraves.fr> References: <20241113090506.21471-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7769553785266823906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudelgddvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekueehueevffefteffffdtfeehgfehveetgfehhfekffetvdettdejhefhffetleenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhlihgsrghllhgvghdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=R0XGf2hWBOsK9pstmUjayO6l0YZZZ7rh509j4mmX2bA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1731488724; v=1; b=ps5i9NL5KCVjl4bdpw7hE4f+ytA5DI9Pwg2zpEGZ7WBZdPD8SWxWW1g9NduYyeBsGBEcWiXD L9wWO6Lc8piICTOk4t2y7LTPGjTlQlq9kzkYwXPIWZMheo7Ipzd7GDd71cejeyCVj6dwCnTKj81 sQ8vBE2hkLhslM9Jct+VGfQwpYoWsRw77rY1lffedc8aCjVD0NFUEiT4DTbtsbvX/FX3OuJQJT/ d9i+ZqhhCTIWvV6fDYNCsAIImqkE4Gy3Y8U3DE+HQeUN82QDsHKil6BAxPpW28qt3/kPCi3kych QUe7c8w+evdQvOQNy2dzY27C9qazVQUkMo+zM5DFXYqWw== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 This package has a CVE and its development is not supported by upstream anymore. * gnu/packages/game-development.scm (allegro-4): Delete variable. --- gnu/packages/game-development.scm | 34 ------------------------------- 1 file changed, 34 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0ca08d5149..c854e533f9 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1058,40 +1058,6 @@ (define-public love-nuklear (home-page "https://github.com/keharriso/love-nuklear/") (license license:expat))) -(define-public allegro-4 - (package - (name "allegro") - (version "4.4.3.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/liballeg/allegro5/" - "releases/download/" version "/allegro-" - version ".tar.gz")) - (sha256 - (base32 - "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc")))) - (build-system cmake-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-build-system - (lambda _ - ;; Build addons as shared libraries. Trying to set ADDON_LINKAGE - ;; via a command line option doesn't work because it is - ;; unconditionally clobbered in the build script. - (substitute* '("CMakeLists.txt") - (("ADDON_LINKAGE STATIC") - "ADDON_LINKAGE SHARED"))))))) - (inputs - (list glu libpng libvorbis mesa zlib)) - (synopsis "Game programming library") - (description "Allegro is a library mainly aimed at video game and -multimedia programming. It handles common, low-level tasks such as creating -windows, accepting user input, loading data, drawing images, playing sounds, -etc.") - (home-page "https://liballeg.org") - (license license:giftware))) - (define-public allegro (package (name "allegro")