From patchwork Tue Mar 4 18:47:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 39675 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 9B94327BBEA; Tue, 4 Mar 2025 18:50:22 +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=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 4F42227BBE2 for ; Tue, 4 Mar 2025 18:50:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpXKr-0005Wl-S5; Tue, 04 Mar 2025 13:49:46 -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 1tpXKE-0005KX-Om for guix-patches@gnu.org; Tue, 04 Mar 2025 13:49:13 -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 1tpXKE-0007Vd-Dk for guix-patches@gnu.org; Tue, 04 Mar 2025 13:49:06 -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=hpaf/eT5FDOeXRdomxV8iQlyEuwY23Y3iiNrPyD6PZg=; b=KXPP97R0WO5lErmir9jHM0oSRP1nrvurDdJ9OW1TmCeDrsC9nXYr/tc7vt3n/T60kt4zTyWIdILnV0HY7GhnzMveeoEU6g/KpgeOq3JSwkbK5qjDSsoLEl1PRmSZa+DKzt/d9TeXpZ28nMLBW68H1D5KBJ6JvAvKmjFSPWAXfUHXbDlWE0vpBreYcfTvldAaCmOF1OK8KA4P9qsqQlPBFOee5XmeHYpu9UU0HqYaTE9G+i8kHE9BAt5odvguKLnGL73aaFW3Z0v0FEwRJ6cxCDJyXmYejxxyeykhJDG8vKYoq9vK7xAPaFDiV7tmQIkmt16bkTSVqitaITHLtyxtUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tpXKC-0006ne-33; Tue, 04 Mar 2025 13:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76719] [PATCH v2 1/2] gnu: Add mt32emu. References: In-Reply-To: Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Tue, 04 Mar 2025 18:49:04 +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 , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 76719-submit@debbugs.gnu.org id=B76719.174111409125975 (code B ref 76719); Tue, 04 Mar 2025 18:49:04 +0000 Received: (at 76719) by debbugs.gnu.org; 4 Mar 2025 18:48:11 +0000 Received: from localhost ([127.0.0.1]:60899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tpXJL-0006kt-2I for submit@debbugs.gnu.org; Tue, 04 Mar 2025 13:48:11 -0500 Received: from p-west1-cluster5-host7-snip4-10.eps.apple.com ([57.103.66.241]:58440 helo=p00-icloudmta-asmtp-us-west-1a-20-percent-2.p00-icloudmta-asmtp-vip.icloud-mail-production.svc.kube.us-west-1a.k8s.cloud.apple.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tpXJE-0006jy-NC for 76719@debbugs.gnu.org; Tue, 04 Mar 2025 13:48:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=hpaf/eT5FDOeXRdomxV8iQlyEuwY23Y3iiNrPyD6PZg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=RZtFXV0dUi/zacStPrYN8Pcg1Qhci0W7IXwdBYcCHDovZLeyI+1I4wuWiEbXh02B8 XCSYKE4hnkvLHDIEhuHZ7Unqkx5wLNak446mmUbWGOrwdjPfOIFSPJ3mXbD1aBaVJy Ns6FKixJCCsq6Rb/NGJC9mJZuMV3bA3rAojlCraR0nBur2xictrNc6OBiUB+xRZkz/ w2YzNpcAuat34ewfrKPLgO2LNMjv5vgCwFsHU3v+WTlLZtTHQBmi2mmzB/Y/QyJakO CYzGzp/wB6Us0Q3zZl06aMai0FNK6Qv3gIBs8Fua5/rvQysLSf2fzIZT5pcTczXCpa cIeb+sPfK6efA== Received: from wongworks.lan (pv-asmtp-me-k8s.p00.prod.me.com [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-20-percent-2.p00-icloudmta-asmtp-vip.icloud-mail-production.svc.kube.us-west-1a.k8s.cloud.apple.com (Postfix) with ESMTPSA id 0437A180055B; Tue, 4 Mar 2025 18:47:53 +0000 (UTC) Date: Tue, 4 Mar 2025 13:47:42 -0500 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Proofpoint-GUID: 3YhgpgBaNk52DjnHnZHW542uzpwjjvxs X-Proofpoint-ORIG-GUID: 3YhgpgBaNk52DjnHnZHW542uzpwjjvxs 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-04_08,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 bulkscore=0 spamscore=0 malwarescore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2503040151 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/audio.scm (mt32emu): New variable. Change-Id: I458e4722ac012935814643a2925e185c46ecaba3 --- gnu/packages/audio.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) base-commit: 5f4c785fc3caa0fd960ebcf9c1ea6ab396b96f25 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9f50f7f940..d592f33c5e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2024 Artyom V. Poptsov ;;; Copyright © 2025 Junker ;;; Copyright © 2025 Sughosha +;;; Copyright © 2025 Andrew Wong ;;; ;;; This file is part of GNU Guix. ;;; @@ -2030,6 +2031,34 @@ (define-public midicomp (home-page "https://github.com/markc/midicomp") (license license:agpl3)))) +(define-public mt32emu + (package + (name "mt32emu") + (version "2.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/munt/munt") + (commit + (string-append "libmt32emu_" + (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06d3jzx69nwy9jj6jv9q6rhq5399mp51w6d5mijg3fmwr4al13fd")))) + (build-system cmake-build-system) + (arguments (list + #:tests? #f ;no tests. + #:configure-flags #~(list "-Dmunt_WITH_MT32EMU_SMF2WAV=FALSE" + "-Dmunt_WITH_MT32EMU_QT=FALSE"))) + (home-page "https://sourceforge.net/projects/munt/") + (synopsis "Pre-GM Roland MIDI device emulator") + (description + "libmt32emu is a C/C++ library which approximately emulates +the Roland MT-32, CM-32L and LAPC-I synthesizer modules. It is part of the +Munt project.") + (license license:gpl2+))) + (define-public clalsadrv (package (name "clalsadrv") From patchwork Tue Mar 4 18:47:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 39674 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 5649B27BBEA; Tue, 4 Mar 2025 18:50:12 +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=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 5C90127BBE9 for ; Tue, 4 Mar 2025 18:50:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpXKt-0005ZY-UC; Tue, 04 Mar 2025 13:49:48 -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 1tpXKE-0005KW-Jp for guix-patches@gnu.org; Tue, 04 Mar 2025 13:49:13 -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 1tpXKE-0007Vz-9h for guix-patches@gnu.org; Tue, 04 Mar 2025 13:49:06 -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=qM+YCJgB6oSYE5YEbVD++HspIpfRyxWtITM3axx+gZfdilJt5VGL+flx8qdQJ4eLegpnq8hmgB4szDpilNSDFu64lJbYKWLPehF0HYbtXtfdhYLjsaURlTizaDrcDDDVHV4g/aqZqs8Beh1Pk+BHb6b+Zp+o1Fe8dJLDCvdVU3brt5Gix5txjHDjwuAW6EB6aZFkoLhgLU+KRVhJXfIP/LxdnOlNYK1KNU+Qt0JNCrgU++frqstM6MWe4yv/1RZH6qZGY+S+Rk77dJR1V+WxEZFVpPCi3rp8DL9YBn0MEiit/Y7kQuC0WA1G8Ms+lxvz8WgycYLMv3gz7L1+WAMwSQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tpXKC-0006nl-KU; Tue, 04 Mar 2025 13:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76719] [PATCH v2 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: Tue, 04 Mar 2025 18:49:04 +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.174111409726001 (code B ref 76719); Tue, 04 Mar 2025 18:49:04 +0000 Received: (at 76719) by debbugs.gnu.org; 4 Mar 2025 18:48:17 +0000 Received: from localhost ([127.0.0.1]:60904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tpXJQ-0006lE-V4 for submit@debbugs.gnu.org; Tue, 04 Mar 2025 13:48:17 -0500 Received: from p-west1-cluster5-host2-snip4-3.eps.apple.com ([57.103.66.184]:8034 helo=p00-icloudmta-asmtp-us-west-1a-20-percent-2.p00-icloudmta-asmtp-vip.icloud-mail-production.svc.kube.us-west-1a.k8s.cloud.apple.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tpXJM-0006kW-Bu for 76719@debbugs.gnu.org; Tue, 04 Mar 2025 13:48:13 -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=1HxOts77II4hy9g5gfCip61Y0RVMQawQjC980t1pmQ/2Zkct37sRzYwh+ifQ9sszO pF5V2hTWlhqyVLMPmhwRrcNT9rtWOl6srUk2zn9LYRmn7eTrcCGKcJ/e+osufmRXLd 7U3W97VkpPdT1e5ddVI6rxF+Fmpyb6SZoXsB7JvR36M6kgdb0vUaSKPsjD2G70MuKO jAG0NEC8tM/7BfMZGc+pLM41r8zA2mJtfbwi20iWzvjBtAf+6NGBJtauiC2Rj8oUDO rfuZcFf37SYSujuvvSMH6zFDCE2R2T5xt84bXBvoiDZA47i+yihqNgCd46rO23xBvk Lm2wsuDSs+q7g== Received: from wongworks.lan (pv-asmtp-me-k8s.p00.prod.me.com [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-20-percent-2.p00-icloudmta-asmtp-vip.icloud-mail-production.svc.kube.us-west-1a.k8s.cloud.apple.com (Postfix) with ESMTPSA id 54C6A18000B1; Tue, 4 Mar 2025 18:48:01 +0000 (UTC) Date: Tue, 4 Mar 2025 13:47:43 -0500 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: jYK6JNHOB_PBDWW7xgZmy69z1wAx761f X-Proofpoint-ORIG-GUID: jYK6JNHOB_PBDWW7xgZmy69z1wAx761f 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-04_08,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 bulkscore=0 spamscore=0 malwarescore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2503040151 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