From unknown Fri Aug 15 03:56:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65656] [PATCH] gnu: dosbox-staging: Update to 0.80.1. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 11:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65656@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169348214112059 (code B ref -1); Thu, 31 Aug 2023 11:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 11:42:21 +0000 Received: from localhost ([127.0.0.1]:55092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbg44-00038Q-Jx for submit@debbugs.gnu.org; Thu, 31 Aug 2023 07:42:20 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbg42-00038A-80 for submit@debbugs.gnu.org; Thu, 31 Aug 2023 07:42:19 -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 1qbg3j-0007p9-DB for guix-patches@gnu.org; Thu, 31 Aug 2023 07:42:00 -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 1qbg3f-00019Q-QH for guix-patches@gnu.org; Thu, 31 Aug 2023 07:41:59 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 8408138A0132; Thu, 31 Aug 2023 11:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693482113; bh=uMpTtwEKyV3TMMVcLwNp/N3z2t2QTjFNhx5Kks+dwXM=; h=From:To:Cc:Subject:Date:From; b=ZUelEmuJRDspHhFGyzCZF6BUHv7j6C9kPWnrEtM2EtFgiy43flMHUvd1pj6+b7LXG nerQ4q4unp325VH8i01A4AuUPKB59mmuG7OfDSITt7EqWNILhZSGTHqWhmcRq6FGJP tvcr1bqPRetttb1DLTRuw54uvlk5D0rx0bU0h3TF6U3nnRT3iN6iMzvFKu4j7jCWpB 2Nus2eFI/OSJYxuTnKhWAm8CmGOEc9/1lOiQeNhWkpMwlll/HLUNN6/3134ECOsu8Z uilbvYlYev4YSqCVkx5p7fztVKv+tC1IFWuMY6fvE3539FVikyq9xzJ0kjqx7tqKY6 S1ak5sFnkZiO7v/ynQheLYKLMAQGP9RVxZED6zpZuWjSZcOWqs3kwXXkpX16hXk69o T24OlE7grl2NL25hWf6HfRFT0Q2QDXAqgFRV8f7iexjI4A2EKRSY9IZ8YUlvrT6WnL 4QW3QAS2jc5QFuWp0tnSTU3yhVdIWZ1Ml5qzlmrWwOUseKyL64yU7G7ZzvXZZe6Ulo lkXdp5EcRn/GQMX77WM2IS34MrscGkbmAhQOMhHQvvitNJnUd7pPn7f5w+OVfNlxen 5VHIKmy9aHwv5jGJvxfY6MBm8fLMZIB89pNbndOYih+XxXVsQZQZJuDWHkYA+I6rh7 JVkFth3wisukAz8zKVCveG+U= 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 lari_Zlsc8En; Thu, 31 Aug 2023 11:41:50 +0000 (UTC) Received: from localhost (unknown [36.170.58.199]) (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; Thu, 31 Aug 2023 11:41:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6fb044f9; Thu, 31 Aug 2023 11:42:15 +0000 (UTC) From: iyzsong@envs.net Date: Thu, 31 Aug 2023 19:42:12 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) From: 宋文武 * gnu/packages/emulators.scm (dosbox-staging): Update to 0.80.1. [inputs]: Add libslirp an sdl2-image. Don't use sdl-union. [arguments]: Adjust configure-flags and 'fix-includes' phase. --- gnu/packages/emulators.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 67950c1603..1d50c9ef01 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -60,6 +60,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages containers) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) @@ -400,7 +401,7 @@ (define-public dosbox-staging ;; This is not a patch staging area for DOSBox, but an unaffiliated fork. (package (name "dosbox-staging") - (version "0.79.1") + (version "0.80.1") (source (origin (method git-fetch) @@ -409,16 +410,14 @@ (define-public dosbox-staging (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wdnkz3djjc514hn945fr9g9mnpnvk16fan84ny9g5wxak6dvsqp")))) + (base32 "1iqqrw95lpgjbmi777jdl5z1nizxgfy8xwpmy1fasjlb2yh2kp93")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list ;; These both try to git clone subprojects. "-Dunit_tests=disabled" ; gtest - "-Duse_mt32emu=false" - ;; Not packaged. - "-Duse_slirp=false") + "-Duse_mt32emu=false") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-includes @@ -426,7 +425,7 @@ (define-public dosbox-staging ;; This unnecessary file has an encoding error. (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h") (substitute* (find-files "." "\\.(cpp|h)") - (("^(#include <)(SDL[_.])" _ include file) + (("^(#[[:space:]]*include <)(SDL[_.])" _ include file) (string-append include "SDL2/" file)))))))) (native-inputs (list pkg-config)) @@ -435,9 +434,12 @@ (define-public dosbox-staging fluidsynth iir libpng + libslirp mesa opusfile - (sdl-union (list sdl2 sdl2-net)) + sdl2 + sdl2-image + sdl2-net speexdsp zlib)) (home-page "https://dosbox-staging.github.io") base-commit: 299d0463d54c97b237deb2fe9e464108544344c0 -- 2.41.0 From unknown Fri Aug 15 03:56:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: iyzsong@envs.net Subject: bug#65656: closed (Re: bug#65656: [PATCH] gnu: dosbox-staging: Update to 0.80.1.) Message-ID: References: <87msy0as7b.fsf@gmail.com> X-Gnu-PR-Message: they-closed 65656 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65656@debbugs.gnu.org Date: Wed, 06 Sep 2023 03:37:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1693971422-31652-1" This is a multi-part message in MIME format... ------------=_1693971422-31652-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65656: [PATCH] gnu: dosbox-staging: Update to 0.80.1. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65656@debbugs.gnu.org. --=20 65656: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65656 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1693971422-31652-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65656-done) by debbugs.gnu.org; 6 Sep 2023 03:36:34 +0000 Received: from localhost ([127.0.0.1]:60364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdjLG-0008Df-HC for submit@debbugs.gnu.org; Tue, 05 Sep 2023 23:36:34 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:47206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdjLE-0008DS-OA for 65656-done@debbugs.gnu.org; Tue, 05 Sep 2023 23:36:33 -0400 Received: by mail-qt1-x831.google.com with SMTP id d75a77b69052e-414b3a1a24aso21744161cf.2 for <65656-done@debbugs.gnu.org>; Tue, 05 Sep 2023 20:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693971386; x=1694576186; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=AxV7/vszz8Vza/5SxuHb4hiVO0lx+/ivBuUZzdZbza4=; b=USo+a5lUpkZn+tCFFGVzds6+sfraCYufLxkU0ABU3vnbofSNS5iO8xgiLGYrNyu+EV GdkZzXx3hpa4d4rDXiTM54zEcYj5zkUlJXBs/ouAuHf5EUasCOCdTB4+9MOFMf1D2FcL PYqD/SbT83rU6kPhfro9010eKuA08UylOiJwbRrBfi5f5rPRoVYX8CbCZT4MWykELGde Zy1WuMZ+PVf+7PK0ftDDS8fkWM1nI6Ee7UKLvMVuJwmFcgsXERLkR2LlKmPC88tE8mTY sk3qjXRaAeBYxZbxBH8cjZBH+1E61fdM+CeuFZyKrdjnpZsoLG8jXJXuUpgdnOk4bFZs UMxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693971386; x=1694576186; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=AxV7/vszz8Vza/5SxuHb4hiVO0lx+/ivBuUZzdZbza4=; b=W2a6nGexenlPdKUYGIR7I0CylKG7YrBFf9qFogyj1d0JIFb/IKNAaOH85YpLQ/zP7C lS4eFklJ3K63ycxv2i+hLMnW7RzT2Rtk8BAGtpOgWcp9KzKGqdiNqs82q12JVp/Lvnx3 yGpgV65j2+7T3dizXoBR+Q1FGWvq8q6pqyxLbmxYLUcog25RZbp/G/gD6uVkU8x5lnXQ YDqQhNxzhjVOLYvdJ1Icn+FrNldj/fZJN/HYnzfqpZ2NG0jakVCdFuKfpMHVlDmvLcTu FH7VUQtCtfUX7Fgo/6g80Bbyinrmlgaw+LlSMjvAWcruDBBVHbUo3OFAB2ftcIepTFDk m7xA== X-Gm-Message-State: AOJu0YzjF7M6QT/TFhRZVeJlsI5CabKiQIlQz48B4d+P2H55Zvo/F5fx MO8Io+B8fy+7XKj5ZKPDlwmIN2ekjIj27Q== X-Google-Smtp-Source: AGHT+IHoF3KcIvQF5e33ao+Xr4BhuCr6N47tG+r2tajbOn63AucVgLN/73WpYFL1cAWUVHsFP24EZw== X-Received: by 2002:a05:622a:138a:b0:412:191c:ffa with SMTP id o10-20020a05622a138a00b00412191c0ffamr18553863qtk.26.1693971386442; Tue, 05 Sep 2023 20:36:26 -0700 (PDT) Received: from hurd (dsl-153-125.b2b2c.ca. [66.158.153.125]) by smtp.gmail.com with ESMTPSA id c11-20020a0cca0b000000b0064730b8bc65sm5040625qvk.75.2023.09.05.20.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 20:36:25 -0700 (PDT) From: Maxim Cournoyer To: iyzsong@envs.net Subject: Re: bug#65656: [PATCH] gnu: dosbox-staging: Update to 0.80.1. References: Date: Tue, 05 Sep 2023 23:36:24 -0400 In-Reply-To: (iyzsong@envs.net's message of "Thu, 31 Aug 2023 19:42:12 +0800") Message-ID: <87msy0as7b.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65656-done Cc: =?utf-8?B?5a6L5paH5q2m?= , 65656-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > From: =E5=AE=8B=E6=96=87=E6=AD=A6 > > * gnu/packages/emulators.scm (dosbox-staging): Update to 0.80.1. > [inputs]: Add libslirp an sdl2-image. Don't use sdl-union. > [arguments]: Adjust configure-flags and 'fix-includes' phase. Installed! --=20 Thanks, Maxim ------------=_1693971422-31652-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 11:42:21 +0000 Received: from localhost ([127.0.0.1]:55092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbg44-00038Q-Jx for submit@debbugs.gnu.org; Thu, 31 Aug 2023 07:42:20 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbg42-00038A-80 for submit@debbugs.gnu.org; Thu, 31 Aug 2023 07:42:19 -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 1qbg3j-0007p9-DB for guix-patches@gnu.org; Thu, 31 Aug 2023 07:42:00 -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 1qbg3f-00019Q-QH for guix-patches@gnu.org; Thu, 31 Aug 2023 07:41:59 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 8408138A0132; Thu, 31 Aug 2023 11:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693482113; bh=uMpTtwEKyV3TMMVcLwNp/N3z2t2QTjFNhx5Kks+dwXM=; h=From:To:Cc:Subject:Date:From; b=ZUelEmuJRDspHhFGyzCZF6BUHv7j6C9kPWnrEtM2EtFgiy43flMHUvd1pj6+b7LXG nerQ4q4unp325VH8i01A4AuUPKB59mmuG7OfDSITt7EqWNILhZSGTHqWhmcRq6FGJP tvcr1bqPRetttb1DLTRuw54uvlk5D0rx0bU0h3TF6U3nnRT3iN6iMzvFKu4j7jCWpB 2Nus2eFI/OSJYxuTnKhWAm8CmGOEc9/1lOiQeNhWkpMwlll/HLUNN6/3134ECOsu8Z uilbvYlYev4YSqCVkx5p7fztVKv+tC1IFWuMY6fvE3539FVikyq9xzJ0kjqx7tqKY6 S1ak5sFnkZiO7v/ynQheLYKLMAQGP9RVxZED6zpZuWjSZcOWqs3kwXXkpX16hXk69o T24OlE7grl2NL25hWf6HfRFT0Q2QDXAqgFRV8f7iexjI4A2EKRSY9IZ8YUlvrT6WnL 4QW3QAS2jc5QFuWp0tnSTU3yhVdIWZ1Ml5qzlmrWwOUseKyL64yU7G7ZzvXZZe6Ulo lkXdp5EcRn/GQMX77WM2IS34MrscGkbmAhQOMhHQvvitNJnUd7pPn7f5w+OVfNlxen 5VHIKmy9aHwv5jGJvxfY6MBm8fLMZIB89pNbndOYih+XxXVsQZQZJuDWHkYA+I6rh7 JVkFth3wisukAz8zKVCveG+U= 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 lari_Zlsc8En; Thu, 31 Aug 2023 11:41:50 +0000 (UTC) Received: from localhost (unknown [36.170.58.199]) (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; Thu, 31 Aug 2023 11:41:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6fb044f9; Thu, 31 Aug 2023 11:42:15 +0000 (UTC) From: iyzsong@envs.net To: guix-patches@gnu.org Subject: [PATCH] gnu: dosbox-staging: Update to 0.80.1. Date: Thu, 31 Aug 2023 19:42:12 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) From: 宋文武 * gnu/packages/emulators.scm (dosbox-staging): Update to 0.80.1. [inputs]: Add libslirp an sdl2-image. Don't use sdl-union. [arguments]: Adjust configure-flags and 'fix-includes' phase. --- gnu/packages/emulators.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 67950c1603..1d50c9ef01 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -60,6 +60,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages containers) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) @@ -400,7 +401,7 @@ (define-public dosbox-staging ;; This is not a patch staging area for DOSBox, but an unaffiliated fork. (package (name "dosbox-staging") - (version "0.79.1") + (version "0.80.1") (source (origin (method git-fetch) @@ -409,16 +410,14 @@ (define-public dosbox-staging (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wdnkz3djjc514hn945fr9g9mnpnvk16fan84ny9g5wxak6dvsqp")))) + (base32 "1iqqrw95lpgjbmi777jdl5z1nizxgfy8xwpmy1fasjlb2yh2kp93")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list ;; These both try to git clone subprojects. "-Dunit_tests=disabled" ; gtest - "-Duse_mt32emu=false" - ;; Not packaged. - "-Duse_slirp=false") + "-Duse_mt32emu=false") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-includes @@ -426,7 +425,7 @@ (define-public dosbox-staging ;; This unnecessary file has an encoding error. (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h") (substitute* (find-files "." "\\.(cpp|h)") - (("^(#include <)(SDL[_.])" _ include file) + (("^(#[[:space:]]*include <)(SDL[_.])" _ include file) (string-append include "SDL2/" file)))))))) (native-inputs (list pkg-config)) @@ -435,9 +434,12 @@ (define-public dosbox-staging fluidsynth iir libpng + libslirp mesa opusfile - (sdl-union (list sdl2 sdl2-net)) + sdl2 + sdl2-image + sdl2-net speexdsp zlib)) (home-page "https://dosbox-staging.github.io") base-commit: 299d0463d54c97b237deb2fe9e464108544344c0 -- 2.41.0 ------------=_1693971422-31652-1--