From patchwork Fri Apr 18 23:44:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: iyzsong--- via Guix-patches via X-Patchwork-Id: 41797 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 15D8727BC4B; Sat, 19 Apr 2025 00:40:31 +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=-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 54E4327BC49 for ; Sat, 19 Apr 2025 00:40:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5vJb-0003PQ-D5; Fri, 18 Apr 2025 19:40:11 -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 1u5vJW-0003Ln-W5 for guix-patches@gnu.org; Fri, 18 Apr 2025 19:40:08 -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 1u5vJT-0000iQ-3r for guix-patches@gnu.org; Fri, 18 Apr 2025 19:40:06 -0400 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:Subject; bh=QRBg3ZnGsacCT1ySyg9TMo8HVsOBjlVwwpG8ioKCfe4=; b=vaeAZDeBPXv2Zt0+6I5N8HL4a3Uu1j1t+/ApfBOdV86UxqRY1aX971sUfPrdQLCS6dNYSLoPweqcnYkUc1RFa6DzSnKJ+qF8OeO3qf2U/S6ZWDNF+54HLrGdHngT1mbAqEssPGJgWueZkcoZjybta2AbG991vBXpvVCM3gJKN2KmR8RqeRrYFtJFXBFGAr53qV2jticNiR8V17TczmNPaEpRP45Z3NYPaEzdHTAhx3Dz6W188Y1bFS9E2KwHp577dlEZuawlvkNAmDlzl3d62QB+Qkxjbu3JFuKuectIpS9Z/2boL6A4kw/FfS3vx5ObQNPjqESjYAV8NdvF2nLrbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5vJS-0001YF-RL for guix-patches@gnu.org; Fri, 18 Apr 2025 19:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77910] [PATCH 1/2] gnu: sdl3: Update to 3.2.10. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 23:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77910@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17450195915840 (code B ref -1); Fri, 18 Apr 2025 23:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Apr 2025 23:39:51 +0000 Received: from localhost ([127.0.0.1]:53279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5vJG-0001W6-Dj for submit@debbugs.gnu.org; Fri, 18 Apr 2025 19:39:50 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59426) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5vJD-0001Ud-DB for submit@debbugs.gnu.org; Fri, 18 Apr 2025 19:39:48 -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 1u5vJ7-00031m-JQ for guix-patches@gnu.org; Fri, 18 Apr 2025 19:39:41 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5vJ4-0000bX-F3 for guix-patches@gnu.org; Fri, 18 Apr 2025 19:39:40 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id AB42438A409F; Fri, 18 Apr 2025 23:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1745019567; bh=QRBg3ZnGsacCT1ySyg9TMo8HVsOBjlVwwpG8ioKCfe4=; h=From:To:Cc:Subject:Date:From; b=aF7QmutYFEnnDeDhCmvh9f1KN/o5vMqBEwOj5Tbz+rnOl2bLySWgznlwts0WKAG3o kcmxeuSeNgIX0uryxi3O7JabKbhUm5TCj2qyblYwEjfY36JUrCKwzrmVyZqZ/37z86 cbC7zYEm+Hqz0K5uJw2DzPOuton0UNmgxROtB7/b3siRoDrT7Nu++svBipqvqv1qVj SDmQ2QcapyLm6HMuGGkfh49hmj/gmbUuBRy/R/0Dt02ETCzP55ixFlJq6N+Z7pU1mX Ua9BTZDdC8HBDJs7EiNrZ3n1soz169fHGQ/A910RgK7ukDKifAEoRqc1fRXRs2XQQW tRACB6MRTUgB2pPFL0esWtBGJbuxsTJ61XBbjs02PWz4bkJOyeJqenkBjdlfi2+kXO FYGTvgU89zDaNoBwl1tInLvd6PEC7DNsNMQJ4g7nYMOR+yDmh7DgmNZQ0Qj1BhqAWl JH2bMqDjzZbTn7SC+KaDl1pgvgJN7zj8Yh5q3poIWJn8d1Ghlb7ZpSrf7QNO2aEDqT GsZFRsabvIP32FwSyK6OmHRL3Pkph7AVsQlH/rTsUfQwpJ8ZHizVkqAGh4hzS8ej70 kvzccRAZx9dMnwvNbF1FXPU2Jk+w1vIXPJyYQivAg62V8SY5u+io2yDWJfWtyN4fXu HaJmOzYALgRjinzMJilrr5Yk= 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 MQrmQIpp2H_K; Fri, 18 Apr 2025 23:39:24 +0000 (UTC) Received: from localhost (unknown [112.44.73.128]) (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; Fri, 18 Apr 2025 23:39:24 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 48e6e1b7; Fri, 18 Apr 2025 23:44:18 +0000 (UTC) Date: Sat, 19 Apr 2025 07:44:13 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: iyzsong--- 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/sdl.scm (sdl3): Update to 3.2.10. [propagated-inputs]: Add mesa. Change-Id: Ibbd6b1056e5e1467c5d73235abca48cd6d63e780 --- gnu/packages/sdl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: a4a7ff0319c622cd08aa7461cc88cc6608fe62cb diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 0f612b1bbb..c23614745c 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -151,7 +151,7 @@ (define-public sdl3 (package (inherit sdl2) (name "sdl3") - (version "3.2.8") + (version "3.2.10") (source (origin (method url-fetch) @@ -160,7 +160,7 @@ (define-public sdl3 version "/SDL3-" version ".tar.gz")) (sha256 (base32 - "00yv0273fvljp916kjvcmr60bl97pd95xdpjrn77dpk1nfmqyf0k")))) + "1q0ksmg1h0xfjpgbshslxc5a2b2flcm7n5lwiq4v8vf6vssffyzq")))) (build-system cmake-build-system) (arguments (list @@ -188,6 +188,7 @@ (define-public sdl3 libxcursor ;enables X11 cursor support libxkbcommon libxrandr + mesa ;required by wayland pipewire pulseaudio wayland)) From patchwork Fri Apr 18 23:45:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: iyzsong--- via Guix-patches via X-Patchwork-Id: 41798 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 96A8A27BC4B; Sat, 19 Apr 2025 00:42:13 +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=-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 EB05527BC49 for ; Sat, 19 Apr 2025 00:42:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5vLS-0004ky-C0; Fri, 18 Apr 2025 19:42:06 -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 1u5vLO-0004jj-T1 for guix-patches@gnu.org; Fri, 18 Apr 2025 19:42:02 -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 1u5vLN-00012s-VZ for guix-patches@gnu.org; Fri, 18 Apr 2025 19:42:02 -0400 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=FD4eKKcLqbBifvHGiwStyIgyJTVjAceabu3DvwXmoB4=; b=PSMOl7HteNDWMpNY1Pt+YDnAisyfWitC1tQ9jNqq3wQSCO4oy939bvKHRi03H3qFGnsUbbeKOBTpyKhslRVlLq9AckCnCKn3BRD14p9d9GBB5+0Lk1tUYYy25P/iYAxNkDVs0ic2Atdb2EoVAQf5cAI5s6RtzHvopcPyex5pkslJb87T4+lsqZgwGcevF50xCBTSoF/5bytSlg6AXFInulEgBsVhObuw42Y5/7qni5LrrWg/eVZr3Nbgm9IBsKhrRjAZsQWhLxmuG3xqWm5S7GK2qbH1kfY2rWIp0za6jyD97Tia32bxMYlv0ghlR0dkGvEjmSfEoiQtNuK44QCd7w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5vLN-0001w2-Q1 for guix-patches@gnu.org; Fri, 18 Apr 2025 19:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77910] [PATCH 2/2] gnu: Add sdl2-compat. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 23:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77910@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 77910-submit@debbugs.gnu.org id=B77910.17450196757078 (code B ref 77910); Fri, 18 Apr 2025 23:42:01 +0000 Received: (at 77910) by debbugs.gnu.org; 18 Apr 2025 23:41:15 +0000 Received: from localhost ([127.0.0.1]:53288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5vKY-0001pR-OI for submit@debbugs.gnu.org; Fri, 18 Apr 2025 19:41:14 -0400 Received: from mail.envs.net ([5.199.136.28]:52564) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5vKS-0001o7-KN for 77910@debbugs.gnu.org; Fri, 18 Apr 2025 19:41:07 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 9A56738A409F; Fri, 18 Apr 2025 23:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1745019663; bh=FD4eKKcLqbBifvHGiwStyIgyJTVjAceabu3DvwXmoB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGWwr3wvJDl2jVr9aJMWo5e6FpIEhvpTVNPsfak2d1mdIBnJ5RFlN9nEzNDAgYsjh 4tKw4CPEzeyDBCk1+NAr6aMMVGI40PrW3YUEObHcF17bI/jAp+x+bJDDKSL2KymZf6 M2IdEe3lmD3ORNO6iNEMHwU4MwU59xzt/ywFMDVah4ohnUJ9WM2i7bmaG+as2kkwFS NAL2EPegXPcehXOZVCX77gOwW0NDDLlUMnJMcfmyOubsDdgGMIYnkR+skZhJz+JLph UoUnPmyGGNTt36kUbePnG5WqAkTKX0Nq/2QojK4ZnNVzQ02XWciPiGi274BEV5sLlr VCsxPQ65Vgr5DCJMyf3kAgDtT2lVdCugs/Dkk44isQLxHvmgJLbQo3XWSuG4O+vGjE N05tXv16keVuNQy4mVnBXaToeI2I71MW110YjmwGmz0bNluhoXLCPkGZl3Rr/zBpU6 AdikBEJ+hJ5AoddPQKThOFgXyr/KCSKPC5YIkGCFut3VYP2De8FxP9ZVpuyFUoYazI lpO//y6jXANhTde6fCONCjA18XmodlTf1z2AXKtviO7zuhmgJbqM3l3wKysDensK0b zPipTh51sFkcq5WsrwzrXHUvI6RqYvu92O86X+3YEHn4YnNLHRe+jO83ABcWoccLUE tmehURz7PSNzlqJJL/GqbT4I= 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 UWBDe8rW4qzm; Fri, 18 Apr 2025 23:41:00 +0000 (UTC) Received: from localhost (unknown [112.44.73.128]) (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; Fri, 18 Apr 2025 23:41:00 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b9f6d2df; Fri, 18 Apr 2025 23:45:56 +0000 (UTC) Date: Sat, 19 Apr 2025 07:45:49 +0800 Message-ID: <21922830e3f5d421c15b9cf4e4e699bc3463037f.1745019842.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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: iyzsong--- 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/sdl.scm (sdl2-compat): New variable. Change-Id: I57eae86fc14224f08c42f079b9e271509e855166 --- gnu/packages/sdl.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index c23614745c..75fe524b3a 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -201,6 +201,46 @@ (define-public sdl3 vulkan-loader wayland-protocols)))) +(define-public sdl2-compat + (package + (name "sdl2-compat") + (version "2.32.54") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libsdl-org/sdl2-compat") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ijpx62b9syypxxnwvggz4l5fmrgln95ka180am9g2hgyqkqlj5n")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'qualify-libsdl3 + (lambda _ + (substitute* "src/sdl2_compat.c" + (("libSDL3[.]so[.]0") + (string-append #$(this-package-input "sdl3") + "/lib/libSDL3.so.0"))))) + (add-after 'install 'install-sdl2.pc + (lambda _ + (let ((pcdir (string-append #$output + "/lib/pkgconfig"))) + (symlink (string-append pcdir "/sdl2-compat.pc") + (string-append pcdir "/sdl2.pc")))))))) + (inputs (list sdl3)) + (propagated-inputs (list libx11)) ;required by SDL_syswm.h + (synopsis "Cross platform game development library") + (description "Simple DirectMedia Layer is a cross-platform development library +designed to provide low level access to audio, keyboard, mouse, joystick, and +graphics hardware. This package is a compatibility layer; it provides a binary and +source compatible API for programs written against SDL2, but it uses SDL3 behind the +scenes.") + (home-page "https://libsdl.org/") + (license license:zlib))) + (define-public sdl12-compat (package (name "sdl12-compat")