From patchwork Tue May 5 20:27:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 21910 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 E18E627BBE3; Tue, 5 May 2020 21:28:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 441D327BBE1 for ; Tue, 5 May 2020 21:28:54 +0100 (BST) Received: from localhost ([::1]:36056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW4BR-0002HJ-M0 for patchwork@mira.cbaines.net; Tue, 05 May 2020 16:28:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW4Ac-0001Zh-QD for guix-patches@gnu.org; Tue, 05 May 2020 16:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW4Ac-0003Gl-HR for guix-patches@gnu.org; Tue, 05 May 2020 16:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jW4Ac-0008Px-Eo for guix-patches@gnu.org; Tue, 05 May 2020 16:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41053] [PATCH 1/2] gnu: Add ableton-link. References: <7ab14d0b64acca502e134f57bd1c4ac9@autistici.org> In-Reply-To: <7ab14d0b64acca502e134f57bd1c4ac9@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 May 2020 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41053 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41053@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 41053-submit@debbugs.gnu.org id=B41053.158871045832319 (code B ref 41053); Tue, 05 May 2020 20:28:02 +0000 Received: (at 41053) by debbugs.gnu.org; 5 May 2020 20:27:38 +0000 Received: from localhost ([127.0.0.1]:37678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4AE-0008PC-0A for submit@debbugs.gnu.org; Tue, 05 May 2020 16:27:38 -0400 Received: from devianza.investici.org ([198.167.222.108]:22311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4A9-0008Om-1w for 41053@debbugs.gnu.org; Tue, 05 May 2020 16:27:36 -0400 Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id F411DE06A9; Tue, 5 May 2020 20:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1588710449; bh=dofcACLBSPX78En+7LFT2GiD2Nddojya6Nbs64H0b+g=; h=From:To:Cc:Subject:Date:From; b=DVjsVvGdWrrtAch3purh5+69vTAVOqbU33Bm6zy9YL8bBQnRQrcsntAq2P4fjr0B4 CNE4WgU2SDS2pPruatEnbuLnHS8WLgjHzRbrcBsf+R1qMaZnN85U1A1rooOm5xOeeZ EcYCF4+PUsTSXwjXpshm7QHszBLZS5k2ZzMolu+A= Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id D3901E069A; Tue, 5 May 2020 20:27:29 +0000 (UTC) From: Giacomo Leidi Date: Tue, 5 May 2020 22:27:15 +0200 Message-Id: <20200505202716.1481-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.2 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/audio.scm (ableton-link): New variable. * gnu/packages/patches/ableton-link-system-libraries-debian.patch: Patch CMakeLists.txt to use system libraries. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 102 ++++++++++++++++++ ...ableton-link-system-libraries-debian.patch | 29 +++++ 3 files changed, 132 insertions(+) create mode 100644 gnu/packages/patches/ableton-link-system-libraries-debian.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4e0521baa5..a949301b5b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -725,6 +725,7 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ %D%/packages/patches/abcl-fix-build-xml.patch \ + %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3a452f1458..922df4b356 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -88,6 +88,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -4283,3 +4284,104 @@ between 700 and 3200 bit/s. The main application is low bandwidth HF/VHF digital radio.") (home-page "https://www.rowetel.com/?page_id=452") (license license:lgpl2.1))) + +(define-public ableton-link + (package + (name "ableton-link") + (version "3.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ableton/link.git") + (commit (string-append "Link-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0262vm0v7hmqjhqx5xikh529p3c065p1yld6ymaiz74yq1dnnjir")) + (modules '((guix build utils))) + (patches + (search-patches "ableton-link-system-libraries-debian.patch")) + (snippet + '(begin + ;; Tests assume that CMake's "build" directory is a + ;; sub-directory of the source tree, so we fix it. + (substitute* "ci/run-tests.py" + (("root_dir,") "root_dir, os.pardir,")) + ;; Unbundle dependencies. + (delete-file-recursively "third_party") + (delete-file-recursively "modules") + #t)))) + (build-system cmake-build-system) + (native-inputs + `(("catch" ,catch-framework) + ("python" ,python) ;for running tests + ("portaudio" ,portaudio) ;for portaudio examples + ("qtbase" ,qtbase) ;for Qt examples + ("qtdeclarative" ,qtdeclarative) + ("qttools" ,qttools))) + (inputs + `(("jack" ,jack-1) ;for JACK examples + ("qtquickcontrols" ,qtquickcontrols))) ;for Qt examples + (propagated-inputs + ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp + ;; contains '#include '. + `(("asio" ,asio))) + (arguments + `(#:configure-flags + '("-DLINK_BUILD_QT_EXAMPLES=ON" + "-DLINK_BUILD_JACK=ON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (let* ((python (string-append (assoc-ref inputs "python") + "/bin/python3")) + (run-tests (string-append "../ableton-link-" + ,version + "-checkout/ci/run-tests.py"))) + (invoke python run-tests "--target" "LinkCoreTest") + (invoke python run-tests "--target" "LinkDiscoveryTest")))) + (add-before 'install 'patch-cmake + (lambda* (#:key inputs #:allow-other-keys) + (let* ((source (string-append "../ableton-link-" + ,version + "-checkout/"))) + (substitute* (string-append source + "cmake_include/AsioStandaloneConfig.cmake") + (((string-append "\\$\\{CMAKE_CURRENT_LIST_DIR\\}/\\.\\./" + "modules/asio-standalone/asio/include")) + (string-append (assoc-ref inputs "asio") + "/include"))) + (substitute* (string-append source "AbletonLinkConfig.cmake") + (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include") + "${CMAKE_CURRENT_LIST_DIR}/../../../include") + (("\\$\\{CMAKE_CURRENT_LIST_DIR\\}/include/ableton/Link\\.hpp") + "${CMAKE_CURRENT_LIST_DIR}/../../../include/ableton/Link.hpp")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib-cmake (string-append out "/lib/cmake/ableton-link")) + (source (string-append "../ableton-link-" ,version "-checkout"))) + (for-each (lambda (test-file) + (delete-file test-file)) + '("bin/LinkDiscoveryTest" "bin/LinkCoreTest")) + (copy-recursively "bin" bin) + (copy-recursively (string-append source "/include/ableton") + (string-append out "/include/ableton")) + (install-file (string-append source "/AbletonLinkConfig.cmake") + lib-cmake) + (install-file (string-append source + "/cmake_include/AsioStandaloneConfig.cmake") + (string-append lib-cmake "/cmake_include")) + #t)))))) + (home-page "https://github.com/Ableton/link") + (synopsis "Synchronize musical beat, tempo, and phase across multiple applications") + (description + "Ableton Link is a C++ library that synchronizes musical beat, tempo, and phase +across multiple applications running on one or more devices. Applications on devices +connected to a local network discover each other automatically and form a musical +session in which each participant can perform independently: anyone can start or stop +while still staying in time.") + (license license:gpl2+))) diff --git a/gnu/packages/patches/ableton-link-system-libraries-debian.patch b/gnu/packages/patches/ableton-link-system-libraries-debian.patch new file mode 100644 index 0000000000..184896ee61 --- /dev/null +++ b/gnu/packages/patches/ableton-link-system-libraries-debian.patch @@ -0,0 +1,29 @@ +This patch was borrowed from Debian's package: +https://salsa.debian.org/multimedia-team/ableton-link/-/blob/9c65141bf5bba0872811c179af77ac95770352cc/debian/patches/DEBIAN_system_libraries.patch +Description: Drop dependencies on included 3rd-party libs + upstream includes git-submodules for Catch and ASIO (not found in the tarball). + on Debian we want to use the system provided libraries. +Author: IOhannes m zmölnig +Origin: Debian +Forwarded: not-needed +Last-Update: 2016-10-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- ableton-link.orig/cmake_include/AsioStandaloneConfig.cmake ++++ ableton-link/cmake_include/AsioStandaloneConfig.cmake +@@ -1,6 +1,2 @@ + add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE) + +-set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include +-) +--- ableton-link.orig/cmake_include/CatchConfig.cmake ++++ ableton-link/cmake_include/CatchConfig.cmake +@@ -1,6 +1,2 @@ + add_library(Catch::Catch IMPORTED INTERFACE) + +-set_property(TARGET Catch::Catch APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_SOURCE_DIR}/third_party/catch +-) From patchwork Tue May 5 20:27:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 21909 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 B543427BBE3; Tue, 5 May 2020 21:28:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 4132127BBE1 for ; Tue, 5 May 2020 21:28:23 +0100 (BST) Received: from localhost ([::1]:35026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW4Aw-0001Zt-Jj for patchwork@mira.cbaines.net; Tue, 05 May 2020 16:28:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW4Ac-0001Za-Dq for guix-patches@gnu.org; Tue, 05 May 2020 16:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW4Ac-0003Gh-57 for guix-patches@gnu.org; Tue, 05 May 2020 16:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jW4Ac-0008Pq-2C for guix-patches@gnu.org; Tue, 05 May 2020 16:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41053] [PATCH 2/2] gnu: supercollider: Update to 3.11.0. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 May 2020 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41053 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41053@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 41053-submit@debbugs.gnu.org id=B41053.158871045632305 (code B ref 41053); Tue, 05 May 2020 20:28:02 +0000 Received: (at 41053) by debbugs.gnu.org; 5 May 2020 20:27:36 +0000 Received: from localhost ([127.0.0.1]:37676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4AB-0008Oy-Le for submit@debbugs.gnu.org; Tue, 05 May 2020 16:27:35 -0400 Received: from devianza.investici.org ([198.167.222.108]:33265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW4A9-0008Ol-0m for 41053@debbugs.gnu.org; Tue, 05 May 2020 16:27:34 -0400 Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 40D1EE06AA; Tue, 5 May 2020 20:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1588710450; bh=6G+F0QfZBOx3+FpfR/duq4Njxv2AgKdO1Bxgx/Zrvqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RkHAGqebT0mwq5g8D+I7jD3atlA8w4pUmXjj/WjusN4HYQjGwsrUYRt8sp3gxTO06 W8O/Yp1S8dRpJR99fCxwRs2tFADoHkU+1YzlLltFsAUbvuOviFXTFwn6jeJqy3zEa6 XbXiRcpuXdDpP1Kx+VeNRQ3mXHwR6RNx4d2tJwww= Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 23BC8E069A; Tue, 5 May 2020 20:27:30 +0000 (UTC) From: Giacomo Leidi Date: Tue, 5 May 2020 22:27:16 +0200 Message-Id: <20200505202716.1481-2-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200505202716.1481-1-goodoldpaul@autistici.org> References: <20200505202716.1481-1-goodoldpaul@autistici.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This also restores IDE support. * gnu/packages/audio.scm (supercollider): Update to 3.11.0. [outputs]: Add an "ide" output. [configure-flags]: Enable Qt IDE, fortify source and build scsynth as a shared library. [phases]: Do not delete no longer existing failing tests and add an 'install-ide phase. [native-inputs]: Add qttools and ableton-link. [inputs]: Add qtbase, qtdeclarative, qtsvg, qtwebchannel and qtwebsockets. [propagated-inputs]: Add qtwebengine. --- gnu/packages/audio.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 922df4b356..02d58f552e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2320,7 +2320,7 @@ background file post-processing.") (define-public supercollider (package (name "supercollider") - (version "3.10.4") + (version "3.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -2331,11 +2331,15 @@ background file post-processing.") (file-name (git-file-name name version)) (sha256 (base32 - "0xdg1dx0y0agircnkn4bg3jpw184xc5pn28k7rrzgjh1rdnyzz24")))) + "02v911w2kdbg3kfl593lb2ig4sjbfxzv20a0vbcymhfzpvp1x6xp")))) (build-system cmake-build-system) + (outputs + '("out" ;core language + "ide")) ;qt ide (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" - "-DSC_QT=off" "-DCMAKE_BUILD_TYPE=Release" + "-DSC_QT=ON" "-DCMAKE_BUILD_TYPE=Release" + "-DFORTIFY=ON" "-DLIBSCSYNTH=ON" "-DSC_EL=off") ;scel is packaged individually as ;emacs-scel #:modules ((guix build utils) @@ -2356,6 +2360,9 @@ background file post-processing.") (lambda (x) (and (eq? (stat:type (stat x)) 'directory) (not (member (basename x) keep-dirs)))))))) + (substitute* "lang/CMakeLists.txt" + (("include\\(\\.\\./external_libraries/link/AbletonLinkConfig\\.cmake\\)") + "find_package(AbletonLink NAMES AbletonLink ableton-link link REQUIRED)")) #t)) ;; Some tests are broken (see: ;; https://github.com/supercollider/supercollider/issues/3555 and @@ -2367,8 +2374,6 @@ background file post-processing.") "") (("perf_counter_test.cpp") "")) - (delete-file "testsuite/server/supernova/server_test.cpp") - (delete-file "testsuite/server/supernova/perf_counter_test.cpp") (substitute* "testsuite/CMakeLists.txt" (("add_subdirectory\\(sclang\\)") "")) @@ -2385,9 +2390,20 @@ background file post-processing.") "SC_Filesystem::instance\\(\\)\\.getDirectory" "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME")) (string-append "Path(\"" scclass-dir "\")"))) + #t))) + (add-before 'install 'install-ide + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (ide (assoc-ref outputs "ide")) + (scide "editors/sc-ide/scide")) + (install-file scide + (string-append ide "/bin")) + (delete-file scide) #t)))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("ableton-link" ,ableton-link) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("jack" ,jack-1) ("libsndfile" ,libsndfile) @@ -2400,7 +2416,14 @@ background file post-processing.") ("icu4c" ,icu4c) ("boost" ,boost) ("boost-sync" ,boost-sync) - ("yaml-cpp" ,yaml-cpp))) + ("yaml-cpp" ,yaml-cpp) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebsockets" ,qtwebsockets))) + (propagated-inputs ;to get native-search-path + `(("qtwebengine" ,qtwebengine))) (home-page "https://github.com/supercollider/supercollider") (synopsis "Synthesis engine and programming language") (description "SuperCollider is a synthesis engine (@code{scsynth} or