From patchwork Thu Aug 31 11:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53341 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 AB1DF27BBEA; Thu, 31 Aug 2023 12:43:11 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A1F7927BBE9 for ; Thu, 31 Aug 2023 12:43:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbg4f-0008P6-KI; Thu, 31 Aug 2023 07:42:57 -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 1qbg4d-0008Lc-0L for guix-patches@gnu.org; Thu, 31 Aug 2023 07:42:55 -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 1qbg4c-0001QR-BF for guix-patches@gnu.org; Thu, 31 Aug 2023 07:42:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbg4k-00039L-5S for guix-patches@gnu.org; Thu, 31 Aug 2023 07:43:02 -0400 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?b?5a6L5paH5q2m?= 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) Date: Thu, 31 Aug 2023 19:42:12 +0800 Message-ID: X-Mailer: git-send-email 2.41.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, 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: "ashish.is--- 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/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(-) base-commit: 299d0463d54c97b237deb2fe9e464108544344c0 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")