From patchwork Sun Oct 16 19:36:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43451 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 47A7F27BBEA; Sun, 16 Oct 2022 20:37:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BE7C227BBE9 for ; Sun, 16 Oct 2022 20:37:37 +0100 (BST) Received: from localhost ([::1]:58902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ok9S4-0005Wc-SP for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 15:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ok9RW-0005R2-TB for guix-patches@gnu.org; Sun, 16 Oct 2022 15:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ok9RW-0003cO-Kz for guix-patches@gnu.org; Sun, 16 Oct 2022 15:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ok9RW-00047t-GZ for guix-patches@gnu.org; Sun, 16 Oct 2022 15:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58572] Add missing patches References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 19:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "58572@debbugs.gnu.org" <58572@debbugs.gnu.org> Received: via spool by 58572-submit@debbugs.gnu.org id=B58572.166594898215805 (code B ref 58572); Sun, 16 Oct 2022 19:37:02 +0000 Received: (at 58572) by debbugs.gnu.org; 16 Oct 2022 19:36:22 +0000 Received: from localhost ([127.0.0.1]:46312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ok9Qr-00046r-Ig for submit@debbugs.gnu.org; Sun, 16 Oct 2022 15:36:21 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:64001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ok9Qn-00046W-L4 for 58572@debbugs.gnu.org; Sun, 16 Oct 2022 15:36:19 -0400 Date: Sun, 16 Oct 2022 19:36:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1665948970; x=1666208170; bh=OCnih1PfTD/h6xJ/p49OKE0Jfbr+MtQ+p8x3Pn/qitM=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=PK4Befx0MRLhpV4r12CaYMl7sWizCv0z+E92Dojj+X3uEHukvgn2k5QsTxDYuqYm6 gyyhg1rYXBsigKZuFK2GkHfOE26vNHH9N2bQN1uYa5/oSkqts+nc/ofZ0u04dPv5qK 5xpX6ZuQ5f5Z4ubLQtGY1kMTVW/Opu4cvf47yBAsf4iivvgJJ6BJs3ciNBGU8ctx8K ezSQDeJZCm9DJbkovNgCuus0HxPOzOhG5J/yxO+gAXRKNnBjNcErfvteLVr692lAv6 vyiGCBhqC2AxSbQYWeYMKcK0TwCjTISx/mfQgDznAE5CBhDbKuFgDODb09KdWRDfKi p4gg6XcI5cHwg== Message-ID: Feedback-ID: 45211691:user:proton 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" Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha X-getmail-retrieved-from-mailbox: Patches I forgot to add the patchfiles to git before submiting above patches. From dec3082116fc60389d4095bbfd3cd66332e9ae7c Mon Sep 17 00:00:00 2001 From: Sughosha Date: Sun, 16 Oct 2022 21:32:02 +0200 Subject: [PATCH] gnu: Add patches required for bespokesynth and tuning-library --- ...okesynth-1.1.0-devendor_ableton_link.patch | 29 +++++++++++++++++++ ...ng-library-1.1.0-fix_missing_include.patch | 8 +++++ 2 files changed, 37 insertions(+) create mode 100644 gnu/packages/patches/bespokesynth-1.1.0-devendor_ableton_link.patch create mode 100644 gnu/packages/patches/tuning-library-1.1.0-fix_missing_include.patch diff --git a/gnu/packages/patches/bespokesynth-1.1.0-devendor_ableton_link.patch b/gnu/packages/patches/bespokesynth-1.1.0-devendor_ableton_link.patch new file mode 100644 index 0000000000..1f160fd349 --- /dev/null +++ b/gnu/packages/patches/bespokesynth-1.1.0-devendor_ableton_link.patch @@ -0,0 +1,29 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index 50038d06..7241a0de 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -15,6 +15,7 @@ option(BESPOKE_DEVENDORED_SYSTEM_JUCE "Use system libraries when using system in + option(BESPOKE_SYSTEM_PYBIND11 "Use a system installation of pybind11" OFF) + option(BESPOKE_SYSTEM_JSONCPP "Use system-wide installation of jsoncpp" OFF) + option(BESPOKE_SYSTEM_TUNING_LIBRARY "Use system installation of tuning-library" OFF) ++option(BESPOKE_SYSTEM_ABLETONLINK "Use system installation of ableton-link" OFF) + option(BESPOKE_USE_ASAN "Build with ASAN" OFF) + + # Global CMake options +diff --git i/Source/CMakeLists.txt w/Source/CMakeLists.txt +index 7714ae7f..67256f1d 100644 +--- i/Source/CMakeLists.txt ++++ w/Source/CMakeLists.txt +@@ -1,6 +1,11 @@ + include(cmake/lib.cmake) + include(cmake/versiontools.cmake) +-include(../libs/link/AbletonLinkConfig.cmake) ++if(BESPOKE_SYSTEM_ABLETONLINK) ++ message(STATUS "Using system provided Ableton Link") ++ find_package(AbletonLink NAMES AbletonLink ableton-link link REQUIRED) ++else() ++ include(../libs/link/AbletonLinkConfig.cmake) ++endif() + + juce_add_gui_app(BespokeSynth + PRODUCT_NAME BespokeSynth diff --git a/gnu/packages/patches/tuning-library-1.1.0-fix_missing_include.patch b/gnu/packages/patches/tuning-library-1.1.0-fix_missing_include.patch new file mode 100644 index 0000000000..e53f32f483 --- /dev/null +++ b/gnu/packages/patches/tuning-library-1.1.0-fix_missing_include.patch @@ -0,0 +1,8 @@ +diff -ruN a/commands/parsecheck.cpp b/commands/parsecheck.cpp +--- a/commands/parsecheck.cpp 2021-07-01 20:32:19.000000000 +0200 ++++ b/commands/parsecheck.cpp 2021-10-10 00:44:54.766530190 +0200 +@@ -1,3 +1,4 @@ ++#include + #include + #include "Tunings.h" + #include "TuningsImpl.h" -- 2.38.0