[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/10: gnu: Fix supercollider.
From: |
guix-commits |
Subject: |
03/10: gnu: Fix supercollider. |
Date: |
Fri, 28 Apr 2023 15:15:07 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 06277d8070d6030efca2a820067af1ee9692e9a9
Author: Gabriel Wicki <gabriel@erlikon.ch>
AuthorDate: Tue Apr 25 22:35:59 2023 +0200
gnu: Fix supercollider.
Message-Id:
<f67786eb958a65ba778f67a8f443fa3d24293438.1682453413.git.gabriel@erlikon.ch>
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Tue, 25 Apr 2023 22:03:03 +0200
Subject: [PATCH 1/2] gnu: Fix supercollider.
* gnu/packages/audio.scm (supercollider): Fix the build.
[configure-flags] Re-enable DLIBSCSYNTH.
[phases] New phase fix-struct-SOUNDFILE-tag.
[inputs] Add ruby and python to appease the build process.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/audio.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dca5e516a1..109133ba8e 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -43,6 +43,7 @@
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -119,6 +120,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages rdf)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages ruby)
#:use-module (gnu packages samba)
#:use-module (gnu packages sdl)
#:use-module (gnu packages serialization)
@@ -3485,7 +3487,7 @@ link REQUIRED)"))))))
"-DSC_QT=ON"
"-DCMAKE_BUILD_TYPE=Release"
"-DFORTIFY=ON"
- ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable?
+ "-DLIBSCSYNTH=ON"
"-DSC_EL=OFF") ;scel is packaged individually as
emacs-scel
#:phases
(modify-phases %standard-phases
@@ -3506,6 +3508,12 @@ link REQUIRED)"))))))
"SC_Filesystem::instance\\(\\)\\.getDirectory"
"\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
(string-append "Path(\"" scclass-dir "\")"))))))
+ (add-after 'patch-scclass-dir 'fix-struct-SOUNDFILE-tag
+ (lambda* _
+ (display (getcwd)) (newline)
+ (substitute* "include/plugin_interface/SC_SndBuf.h"
+ (("SNDFILE_tag")
+ "sf_private_tag"))))
(add-before 'build 'prepare-x
(lambda _
(system "Xvfb &")
@@ -3532,6 +3540,8 @@ link REQUIRED)"))))))
boost
boost-sync
yaml-cpp
+ python-wrapper ;there were warnings in the build
process
+ ruby ;there were warnings in the build
process
qtbase-5
qtdeclarative-5
qtsvg-5
- branch master updated (aecc6e7058 -> 4884ee6dd4), guix-commits, 2023/04/28
- 07/10: gnu: maven-core-bootstrap: Fix build., guix-commits, 2023/04/28
- 08/10: gnu: maven-embedder: Fix build., guix-commits, 2023/04/28
- 09/10: gnu: fwupd: Update to 1.8.14., guix-commits, 2023/04/28
- 03/10: gnu: Fix supercollider.,
guix-commits <=
- 04/10: gnu: maven-settings-builder: Fix build., guix-commits, 2023/04/28
- 10/10: gnu: libexpected: Update to 1.1.0., guix-commits, 2023/04/28
- 05/10: gnu: maven-model-builder: Fix build., guix-commits, 2023/04/28
- 02/10: tests: guix-graph.sh: Fix expected path from emacs to libffi., guix-commits, 2023/04/28
- 01/10: tests: guix-build.sh: Don't use hidden gcc for transformation tests., guix-commits, 2023/04/28
- 06/10: gnu: maven-resolver-provider: Fix build., guix-commits, 2023/04/28