diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2020-07-10 17:48:06 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2020-07-16 10:07:57 +0200 |
commit | f5340e004590d3775157b335efa8a1525605a55c (patch) | |
tree | 2f8dd7714c3db5c16bec0b7b5834c2bafed67d5b /gnu/packages/patches | |
parent | 03f9a8c35be387f37badcd2c830ac7414ac17225 (diff) | |
download | guix-f5340e004590d3775157b335efa8a1525605a55c.tar guix-f5340e004590d3775157b335efa8a1525605a55c.tar.gz |
gnu: Add tao.
* gnu/packages/patches/tao-add-missing-headers.patch,
gnu/packages/patches/tao-fix-parser-types.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/audio.scm (tao): New variable.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/tao-add-missing-headers.patch | 102 | ||||
-rw-r--r-- | gnu/packages/patches/tao-fix-parser-types.patch | 26 |
2 files changed, 128 insertions, 0 deletions
diff --git a/gnu/packages/patches/tao-add-missing-headers.patch b/gnu/packages/patches/tao-add-missing-headers.patch new file mode 100644 index 0000000000..f117281993 --- /dev/null +++ b/gnu/packages/patches/tao-add-missing-headers.patch @@ -0,0 +1,102 @@ +Taken from Debian: +https://salsa.debian.org/multimedia-team/taopm/-/raw/master/debian/patches/01-add-missing-headers.diff + +Description: Adding missing headers +Author: Tiago Bortoletto Vaz <tiago@debian.org> +Last-Update: 2013-04-17 +--- a/libtao/Tao.cc ++++ b/libtao/Tao.cc +@@ -18,6 +18,7 @@ + + #include "Tao.h" + #include <iostream> ++#include <stdio.h> + + extern Tao tao; + float &Time = tao.synthesisEngine.time; +--- a/libtao/TaoDevice.cc ++++ b/libtao/TaoDevice.cc +@@ -20,6 +20,7 @@ + #include "Tao.h" + #include "TaoAccessPoint.h" + #include "TaoInstrument.h" ++#include <cstring> + + TaoDevice::TaoDevice() + { +--- a/libtao/TaoInstrument.cc ++++ b/libtao/TaoInstrument.cc +@@ -23,6 +23,7 @@ + //#include <sys/types.h> + #include <iostream> + #include <cmath> ++#include <cstring> + + float TaoInstrument::defaultMass=3.5; // Set to optimum value for + // frequency response of +--- a/libtao/TaoOutput.cc ++++ b/libtao/TaoOutput.cc +@@ -24,6 +24,7 @@ + #include <fstream> + #include "TaoOutput.h" + #include "Tao.h" ++#include <cstring> + + extern Tao tao; + +--- a/libtao/TaoPitch.cc ++++ b/libtao/TaoPitch.cc +@@ -30,6 +30,7 @@ + #include "TaoPitch.h" + #include <iostream>
+ #include <cmath> ++#include <cstring> + + // This class allows pitches and frequencies to be specified in a number of + // different formats including the following: +--- a/taoparse/taoparser.yy ++++ b/taoparse/taoparser.yy +@@ -19,7 +19,8 @@ + + #include <iostream> + #include <sstream> +-#include <string> ++#include <cstring> ++#include <stdio.h> + #include "taoparserdefs.h" + + int yyerror(char *s); +--- a/libtao/TaoGraphicsEngine.cc ++++ b/libtao/TaoGraphicsEngine.cc +@@ -27,7 +27,8 @@ + #include "TaoInstrument.h" + #include "TaoAccessPoint.h" + #include "TaoDevice.h" +-#include <string> ++#include <cstring> ++#include <stdio.h> + + extern Tao tao; + extern void taoMasterTick(); +--- a/tao2aiff/tao2aiff.cc ++++ b/tao2aiff/tao2aiff.cc +@@ -25,6 +25,8 @@ + #include <cmath> + #include "audiofile.h" + #include "tao2aiff.h" ++#include <cstdlib> ++#include <cstring> + + + main(int argc, char **argv) +--- a/tao2wav/tao2wav.cc ++++ b/tao2wav/tao2wav.cc +@@ -25,6 +25,8 @@ + #include <cmath> + #include "audiofile.h" + #include "tao2wav.h" ++#include <cstdlib> ++#include <cstring> + + main(int argc, char **argv) + { diff --git a/gnu/packages/patches/tao-fix-parser-types.patch b/gnu/packages/patches/tao-fix-parser-types.patch new file mode 100644 index 0000000000..5dcf3fc2ea --- /dev/null +++ b/gnu/packages/patches/tao-fix-parser-types.patch @@ -0,0 +1,26 @@ +Taken from Debian: +https://salsa.debian.org/multimedia-team/taopm/-/raw/master/debian/patches/02-fix-parser-yyerror.diff + +Description: Use a constant char, dummy comment. +Author: Tiago Bortoletto Vaz <tiago@debian.org> +Last-Update: 2013-04-17 +--- a/taoparse/taoparser.yy ++++ b/taoparse/taoparser.yy +@@ -23,7 +23,7 @@ + #include <stdio.h> + #include "taoparserdefs.h" + +-int yyerror(char *s); ++int yyerror(const char *s); + + //#ifdef LINUX + int yylex(void); +@@ -2924,7 +2924,7 @@ + } + + +-int yyerror (char *s) ++int yyerror (const char *s) + { + parse_error(what_I_expected_here); + std::cout << "PARSE_FAILED"; |