mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
gnu: csound: Update to 6.09.1.
* gnu/packages/audio.scm (csound): Update to 6.09.1. Change source URI. * gnu/packages/patches/csound-header-ordering.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove reference to patch above.
This commit is contained in:
parent
026ebc141f
commit
f049e79dc3
3 changed files with 5 additions and 32 deletions
|
@ -566,7 +566,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/crawl-upgrade-saves.patch \
|
%D%/packages/patches/crawl-upgrade-saves.patch \
|
||||||
%D%/packages/patches/crda-optional-gcrypt.patch \
|
%D%/packages/patches/crda-optional-gcrypt.patch \
|
||||||
%D%/packages/patches/crossmap-allow-system-pysam.patch \
|
%D%/packages/patches/crossmap-allow-system-pysam.patch \
|
||||||
%D%/packages/patches/csound-header-ordering.patch \
|
|
||||||
%D%/packages/patches/clucene-contribs-lib.patch \
|
%D%/packages/patches/clucene-contribs-lib.patch \
|
||||||
%D%/packages/patches/curl-bounds-check.patch \
|
%D%/packages/patches/curl-bounds-check.patch \
|
||||||
%D%/packages/patches/cursynth-wave-rand.patch \
|
%D%/packages/patches/cursynth-wave-rand.patch \
|
||||||
|
|
|
@ -568,23 +568,17 @@ (define-public swh-plugins-lv2
|
||||||
(define-public csound
|
(define-public csound
|
||||||
(package
|
(package
|
||||||
(name "csound")
|
(name "csound")
|
||||||
(version "6.05")
|
(version "6.09.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"mirror://sourceforge/csound/csound6/Csound"
|
"https://github.com/csound/csound/archive/"
|
||||||
version "/Csound" version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))
|
"0f67vyy3r29hn26qkkcwnizrnzzy8p7gmg3say5q3wjhxns3b5yl"))))
|
||||||
(patches (search-patches "csound-header-ordering.patch"))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
|
||||||
;; Work around this error on x86_64 with libc 2.22+:
|
|
||||||
;; libmvec.so.1: error adding symbols: DSO missing from command line
|
|
||||||
(if (string-prefix? "x86_64" (or (%current-target-system) (%current-system)))
|
|
||||||
'(#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-lmvec"))
|
|
||||||
'()))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("alsa-lib" ,alsa-lib)
|
`(("alsa-lib" ,alsa-lib)
|
||||||
("boost" ,boost)
|
("boost" ,boost)
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
Prevent compilation issues with boost-1.60.0.
|
|
||||||
|
|
||||||
Reported upstream at https://github.com/csound/csound/issues/570
|
|
||||||
|
|
||||||
--- Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-04-25 14:06:22.995646234 -0500
|
|
||||||
+++ Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-12-21 10:31:58.182362640 -0600
|
|
||||||
@@ -117,11 +117,12 @@
|
|
||||||
// d = sys_variables(12);
|
|
||||||
// gnor = a*(x.^3) + b*(x.^2) + c*x + d;
|
|
||||||
|
|
||||||
-#include <OpcodeBase.hpp>
|
|
||||||
#include <boost/numeric/ublas/vector.hpp>
|
|
||||||
using namespace boost::numeric;
|
|
||||||
#include <cmath>
|
|
||||||
|
|
||||||
+#include <OpcodeBase.hpp>
|
|
||||||
+
|
|
||||||
#undef CS_KSMPS
|
|
||||||
#define CS_KSMPS (opds.insdshead->ksmps)
|
|
||||||
|
|
Loading…
Reference in a new issue