From 17aa4eb4e1e36304c5e7c3eaf36a2bca30cd17c8 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 5 May 2020 22:27:15 +0200 Subject: gnu: Add ableton-link. * 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. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) (limited to 'gnu/packages/audio.scm') 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+))) -- cgit 1.4.1 From 409d2907b84bc50dd05b73a763e7e276879c6734 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 5 May 2020 22:27:16 +0200 Subject: gnu: supercollider: Update to 3.11.0. 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. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu/packages/audio.scm') 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 -- cgit 1.4.1