From patchwork Mon Mar 3 20:30:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 39649 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 C891E27BBE9; Mon, 3 Mar 2025 20:31:51 +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,FREEMAIL_FROM,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 837B527BBE2 for ; Mon, 3 Mar 2025 20:31:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpCRj-0007LW-Ni; Mon, 03 Mar 2025 15:31:27 -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 1tpCRM-0007JN-3o for guix-patches@gnu.org; Mon, 03 Mar 2025 15:31: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 1tpCRL-0001K7-KN for guix-patches@gnu.org; Mon, 03 Mar 2025 15:31: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=F8U+q+LHmB6ohc4jPFsZQTTsIOtEq72n0zuAOZuHXmI=; b=GkKwUfpM4I0LlxkWIgJakO7JLmuRhiZAVTIanhz4LFvirzUjeEEl1jPR4MJOexA1oiOOVxjysJ73XbaVmzEU7f9UVKVK+FrymZt/WtlKkF1KHkZZobo4oYoavvZaSFbTWI9sybQONsU2eW/p/1/66Va3052eCtqpY425j9mYBtyLIwR+EfsT21y4YwfpJf9huHnLiisGSbPia6wbozZmOuU0SlPRYcn1dKd5Lv6IdSkQwoe0F506Vqab8wprSONQDYttsV8md8J57iiuCFG+Lxb9Q8myZi67/4jYXhM29Iy+CmFQax9cBGZQzT4rtkBkyqVgX4aXLkViuzFaNMjwKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tpCRK-00048H-9G; Mon, 03 Mar 2025 15:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76719] [PATCH 2/2] gnu: dosbox-staging: Update to 0.82.0. Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 03 Mar 2025 20:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76719@debbugs.gnu.org Cc: Andrew Wong , 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 76719-submit@debbugs.gnu.org id=B76719.174103384215840 (code B ref 76719); Mon, 03 Mar 2025 20:31:02 +0000 Received: (at 76719) by debbugs.gnu.org; 3 Mar 2025 20:30:42 +0000 Received: from localhost ([127.0.0.1]:52317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tpCR0-00047Q-Ar for submit@debbugs.gnu.org; Mon, 03 Mar 2025 15:30:42 -0500 Received: from qs51p00im-qukt01072102.me.com ([17.57.155.11]:5883) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tpCQy-00046y-9b for 76719@debbugs.gnu.org; Mon, 03 Mar 2025 15:30:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=F8U+q+LHmB6ohc4jPFsZQTTsIOtEq72n0zuAOZuHXmI=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=oaBDgpfT3Ky1XwXNPoeT3HDRt8HlSQDE0i04fMp+O5l/IaN9atF1vtb2oBkMu30z/ 6Re9FJ7z2OVdGYSuYcNCFJj1v37PPyd0ioCebS1BZSD+aOrVwh5PKIH82TDXWersTl 8Rwj0syZXN8F1rLNKIwauNb5PRPSPJfgMOrTF8LYQlPxfz1caq8l5aYAVxLx9ZhZFz /KHqc5SwbahBP8MJXSnq5LASBuEV/j8qT0fQ0nffNb06oDO5r1PZhiCgi19RfvTSDg Qmi2iSP0PJfci3GnDdy3nc2j7WrVcktZ8+TIzs+KRC3BziS72duhKC7Df9C/PgV/PH 1ginuaUrZc4dg== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01072102.me.com (Postfix) with ESMTPSA id 34A3E340884; Mon, 3 Mar 2025 20:30:32 +0000 (UTC) Date: Mon, 3 Mar 2025 15:30:23 -0500 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: lebrVwFO2PxSP8SzvqkTM47pvZHxRyWO X-Proofpoint-GUID: lebrVwFO2PxSP8SzvqkTM47pvZHxRyWO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=966 suspectscore=0 clxscore=1015 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2503030158 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 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: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches X-Patchwork-Original-From: Andrew Wong via Guix-patches via From: Andrew Wong 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/emulators.scm (dosbox-staging): Update to 0.82.0. [arguments]: Enable MT-32 emulation. [inputs]: Add mt32emu, googletest. Change-Id: Ia8ccdd533be6932e2e4fc3660cb472791194523a --- gnu/packages/emulators.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0eafc3df9e..15fdc163ec 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -571,7 +571,7 @@ (define-public dosbox-staging ;; This is not a patch staging area for DOSBox, but an unaffiliated fork. (package (name "dosbox-staging") - (version "0.81.0") + (version "0.82.0") (source (origin (method git-fetch) @@ -580,32 +580,23 @@ (define-public dosbox-staging (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fkshxaq12pd72v8m2f3a6d6jk9gh39hn0846gfkfinvw7yykzrl")))) + (base32 "1s4c6fiyjm91dnmkval9fvsqszc6yjq5b6pq895xi606dn29b85d")))) (build-system meson-build-system) (arguments - (list #:configure-flags - #~(list - ;; These both try to git clone subprojects. - "-Dunit_tests=disabled" ; gtest - "-Duse_mt32emu=false") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-includes - (lambda _ - ;; This unnecessary file has an encoding error. - (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h") - (substitute* (find-files "." "\\.(cpp|h)") - (("^(#[[:space:]]*include <)(SDL[_.])" _ include file) - (string-append include "SDL2/" file)))))))) + ;; The tests expect a traditional directory layout. + ;; TODO: find a way to "pick out" the bad test(s). + (list #:tests? #f)) (native-inputs (list pkg-config)) (inputs (list alsa-lib fluidsynth + googletest iir libpng libslirp mesa + mt32emu opusfile sdl2 sdl2-image