From patchwork Wed Nov 13 15:46:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 70366 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 60E1F27BBEA; Wed, 13 Nov 2024 15:52:24 +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,T_PDS_PRO_TLD,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 9596527BBE2 for ; Wed, 13 Nov 2024 15:52:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBFf4-0002uO-Lk; Wed, 13 Nov 2024 10:52:06 -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 1tBFf2-0002t0-DT for guix-patches@gnu.org; Wed, 13 Nov 2024 10:52:04 -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 1tBFf2-0001mL-4y for guix-patches@gnu.org; Wed, 13 Nov 2024 10:52:04 -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=7YpjwozvN+r5gJ89qSfqvLfOXDuGGbxnxTdx4YczeS0=; b=J7W5NwnW9DGM65P/6oIXCny3vM6H0quXObcBnPZ/6id9cUBvPExbJmxaPeHDkW9YcysXr+wGhkkhJBsfhIEBFkWbJoxLdF3mpUrpB9vYsqIY5d14MDV0D3ghn8bBLY7qO0TP8NgFJILXkbX2u8DazjDsM/q9MJFeqEmLxRUFOiPFgSNZ293HNgwy5JrJyCRZDS7hSHo7+rUrku5pCU1HC9QVO1/IQrwGOuLFhUW8HELrlRcir9ZDimPu12GMgZdNedq2spypWSR5e51Ks1BZUqo8EcOv7wdOpOSc1HANwReKuv9T7WUfMaHGF4brOm5Vr3UDfwkS6IQq9afF2sXFPA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBFf0-0005lB-VU; Wed, 13 Nov 2024 10:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74344] [PATCH 7/7] gnu: Add jamesdsp. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 15:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74344@debbugs.gnu.org Cc: Sughosha , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 74344-submit@debbugs.gnu.org id=B74344.173151308822072 (code B ref 74344); Wed, 13 Nov 2024 15:52:02 +0000 Received: (at 74344) by debbugs.gnu.org; 13 Nov 2024 15:51:28 +0000 Received: from localhost ([127.0.0.1]:43212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBFeR-0005jv-Pm for submit@debbugs.gnu.org; Wed, 13 Nov 2024 10:51:28 -0500 Received: from layka.disroot.org ([178.21.23.139]:46542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBFeP-0005jk-38 for 74344@debbugs.gnu.org; Wed, 13 Nov 2024 10:51:26 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A83BF252E3; Wed, 13 Nov 2024 16:51:24 +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 wPUl12SbgewQ; Wed, 13 Nov 2024 16:51:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1731513083; bh=TzNIMJ7/GSXRzBr5JqRy6xpGEUMBYgYAH15Gv1UJTVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PZ1HY/0NZlj4drzYIAff27HYxspWbGtdYpwRXlcMtnzKrUg6NYNd/+l127Ms1ytY5 1Y9zZN7y38rtWRROsC2RylBarlOEOycfnSU7e6F+sLq5vW6WAvKNHRFqm1O9LqsQW0 w0WfrSymh1GSiVZAmGEE77q4agIDoSwTVfMrN6ougm5HFrAmhOz0Wf86j0kLmZALjC DIsIHEy82BgXR4bz9/K0HZYml83ig6y2y03vAYLeGUaby0zBq8sfU9tmrxFnXEsbpX gqljyLTEnwz4NxHh3FBmhT1W7zGEkzceBHY1uFBXeg1Zrx5cW7EaycugNobmb1s6IW FNRqkdt2zSVBw== Date: Wed, 13 Nov 2024 21:16:23 +0530 Message-ID: <8682c543b89052ca0f0f76b5159e1da9f43f1ede.1731512783.git.sughosha@disroot.org> In-Reply-To: <009f0224022cd4677679737eb01a26142e658152.1731512782.git.sughosha@disroot.org> References: <009f0224022cd4677679737eb01a26142e658152.1731512782.git.sughosha@disroot.org> 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/audio.scm (jamesdsp): New variable. Change-Id: I4ddc9709c5500e7d06a519481ddd26ba9f39905e --- gnu/packages/audio.scm | 133 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 467dc4a74f..541068b1ab 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2024 hapster ;;; Copyright © 2024 mio ;;; Copyright © 2024 Nikita Domnitskii +;;; Copyright © 2024 Sughosha ;;; ;;; This file is part of GNU Guix. ;;; @@ -158,6 +159,7 @@ (define-module (gnu packages audio) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix build-system waf) #:use-module (guix download) @@ -755,6 +757,137 @@ (define-public qm-dsp purposes developed at Queen Mary, University of London.") (license license:gpl2+))) +(define-public jamesdsp + (package + (name "jamesdsp") + (version "2.7.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Audio4Linux/JDSP4Linux") + (commit version) + ;; Recurse GraqhicEQWidget, FlatTabWidget, LiquidEqualizerWidget and + ;; EELEditor. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17vx12kbvwxvb69vzrlb82mrgf6sl3plyk71g9f39p49ialdsnbr")) + (modules '((guix build utils))) + (snippet + ;; Unbundle 3rd party libraries. + ;; NOTE: QCodeEditor from system fails to build EELEditor. WAF from + ;; system fails to build FlatTabWidget. 3rd party library found in + ;; LiquidEqualizerWidget is unknown. Hence these libraries found in + ;; their respective directories are untouched. + '(begin + ;; Delete the bundled 3rd party libraries. + (for-each delete-file-recursively + (list "3rdparty" + "src/subprojects/EELEditor/3rdparty/docking-system" + "src/subprojects/EELEditor/src/EELEditor-Linker.pri")) + (with-directory-excursion "src" + (substitute* "src.pro" + ;; Do not use bundled 3rd party libraries. + ((".*3rdparty.*") "") + ;; Link required libraries from system. + (("-ldl") + (string-join '("-ldl" + "-lasync++" + "-lqcustomplot" + "-lqtadvanceddocking" + "-lqtcsv" + "-lwaf") + " "))) + ;; Fix including WAF headers. + (substitute* "MainWindow.cpp" + (("") ">")) + (with-directory-excursion "subprojects/EELEditor/src" + ;; Do not use bundled docking-system. + (substitute* "EELEditor.pri" + ((".*docking-system.*") "")) + ;; Do not link to bundled docking-system. + (substitute* "src.pro" + ((".*EELEditor-Linker.*") "")) + ;; Fix including headers from the system. + (substitute* '("eeleditor.cpp" + "eeleditor.h") + (("