From patchwork Sat Dec 7 12:20:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 34621 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 345FD27BBEC; Sat, 7 Dec 2024 12:25:29 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 525AC27BBE2 for ; Sat, 7 Dec 2024 12:25:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tJts2-0003Md-8G; Sat, 07 Dec 2024 07:25:14 -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 1tJtrw-0003F5-HC for guix-patches@gnu.org; Sat, 07 Dec 2024 07:25:08 -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 1tJtrw-0001Z4-7G for guix-patches@gnu.org; Sat, 07 Dec 2024 07:25:08 -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=vMYEx63UWrETkS+5kSGVlFugMowWoPmJtJNUmIA4McE=; b=vzqq063lFea9gPUJMMsUWWGET/F/xcUeROyJPgsvW7VHi/esdP5dYGakLPlfIt+Zt9TSqSlynJOvu+RSWdm86Qv4TsxvohGUIqFKt0rVHJQDnCl4LLdVthgiBcAwP9WSb7j8JqflAIfBufVq4dw+nOB/hqSCwMx51hUZf25ThuSv+si5Za5ZGaVyUq58cgImQCyjc6qzxniBWhUipefHdWXwNXxxDljL9yriW18SUpL+0vUKPaFIIqzmT/2OzVBLdR6Ss9kGu83y0SrcR8VTWgMJyDjykZb8siC/VWNTH3usi+IcjGG3m1OZ4ulEsyBvrF3WWe3xCSZAKMylP/4mOQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tJtrw-0001oc-0x for guix-patches@gnu.org; Sat, 07 Dec 2024 07:25:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74723] [PATCH 08/19] gnu: lmms: Enable Stk Mallets and GIG Player. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Dec 2024 12:25:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74723@debbugs.gnu.org Cc: Sughosha Received: via spool by 74723-submit@debbugs.gnu.org id=B74723.17335742946782 (code B ref 74723); Sat, 07 Dec 2024 12:25:07 +0000 Received: (at 74723) by debbugs.gnu.org; 7 Dec 2024 12:24:54 +0000 Received: from localhost ([127.0.0.1]:45729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tJtrh-0001lE-Ks for submit@debbugs.gnu.org; Sat, 07 Dec 2024 07:24:54 -0500 Received: from layka.disroot.org ([178.21.23.139]:52584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tJtrd-0001kS-LA for 74723@debbugs.gnu.org; Sat, 07 Dec 2024 07:24:50 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2EF01252C2; Sat, 7 Dec 2024 13:24:49 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3dHonzzZnA6Y; Sat, 7 Dec 2024 13:24:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1733574284; bh=mzUr7hkGKEMefPbmpKt/uevjyIWcgElXHXaMXosPTwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UKbQBmYYZ8OzK3OgYOp/Huvwz1SWCA2hRuRvNzailKorasMY/cimk3lreh6ISFl3L Wpq2dLEA7CjGDBcXE6a3c+M5Zpr55RE5Z6xwQMc1CZHsT18jV+BMfKj/lX/45m+pOu z0VluDGOlusqhRSp2uQAWUBk2wW/8kRN2ZcJWbMZlLFGtPyDhNeK/NCagWPkbO432Z 6cmPBu1vpzN8JXO/GKqoCBJV2MPYetwgmGdbaJPeWsRE56Lb5LYUEUT6ad0NFv6VlG LBWvFLpJ1g6PonOCu9Or9TgKZ2qo697CuNq30+9/2OzZ5NdfslG53vwhdn2SLNzveA BMiuMM6Oc9lSQ== Date: Sat, 7 Dec 2024 17:50:22 +0530 Message-ID: <08af2d8dc9b6a922aee7d1e1f1df6c82abeb2e74.1733563475.git.sughosha@disroot.org> In-Reply-To: References: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/music.scm (lmms)[inputs]: Add libgig and stk. [arguments]<#:phases>: Add patch-stk-path. Change-Id: I8116d603399f75571dfc37bc43760334df3a764e --- gnu/packages/music.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index de6ef7e7f6..844347af62 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5313,6 +5313,12 @@ (define-public lmms (lambda* (#:key inputs #:allow-other-keys) (copy-recursively (assoc-ref inputs "rpmalloc") "src/3rdparty/rpmalloc/rpmalloc"))) + (add-after 'unpack 'patch-stk-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake/modules/FindSTK.cmake" + (("/usr") (assoc-ref inputs "stk"))) + (substitute* "src/core/ConfigManager.cpp" + (("/usr") (assoc-ref inputs "stk"))))) (add-before 'configure 'set-ldflags (lambda _ (setenv "LDFLAGS" @@ -5346,6 +5352,7 @@ (define-public lmms jack-2 ladspa lame + libgig libogg libsamplerate libsndfile @@ -5356,7 +5363,8 @@ (define-public lmms pulseaudio qtbase-5 qtx11extras - sdl)) + sdl + stk)) (home-page "https://lmms.io/") (synopsis "Music composition tool") (description "LMMS is a digital audio workstation. It includes tools for