From unknown Tue Aug 19 10:02:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28328] [PATCH] Update CSound to 6.0.9.1. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Sep 2017 09:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 28328 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 28328@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.150434421116922 (code B ref -1); Sat, 02 Sep 2017 09:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2017 09:23:31 +0000 Received: from localhost ([127.0.0.1]:41409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1do4eJ-0004Or-I2 for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1do4eG-0004Oe-LE for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1do4e6-0003hn-MR for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60749) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1do4e6-0003hY-IZ for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1do4e1-0002cs-5y for guix-patches@gnu.org; Sat, 02 Sep 2017 05:23:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1do4dw-0003Un-0N for guix-patches@gnu.org; Sat, 02 Sep 2017 05:23:13 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:46462) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1do4dv-0003Rt-QL for guix-patches@gnu.org; Sat, 02 Sep 2017 05:23:07 -0400 Received: from saiph.selenimh (unknown [IPv6:2a03:a0a0:0:4301::469]) (Authenticated sender: mail@nicolasgoaziou.fr) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 48D7AA80D8 for ; Sat, 2 Sep 2017 11:23:05 +0200 (CEST) Received: from ngz by saiph.selenimh with local (Exim 4.89) (envelope-from ) id 1do4ds-0006FK-9s for guix-patches@gnu.org; Sat, 02 Sep 2017 11:23:04 +0200 From: Nicolas Goaziou User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Sat, 02 Sep 2017 11:23:04 +0200 Message-ID: <87fuc51mkn.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-csound-Update-to-6.09.1.patch >From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou 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 - #include - using namespace boost::numeric; - #include - -+#include -+ - #undef CS_KSMPS - #define CS_KSMPS (opds.insdshead->ksmps) - -- 2.14.1 --=-=-=-- From unknown Tue Aug 19 10:02:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#28328] [PATCH] Update CSound to 6.0.9.1. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Sep 2017 13:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28328 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 28328@debbugs.gnu.org Received: via spool by 28328-submit@debbugs.gnu.org id=B28328.150461722124567 (code B ref 28328); Tue, 05 Sep 2017 13:14:02 +0000 Received: (at 28328) by debbugs.gnu.org; 5 Sep 2017 13:13:41 +0000 Received: from localhost ([127.0.0.1]:50570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpDfh-0006OB-5x for submit@debbugs.gnu.org; Tue, 05 Sep 2017 09:13:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpDfd-0006Ns-7Q for 28328@debbugs.gnu.org; Tue, 05 Sep 2017 09:13:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpDfT-0000gH-Iq for 28328@debbugs.gnu.org; Tue, 05 Sep 2017 09:13:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpDfT-0000g6-FZ; Tue, 05 Sep 2017 09:13:27 -0400 Received: from [193.50.110.184] (port=41198 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dpDfS-0002UN-W3; Tue, 05 Sep 2017 09:13:27 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <87fuc51mkn.fsf@nicolasgoaziou.fr> Date: Tue, 05 Sep 2017 15:13:25 +0200 In-Reply-To: <87fuc51mkn.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Sat, 02 Sep 2017 11:23:04 +0200") Message-ID: <87bmmps2yy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Nicolas Goaziou skribis: >>>From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001 > From: Nicolas Goaziou > 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'. From unknown Tue Aug 19 10:02:37 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Goaziou Subject: bug#28328: closed (Re: [bug#28328] [PATCH] Update CSound to 6.0.9.1.) Message-ID: References: <877exc14b5.fsf@nicolasgoaziou.fr> <87fuc51mkn.fsf@nicolasgoaziou.fr> X-Gnu-PR-Message: they-closed 28328 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 28328@debbugs.gnu.org Date: Wed, 06 Sep 2017 10:59:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1504695542-3047-1" This is a multi-part message in MIME format... ------------=_1504695542-3047-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #28328: [PATCH] Update CSound to 6.0.9.1. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 28328@debbugs.gnu.org. --=20 28328: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D28328 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1504695542-3047-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 28328-done) by debbugs.gnu.org; 6 Sep 2017 10:59:00 +0000 Received: from localhost ([127.0.0.1]:52331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpY2u-0000mw-DW for submit@debbugs.gnu.org; Wed, 06 Sep 2017 06:59:00 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:34829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpY2r-0000mk-28 for 28328-done@debbugs.gnu.org; Wed, 06 Sep 2017 06:58:59 -0400 Received: from saiph.selenimh (unknown [IPv6:2a03:a0a0:0:4301::469]) (Authenticated sender: mail@nicolasgoaziou.fr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id EC5F71720A9; Wed, 6 Sep 2017 12:58:54 +0200 (CEST) Received: from ngz by saiph.selenimh with local (Exim 4.89) (envelope-from ) id 1dpY2o-0000yg-6T; Wed, 06 Sep 2017 12:58:54 +0200 From: Nicolas Goaziou To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#28328] [PATCH] Update CSound to 6.0.9.1. In-Reply-To: <87bmmps2yy.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Tue, 05 Sep 2017 15:13:25 +0200") References: <87fuc51mkn.fsf@nicolasgoaziou.fr> <87bmmps2yy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Wed, 06 Sep 2017 12:58:54 +0200 Message-ID: <877exc14b5.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28328-done Cc: 28328-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hello, ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Nicolas Goaziou skribis: > >>>>From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001 >> From: Nicolas Goaziou >> 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, --=20 Nicolas Goaziou 0x80A93738 ------------=_1504695542-3047-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Sep 2017 09:23:31 +0000 Received: from localhost ([127.0.0.1]:41409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1do4eJ-0004Or-I2 for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1do4eG-0004Oe-LE for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1do4e6-0003hn-MR for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60749) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1do4e6-0003hY-IZ for submit@debbugs.gnu.org; Sat, 02 Sep 2017 05:23:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1do4e1-0002cs-5y for guix-patches@gnu.org; Sat, 02 Sep 2017 05:23:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1do4dw-0003Un-0N for guix-patches@gnu.org; Sat, 02 Sep 2017 05:23:13 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:46462) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1do4dv-0003Rt-QL for guix-patches@gnu.org; Sat, 02 Sep 2017 05:23:07 -0400 Received: from saiph.selenimh (unknown [IPv6:2a03:a0a0:0:4301::469]) (Authenticated sender: mail@nicolasgoaziou.fr) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 48D7AA80D8 for ; Sat, 2 Sep 2017 11:23:05 +0200 (CEST) Received: from ngz by saiph.selenimh with local (Exim 4.89) (envelope-from ) id 1do4ds-0006FK-9s for guix-patches@gnu.org; Sat, 02 Sep 2017 11:23:04 +0200 From: Nicolas Goaziou To: guix-patches@gnu.org Subject: [PATCH] Update CSound to 6.0.9.1. User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Sat, 02 Sep 2017 11:23:04 +0200 Message-ID: <87fuc51mkn.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-csound-Update-to-6.09.1.patch >From b08ce3884e5f89b1680d533af34998a4690f83ad Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou 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 - #include - using namespace boost::numeric; - #include - -+#include -+ - #undef CS_KSMPS - #define CS_KSMPS (opds.insdshead->ksmps) - -- 2.14.1 --=-=-=-- ------------=_1504695542-3047-1--