GNU bug report logs - #28328
[PATCH] Update CSound to 6.0.9.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 28328 in the body.
You can then email your comments to 28328 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH] Update CSound to 6.0.9.1.
Date: Sat, 02 Sep 2017 11:23:04 +0200

[Message part 1 (text/plain, inline)]

Hello,

The following patch updates CSound, which currently fails to build, to
6.0.9.1.

There is apparently only one dependency on it: solfege.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

[0001-gnu-csound-Update-to-6.09.1.patch (text/x-diff, inline)]

From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Date: Sat, 2 Sep 2017 11:18:31 +0200
Subject: [PATCH] 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.
---
 gnu/local.mk                                      |  1 -
 gnu/packages/audio.scm                            | 16 +++++-----------
 gnu/packages/patches/csound-header-ordering.patch | 20 --------------------
 3 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 gnu/packages/patches/csound-header-ordering.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8c683b8e4..10754ad04 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -567,7 +567,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/crawl-upgrade-saves.patch		\
   %D%/packages/patches/crda-optional-gcrypt.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/curl-bounds-check.patch			\
   %D%/packages/patches/cursynth-wave-rand.patch			\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 16bca3b6b..d89d2a253 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -568,23 +568,17 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
 (define-public csound
   (package
     (name "csound")
-    (version "6.05")
+    (version "6.09.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "mirror://sourceforge/csound/csound6/Csound"
-                    version "/Csound" version ".tar.gz"))
+                    "https://github.com/csound/csound/archive/"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))
-              (patches (search-patches "csound-header-ordering.patch"))))
+                "0f67vyy3r29hn26qkkcwnizrnzzy8p7gmg3say5q3wjhxns3b5yl"))))
     (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
      `(("alsa-lib" ,alsa-lib)
        ("boost" ,boost)
diff --git a/gnu/packages/patches/csound-header-ordering.patch b/gnu/packages/patches/csound-header-ordering.patch
deleted file mode 100644
index 3640d123d..000000000
--- a/gnu/packages/patches/csound-header-ordering.patch
+++ /dev/null
@@ -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)
- 
-- 
2.14.1

Message #8 received at 28328 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 28328 <at> debbugs.gnu.org
Subject: Re: [bug#28328] [PATCH] Update CSound to 6.0.9.1.
Date: Tue, 05 Sep 2017 15:13:25 +0200

Nicolas Goaziou <mail <at> nicolasgoaziou.fr> skribis:

>>From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001
> From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
> Date: Sat, 2 Sep 2017 11:18:31 +0200
> Subject: [PATCH] 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.

LGTM, thanks!

Ludo'.

Message #13 received at 28328-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 28328-done <at> debbugs.gnu.org
Subject: Re: [bug#28328] [PATCH] Update CSound to 6.0.9.1.
Date: Wed, 06 Sep 2017 12:58:54 +0200

Hello,

ludo <at> gnu.org (Ludovic Courtès) writes:

> Nicolas Goaziou <mail <at> nicolasgoaziou.fr> skribis:
>
>>>From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001
>> From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
>> Date: Sat, 2 Sep 2017 11:18:31 +0200
>> Subject: [PATCH] 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.
>
> LGTM, thanks!

Pushed. Thank you for the review.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.