From patchwork Sat Nov 6 13:06:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 34284 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 7851E27BBE1; Sat, 6 Nov 2021 15:08:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 055E127BBE3 for ; Sat, 6 Nov 2021 15:08:12 +0000 (GMT) Received: from localhost ([::1]:47090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjNIh-0003zw-6i for patchwork@mira.cbaines.net; Sat, 06 Nov 2021 11:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjNIZ-0003zQ-FS for guix-patches@gnu.org; Sat, 06 Nov 2021 11:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjNIZ-0000oD-6m for guix-patches@gnu.org; Sat, 06 Nov 2021 11:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mjNIY-0007Nw-Va for guix-patches@gnu.org; Sat, 06 Nov 2021 11:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51635] [PATCH 2/2] gnu: openttd: Let the music play. References: In-Reply-To: Resent-From: Liliana Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Nov 2021 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51635@debbugs.gnu.org Received: via spool by 51635-submit@debbugs.gnu.org id=B51635.163621123828316 (code B ref 51635); Sat, 06 Nov 2021 15:08:02 +0000 Received: (at 51635) by debbugs.gnu.org; 6 Nov 2021 15:07:18 +0000 Received: from localhost ([127.0.0.1]:50155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjNHq-0007MZ-6Q for submit@debbugs.gnu.org; Sat, 06 Nov 2021 11:07:18 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjNHo-0007MC-BI for 51635@debbugs.gnu.org; Sat, 06 Nov 2021 11:07:16 -0400 Received: by mail-wr1-f66.google.com with SMTP id b12so18466706wrh.4 for <51635@debbugs.gnu.org>; Sat, 06 Nov 2021 08:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=4Ipx8i//lRTkQdFYIjf4BvNUefzB1OF3FUN8gt2gkOw=; b=q5DBk14DJ25o8/HJ09M7J5rhHwONY2/R5Tc+ezNW3rR9IwpaKP0uoJykWREapGs7lg nI2mPmbQnYorKBbCmNxlPbR7wD4S32/Kz+D+rvRTAQNNtL+hsD5PaqdHO4uXkTmEopfC Y9XNIP1V7r6HN3G7udsAQt3GkeqTnndeS8HKX/F4vztN+k6yUdo0+NMdBvjDxFTzEpIe /2aBxvDuvi+4qkcsePBksRIBZyWkJgs3oEHcWjKUrdVTB1ynAkfeknAFM/h/AesfsBDZ RAYG3Vm4EWCW/mUhkPYfgrb7VGH4AJcRXtg1J52NVWmanPXg2B8J156vJTv2Q+VUuiLA vjnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=4Ipx8i//lRTkQdFYIjf4BvNUefzB1OF3FUN8gt2gkOw=; b=RwCTBAeqyfKCazyMOWsvFljym0KCgVApt8v/ndNO1f/Cm8s2Jy5ZFpJX1BN6iK+c9z C6QsjPyYWsPwxNuwxvzNgPhWuTmBWeVlu/Sspp9B2jWCuofuivg7+W397Yc1WkqvwDU3 /bOdeSKsXBJfg36qoJBcdLhPpdlVj4RhdiUwYBsoJOxHLe549Lrd/sKJOMn1MGXYMbnb g30M8OPHT5rUAaMd+AaluAVDbp5f6lX5Ip1PJzFy7ugBeRCIoDiyzA9U5WhlEYySa9iA o9EPVmxbw3g4X5H5+QcDavtHat5QvIhApY1FQj4Yua9Ze1w9WwUd+Gtd7F0AzvwLyOBE nukg== X-Gm-Message-State: AOAM53010c3SEq7RmQT2wXy/t8DOY40JM7cITxU+VRy5yPg3EY4SF7uO EQzGSp3qtrBh6pZIO6YGYuY8nHZBF3U2qA== X-Google-Smtp-Source: ABdhPJztOM0iU+qFslr1fMpFYvshD4eeVOpFZtpDOkLuR3wtCG0dw015yfFzBHxzkeWPW7cLUnbMuA== X-Received: by 2002:adf:e8c8:: with SMTP id k8mr76461679wrn.135.1636211230674; Sat, 06 Nov 2021 08:07:10 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z18sm10506893wrq.11.2021.11.06.08.07.10 for <51635@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Nov 2021 08:07:10 -0700 (PDT) From: Liliana Prikler Date: Sat, 6 Nov 2021 14:06:58 +0100 Message-ID: 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (openttd)[inputs]: Remove timidity++. Add fluidsynth and freepats-gm. [#:phases]: New phase. --- gnu/packages/games.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 14131fa065..47ed3fc1b4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4481,6 +4481,15 @@ (define-public openttd (list (string-append "-DCMAKE_INSTALL_BINDIR=" out "/bin"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/music/fluidsynth.cpp" + (("default_sf\\[\\] = \\{" all) + (string-append all " +\t/* Guix hardcoded :P */ +\t\"" (string-append (assoc-ref inputs "freepats-gm") + "/share/soundfonts/FreePatsGM.sf2") "\", +"))))) (add-before 'check 'install-data (lambda* (#:key inputs outputs #:allow-other-keys) (for-each @@ -4489,7 +4498,8 @@ (define-public openttd (assoc-ref outputs "out"))) (list "opengfx" "openmsx" "opensfx"))))))) (inputs - `(("timidity++" ,timidity++) + `(("fluidsynth" ,fluidsynth) + ("freepats-gm" ,freepats-gm) ,@(package-inputs openttd-engine))) (native-inputs `(("opengfx" ,openttd-opengfx)