From 3e1a6ff81e3f799667304fb89304e51ce1891acb Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 19 Aug 2019 21:21:35 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index db5cca0..f0615a2 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 9ee4398cac8e40f85fbd8f8bb8de6cce1cb0e1b6 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 19 Aug 2019 21:21:35 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9d8f023..3d9b393 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 77f29248ff35709d330d53777d73b708035bec88 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 19 Aug 2019 21:21:35 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2017-01-23 Last-Update: 2017-01-23 Gbp-Pq: Name fix-spelling.patch --- audio.c | 2 +- s7.c | 4 ++-- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio.c b/audio.c index f0cf3a0..17d6dde 100644 --- a/audio.c +++ b/audio.c @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/s7.c b/s7.c index c7bf139..9c3d6e7 100644 --- a/s7.c +++ b/s7.c @@ -26925,7 +26925,7 @@ static s7_pointer iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = s7_apply_function(sc, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -94285,7 +94285,7 @@ s7_scheme *s7_init(void) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index 00b9488..ae3e978 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3516,7 +3516,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 7c1bd46..a5c6e90 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1639,7 +1639,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); -- cgit v1.2.3 From f3ed459cabdf9ad47bfeeff15cd6228209aa88b8 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 18 Oct 2019 13:41:15 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index db5cca0..f0615a2 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 7a227c18e61601a18593c1841aa0e9041782b805 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 18 Oct 2019 13:41:15 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7109cc7..f9b8451 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 2035cce3b53cbe82c4aa540b1083b4b73a00f304 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 18 Oct 2019 13:41:15 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2017-01-23 Last-Update: 2017-01-23 Gbp-Pq: Name fix-spelling.patch --- audio.c | 2 +- s7.c | 4 ++-- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio.c b/audio.c index f0cf3a0..17d6dde 100644 --- a/audio.c +++ b/audio.c @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/s7.c b/s7.c index 8c67cfc..43a911b 100644 --- a/s7.c +++ b/s7.c @@ -27264,7 +27264,7 @@ static s7_pointer iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = s7_apply_function(sc, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -95045,7 +95045,7 @@ s7_scheme *s7_init(void) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index 00b9488..ae3e978 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3516,7 +3516,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 7c1bd46..a5c6e90 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1639,7 +1639,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); -- cgit v1.2.3 From cd5a2a566f07c5278529af7aee54241adc8ea981 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sat, 7 Dec 2019 20:54:07 +0100 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index db5cca0..f0615a2 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From d0befc670ff9cb848b8aeb79518dae2d7002c0ac Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sat, 7 Dec 2019 20:54:07 +0100 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 68d2773..777462c 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From c6ac8f867d9ede024a86c567397f8eccc331aee2 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sat, 7 Dec 2019 20:54:07 +0100 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2017-01-23 Last-Update: 2017-01-23 Gbp-Pq: Name fix-spelling.patch --- audio.c | 2 +- s7.c | 4 ++-- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio.c b/audio.c index 3939198..87b5399 100644 --- a/audio.c +++ b/audio.c @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/s7.c b/s7.c index c5199f6..e80918b 100644 --- a/s7.c +++ b/s7.c @@ -27328,7 +27328,7 @@ static s7_pointer iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = s7_apply_function(sc, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -95557,7 +95557,7 @@ s7_scheme *s7_init(void) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index 00b9488..ae3e978 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3516,7 +3516,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 7c1bd46..a5c6e90 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1639,7 +1639,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); -- cgit v1.2.3 From 95fd45de61c3ab20ba69cd95571c2320de39005f Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 8 Jan 2020 09:50:01 +0100 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index db5cca0..f0615a2 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 4cd997130bc09295e850d5eb05a17cd8bdc84451 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 8 Jan 2020 09:50:01 +0100 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 29e86b4..d18537e 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 2501b1463e39b40366880ca155bb82b17ab82360 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 8 Jan 2020 09:50:01 +0100 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2017-01-23 Last-Update: 2017-01-23 Gbp-Pq: Name fix-spelling.patch --- audio.c | 2 +- s7.c | 4 ++-- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio.c b/audio.c index 3939198..87b5399 100644 --- a/audio.c +++ b/audio.c @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/s7.c b/s7.c index b97626b..eace582 100644 --- a/s7.c +++ b/s7.c @@ -27355,7 +27355,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = s7_apply_function(sc, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -95922,7 +95922,7 @@ static void init_rootlet(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index 00b9488..ae3e978 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3516,7 +3516,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 7c1bd46..a5c6e90 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1639,7 +1639,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); -- cgit v1.2.3 From 4838d888d01ec00a04341c08a6896c320a449f7b Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 12 Feb 2020 11:56:44 +0100 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index db5cca0..f0615a2 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From c10090fa69dcb8750ae379fce1e0c989412b3a58 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 12 Feb 2020 11:56:44 +0100 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f360aec..618ff3b 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 82bc60eca55f8fda63f5ec2a7e59a1731e0a3325 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 12 Feb 2020 11:56:44 +0100 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2017-01-23 Last-Update: 2017-01-23 Gbp-Pq: Name fix-spelling.patch --- audio.c | 2 +- s7.c | 4 ++-- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio.c b/audio.c index 3939198..87b5399 100644 --- a/audio.c +++ b/audio.c @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/s7.c b/s7.c index 8b76b21..1cf4834 100644 --- a/s7.c +++ b/s7.c @@ -27560,7 +27560,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -96899,7 +96899,7 @@ static void init_rootlet(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index 1ab1530..5f8f6ab 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 5d3d7d5..6a67a80 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1710,7 +1710,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); -- cgit v1.2.3 From 415537106927c82757bb2cc3424302a1bec2d750 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 25 Mar 2020 15:52:21 +0100 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 69ee11c17ca476ea177e009c4032520378b8ef85 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 25 Mar 2020 15:52:21 +0100 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3b76a98..27fe241 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From bc74ca5f49e5e46b19cb977ced10d85422bc2de6 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 25 Mar 2020 15:52:21 +0100 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2017-01-23 Last-Update: 2017-01-23 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 3939198..6b0cd0a 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 088a94c..e397018 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index a1a0252..2e7699a 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index b00044a..97779d1 100644 --- a/s7.c +++ b/s7.c @@ -28019,7 +28019,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->error_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -43231,7 +43231,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -83789,7 +83789,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting frame */ + /* here the defaults (if any) are not evalled, and there is not existing frame */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -96574,7 +96574,7 @@ static s7_pointer g_s7_let_set_fallback(s7_scheme *sc, s7_pointer args) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -97825,7 +97825,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index 0031347..e5db68a 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index d14b2ef..aa76b38 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index 1ab1530..5f8f6ab 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 5eb1122..a63c79c 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1712,7 +1712,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From 1267ffaa8cf13dcc3f0c8730d575c9a065f5f17c Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 23 Apr 2020 16:09:35 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 76c227421cbe7a7baecfabd734cbd54e9f80d3bc Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 23 Apr 2020 16:09:35 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e32ff17..0ac13f7 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From c69887d65f28f3a63fcd0bff142a14617afece25 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 23 Apr 2020 16:09:35 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 3939198..6b0cd0a 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 088a94c..e397018 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index a1a0252..2e7699a 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index b1026cd..f5ef528 100644 --- a/s7.c +++ b/s7.c @@ -31966,7 +31966,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -47205,7 +47205,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -87612,7 +87612,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -96410,7 +96410,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -97736,7 +97736,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index 0031347..e5db68a 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index d14b2ef..aa76b38 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index 1ab1530..5f8f6ab 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 5eb1122..a63c79c 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1712,7 +1712,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From bfd483c8a6acb0babe2ce6d6a51c4e40036d99c7 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sun, 14 Jun 2020 23:45:29 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 6f2f076f661cdf9cfaff342928eb686ead350a4c Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sun, 14 Jun 2020 23:45:29 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4272961..566d199 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 01fd13e9386d881ab7accdd01d716fc5d3b4b66f Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sun, 14 Jun 2020 23:45:29 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 3939198..6b0cd0a 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4566,7 +4566,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 088a94c..e397018 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index a1a0252..2e7699a 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 2d1ec9a..7ab32fd 100644 --- a/s7.c +++ b/s7.c @@ -31127,7 +31127,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46318,7 +46318,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -86626,7 +86626,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -95521,7 +95521,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -96855,7 +96855,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index d14b2ef..aa76b38 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index 1ab1530..5f8f6ab 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 82847ff..02c44a8 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1729,7 +1729,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From 5dae47d8f57f53ceb52f8eb81bf39904fdae2c26 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 12:29:53 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 93b231f1ee417e61cfa33fc0cd248b796b6d06e3 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 12:29:53 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 18733d4..b237aeb 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From d1666283f809dbe82c3a2ad6a960cb48763234c6 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 12:29:53 +0200 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index b237aeb..3e98077 100644 --- a/configure.ac +++ b/configure.ac @@ -463,8 +463,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -475,7 +475,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -483,7 +483,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -492,8 +492,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -504,7 +504,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -512,7 +512,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -520,8 +520,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From 112ff362ece2ebcb07dc62fc2a9d74ce76b7287f Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 12:29:53 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 088a94c..e397018 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index a1a0252..2e7699a 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 7494afd..9756e5f 100644 --- a/s7.c +++ b/s7.c @@ -31261,7 +31261,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46783,7 +46783,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -87425,7 +87425,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -96385,7 +96385,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -97723,7 +97723,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index e2ce3ae..5f5a083 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index 1ab1530..5f8f6ab 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 1524f63..ae940a8 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1794,7 +1794,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From b6ad07773e799aa8878bef545c01a51e05f1c079 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 14:29:25 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 1de6a79fd11c42ffbf8782cf6fb4338a3c49b7d9 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 14:29:25 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 18733d4..b237aeb 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From c83aec2149d8834e45ef9cb5fc60fabac818e43d Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 14:29:25 +0200 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index b237aeb..3e98077 100644 --- a/configure.ac +++ b/configure.ac @@ -463,8 +463,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -475,7 +475,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -483,7 +483,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -492,8 +492,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -504,7 +504,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -512,7 +512,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -520,8 +520,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From c164a95fa35dfcacbb923721ab8a57bad6fc6d75 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 6 Jul 2020 14:29:25 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 088a94c..e397018 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index a1a0252..2e7699a 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 7494afd..9756e5f 100644 --- a/s7.c +++ b/s7.c @@ -31261,7 +31261,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46783,7 +46783,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -87425,7 +87425,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -96385,7 +96385,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -97723,7 +97723,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index e2ce3ae..5f5a083 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index 1ab1530..5f8f6ab 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 1524f63..ae940a8 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1794,7 +1794,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From f5d82143be9faec4d5c9cd27f53b64a7e62c587b Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 5 Aug 2020 17:03:51 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 26f59fa6a25ea99e725d614e80cbfba47604adb2 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 5 Aug 2020 17:03:51 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 52b8fd1..449d137 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 97f8c7e34cea8a674b4946102d3a2c867ed78009 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 5 Aug 2020 17:03:51 +0200 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 449d137..36823b2 100644 --- a/configure.ac +++ b/configure.ac @@ -463,8 +463,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -475,7 +475,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -483,7 +483,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -492,8 +492,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -504,7 +504,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -512,7 +512,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -520,8 +520,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From da90ed503603e676dae4bcefc9cd541e54522117 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 5 Aug 2020 17:03:51 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 1850680..7504061 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index 4b84c58..ca9c16e 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index d327b88..4a53fda 100644 --- a/s7.c +++ b/s7.c @@ -31494,7 +31494,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -47010,7 +47010,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -87673,7 +87673,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -96651,7 +96651,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -98005,7 +98005,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index e2ce3ae..5f5a083 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index cb549dc..13d82d1 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index ec49557..d894d4c 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1801,7 +1801,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From f6b0183437e7ad7b4f8bee84980a9b5706b528b4 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 14 Sep 2020 21:35:31 +0200 Subject: provide dummy define for GTK_HAVE_VERSION Forwarded: yes Last-Update: 2016-10-31 when compiling without GTK (USE_GTK=0), the following line throws an error: #if (USE_GTK) && (!GTK_CHECK_VERSION(3, 22, 0)) so we just create a dummy-define for GTK_CHECK_VERSION() Last-Update: 2016-10-31 Gbp-Pq: Name gtk_check_version.patch --- snd-main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snd-main.c b/snd-main.c index 051705e..7db647a 100644 --- a/snd-main.c +++ b/snd-main.c @@ -10,6 +10,9 @@ #define TO_GVAR_NAME(Str) Str #endif +#if (!defined USE_GTK) || (!USE_GTK) + #define GTK_CHECK_VERSION(x, y, z) 0 +#endif static void remove_temp_files(chan_info *cp) { -- cgit v1.2.3 From 39479127193b124d7fc53b7b12f21caefa6d4359 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 14 Sep 2020 21:35:31 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cd7bfd8..622f29d 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From c11f42783be09a6a946878af59d2d6c09a9f827b Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 14 Sep 2020 21:35:31 +0200 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 622f29d..6047f8d 100644 --- a/configure.ac +++ b/configure.ac @@ -483,8 +483,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -495,7 +495,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -503,7 +503,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -512,8 +512,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -524,7 +524,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -532,7 +532,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -540,8 +540,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From 5d903bbb283b48fc47ad686242ed8803d89cfac2 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 14 Sep 2020 21:35:31 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-select.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 1850680..7504061 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index 4b84c58..ca9c16e 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 2b71575..6318460 100644 --- a/s7.c +++ b/s7.c @@ -31592,7 +31592,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46924,7 +46924,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -87007,7 +87007,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -96074,7 +96074,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -97449,7 +97449,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index d4bb908..5413868 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif/gtk cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 152b105..b1f2023 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3431,7 +3431,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-select.c b/snd-select.c index 34ee813..bb9f521 100644 --- a/snd-select.c +++ b/snd-select.c @@ -582,7 +582,7 @@ static void cp_redraw_selection(chan_info *cp) #if USE_GTK if (x0 <= ap->x_axis_x0) - x0 += 2; /* dont' erase the y axis */ + x0 += 2; /* don't erase the y axis */ #else if (cp->selection_visible) { diff --git a/snd-snd.c b/snd-snd.c index cb549dc..13d82d1 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index ec49557..d894d4c 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1801,7 +1801,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From ff7d7a999cc6246813135c8c0849a052b4fdbe79 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Tue, 20 Oct 2020 23:05:02 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 74fa00d..3b4abbc 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From ffb16b84c844bb0c5a07337edc41e121dd891be8 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Tue, 20 Oct 2020 23:05:02 +0200 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 3b4abbc..8472d81 100644 --- a/configure.ac +++ b/configure.ac @@ -433,8 +433,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -445,7 +445,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -453,7 +453,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -462,8 +462,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -474,7 +474,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -482,7 +482,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -490,8 +490,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From d95fb77001c46897a8150a56542c2e7d51b83bfd Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Tue, 20 Oct 2020 23:05:02 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 1850680..7504061 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index 4b84c58..ca9c16e 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 6775c1c..5d58560 100644 --- a/s7.c +++ b/s7.c @@ -31281,7 +31281,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46419,7 +46419,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -86101,7 +86101,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -95083,7 +95083,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -96454,7 +96454,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index 8a2dc4a..22715af 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 6348be6..56ac038 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3412,7 +3412,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index cb549dc..13d82d1 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 6c5ba67..f4e46ab 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1870,7 +1870,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From 423df57ef86b55714ae87f08ded0e2139a8ce65c Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 21 Oct 2020 13:48:19 +0200 Subject: notcurses fixes Forwarded: no Last-Update: 2020-10-21 'notcurses_reset_stats' has been renamed 'notcurses_stats_reset' I don't know how to detect that at compile time (yet). Last-Update: 2020-10-21 Gbp-Pq: Name notcurses.patch --- notcurses_s7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notcurses_s7.c b/notcurses_s7.c index 12708bb..44f3e0e 100644 --- a/notcurses_s7.c +++ b/notcurses_s7.c @@ -947,7 +947,7 @@ static s7_pointer g_notcurses_stats(s7_scheme *sc, s7_pointer args) static s7_pointer g_notcurses_reset_stats(s7_scheme *sc, s7_pointer args) { - notcurses_reset_stats((struct notcurses *)s7_c_pointer_with_type(sc, s7_car(args), notcurses_symbol, __func__, 1), + notcurses_stats_reset((struct notcurses *)s7_c_pointer_with_type(sc, s7_car(args), notcurses_symbol, __func__, 1), (ncstats *)s7_c_pointer_with_type(sc, s7_cadr(args), ncstats_symbol, __func__, 2)); return(s7_cadr(args)); } -- cgit v1.2.3 From 8c71314b5772e31d2253c7b9d3dd6d1914daf3c5 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 21 Oct 2020 13:48:19 +0200 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 74fa00d..3b4abbc 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 58272e4b8e6cef5785fa0b8cfc51f2e48a3b9295 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 21 Oct 2020 13:48:19 +0200 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 3b4abbc..8472d81 100644 --- a/configure.ac +++ b/configure.ac @@ -433,8 +433,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -445,7 +445,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -453,7 +453,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -462,8 +462,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -474,7 +474,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -482,7 +482,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -490,8 +490,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From c56a92a3a9a7e6527c0223fa99a086f9652784ed Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 21 Oct 2020 13:48:19 +0200 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 1850680..7504061 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index 4b84c58..ca9c16e 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 6775c1c..5d58560 100644 --- a/s7.c +++ b/s7.c @@ -31281,7 +31281,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46419,7 +46419,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -86101,7 +86101,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -95083,7 +95083,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -96454,7 +96454,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index 8a2dc4a..22715af 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 6348be6..56ac038 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3412,7 +3412,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index cb549dc..13d82d1 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 6c5ba67..f4e46ab 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1870,7 +1870,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From b2fa7bfa900d142fad74d3901fc8fcd25eee36f9 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 19 Nov 2020 13:16:52 +0100 Subject: notcurses fixes Forwarded: no Last-Update: 2020-10-21 'notcurses_reset_stats' has been renamed 'notcurses_stats_reset' I don't know how to detect that at compile time (yet). Last-Update: 2020-10-21 Gbp-Pq: Name notcurses.patch --- notcurses_s7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notcurses_s7.c b/notcurses_s7.c index 12708bb..44f3e0e 100644 --- a/notcurses_s7.c +++ b/notcurses_s7.c @@ -947,7 +947,7 @@ static s7_pointer g_notcurses_stats(s7_scheme *sc, s7_pointer args) static s7_pointer g_notcurses_reset_stats(s7_scheme *sc, s7_pointer args) { - notcurses_reset_stats((struct notcurses *)s7_c_pointer_with_type(sc, s7_car(args), notcurses_symbol, __func__, 1), + notcurses_stats_reset((struct notcurses *)s7_c_pointer_with_type(sc, s7_car(args), notcurses_symbol, __func__, 1), (ncstats *)s7_c_pointer_with_type(sc, s7_cadr(args), ncstats_symbol, __func__, 2)); return(s7_cadr(args)); } -- cgit v1.2.3 From 96382e938acd67ba95b00bc09dfc55f9a1d5e716 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 19 Nov 2020 13:16:52 +0100 Subject: use PKG_PROG_PKG_CONFIG to allow cross-building Forwarded: no Last-Update: 2018-02-23 Last-Update: 2018-02-23 Gbp-Pq: Name cross-build-pkg-config.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 74fa00d..3b4abbc 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_ENABLE(deprecated,[ --disable-deprecated do not include any deprecated AC_C_BIGENDIAN AC_CHECK_SIZEOF(void *) -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +PKG_PROG_PKG_CONFIG -- cgit v1.2.3 From 480e281ca2754f32ebf89383e81f84b942182493 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 19 Nov 2020 13:16:52 +0100 Subject: loosen check for helper-programs Origin: Debian Forwarded: no Last-Update: 2020-07-06 there's no need to install 'flac',... on the build machine (it's sufficient to have them available on the target host). also, there's little use in using absolute paths. so we use AC_CHECK_PROG instead of AC_PATH_PROG, and set these values as args to configure Last-Update: 2020-07-06 Gbp-Pq: Name helper-progs.patch --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 3b4abbc..8472d81 100644 --- a/configure.ac +++ b/configure.ac @@ -433,8 +433,8 @@ AC_SUBST(XEN_CFLAGS) # OGG, Flac, Speex, Mpeg, Timidity, TTA, Wavpack # -------------------------------------------------------------------------------- -AC_PATH_PROG(PATH_OGGDEC, oggdec, no) # OGG read -AC_PATH_PROG(PATH_OGGENC, oggenc, no) # OGG write +AC_CHECK_PROG(PATH_OGGDEC, oggdec, no) # OGG read +AC_CHECK_PROG(PATH_OGGENC, oggenc, no) # OGG write if test "$PATH_OGGDEC" != "no" ; then if test "$PATH_OGGENC" != "no" ; then @@ -445,7 +445,7 @@ if test "$PATH_OGGDEC" != "no" ; then fi -AC_PATH_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG123, mpg123, no) # MPEG read/write? if test "$PATH_MPG123" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -453,7 +453,7 @@ if test "$PATH_MPG123" != "no" ; then fi -AC_PATH_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? +AC_CHECK_PROG(PATH_MPG321, mpg321, no) # MPEG read/write? if test "$PATH_MPG321" != "no" ; then AC_DEFINE(HAVE_MPEG) @@ -462,8 +462,8 @@ if test "$PATH_MPG321" != "no" ; then fi -AC_PATH_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read -AC_PATH_PROG(PATH_SPEEXENC, speexenc, no) # Speex write +AC_CHECK_PROG(PATH_SPEEXDEC, speexdec, no) # Speex read +AC_CHECK_PROG(PATH_SPEEXENC, speexenc, no) # Speex write if test "$PATH_SPEEXDEC" != "no" ; then if test "$PATH_SPEEXENC" != "no" ; then @@ -474,7 +474,7 @@ if test "$PATH_SPEEXDEC" != "no" ; then fi -AC_PATH_PROG(PATH_FLAC, flac, no) # Flac read/write +AC_CHECK_PROG(PATH_FLAC, flac, no) # Flac read/write if test "$PATH_FLAC" != "no" ; then AC_DEFINE(HAVE_FLAC) @@ -482,7 +482,7 @@ if test "$PATH_FLAC" != "no" ; then fi -AC_PATH_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav +AC_CHECK_PROG(PATH_TIMIDITY, timidity, no) # Timidity for .mid -> .wav if test "$PATH_TIMIDITY" != "no" ; then AC_DEFINE(HAVE_TIMIDITY) @@ -490,8 +490,8 @@ if test "$PATH_TIMIDITY" != "no" ; then fi -AC_PATH_PROG(PATH_WAVPACK, wavpack, no) -AC_PATH_PROG(PATH_WVUNPACK, wvunpack, no) +AC_CHECK_PROG(PATH_WAVPACK, wavpack, no) +AC_CHECK_PROG(PATH_WVUNPACK, wvunpack, no) if test "$PATH_WAVPACK" != "no" ; then if test "$PATH_WVUNPACK" != "no" ; then -- cgit v1.2.3 From ef658cfb1c0640d7f8cf82c807db25e07a6ae1c9 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 19 Nov 2020 13:16:52 +0100 Subject: Fix spelling mistakes Forwarded: yes Last-Update: 2020-04-18 Last-Update: 2020-04-18 Gbp-Pq: Name fix-spelling.patch --- audio.c | 4 ++-- clm.c | 2 +- gl2ps.c | 2 +- headers.c | 6 +++--- s7.c | 10 +++++----- snd-edits.c | 6 +++--- snd-nogui.c | 2 +- snd-prefs.c | 2 +- snd-snd.c | 2 +- tools/ffitest.c | 2 +- tools/sam.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/audio.c b/audio.c index 556cc82..1b77ce7 100644 --- a/audio.c +++ b/audio.c @@ -1118,7 +1118,7 @@ static int to_alsa_device(int dev, int *adev, snd_pcm_stream_t *achan) { /* default values are a problem because the concept does * not imply a direction (playback or capture). This works - * fine as long as both directions of a device are symetric, + * fine as long as both directions of a device are symmetric, * the Midiman 1010, for example, has 10 channel frames for * playback and 12 channel frames for capture and breaks * the recorder (probes the default, defaults to output, @@ -4535,7 +4535,7 @@ int jack_mus_audio_write(int line, char *buf, int bytes){ return MUS_ERROR; } if (src_data.input_frames!=len){ - printf("Unsuccessfull resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); + printf("Unsuccessful resampling: Should have used %d bytes, used %ld.",len,(long int)(src_data.input_frames)); return MUS_ERROR; } if (ch>0 && src_data.output_frames_gen!=outlen){ diff --git a/clm.c b/clm.c index 1850680..7504061 100644 --- a/clm.c +++ b/clm.c @@ -11296,7 +11296,7 @@ static void flush_buffers(rdout *gen) * So, we need to write explicit sample-type 0 values in those cases where machine 0's * won't be sample type 0. sample_type_zero[type] != 0 signals we have such a * case, and returns the nominal zero value. For unsigned shorts, we also need to - * take endianess into account. + * take endianness into account. */ mus_long_t filler, current_samps, bytes, bps; diff --git a/gl2ps.c b/gl2ps.c index 0a22cf5..9f59cee 100644 --- a/gl2ps.c +++ b/gl2ps.c @@ -3710,7 +3710,7 @@ static void gl2psPDFgroupListWriteMainStream(void) prim->verts[0].xyz[0], prim->verts[0].xyz[1]); } else{ - /* the two segements are connected, so we just append to the + /* the two segments are connected, so we just append to the current path */ gl2ps->streamlength += gl2psPrintf("%f %f l\n", diff --git a/headers.c b/headers.c index 4b84c58..ca9c16e 100644 --- a/headers.c +++ b/headers.c @@ -759,7 +759,7 @@ static int mus_header_write_next_header(int fd, int wsrate, int wchans, int loc, * 8: "AIFF" or "AIFC" -- the latter includes compressed formats (list extended for 8.5 Sound.h) * * Thereafter the file is organized into "chunks", each chunk being - * a 4-byte identifer followed by an int (4-bytes) giving the chunk size + * a 4-byte identifier followed by an int (4-bytes) giving the chunk size * not including the 8-byte header. AIFF data is signed. If the chunk * size is odd, an extra (unaccounted-for) null byte is added at the end. * @@ -5139,7 +5139,7 @@ static int read_diamondware_header(const char *filename, int fd) * _paf -> Ensoniq Paris? (this info from libaudiofile) * 0 paf (or fap) * 4 version (0) - * 8 endianess (0 = big) + * 8 endianness (0 = big) * 12 rate (uint32_t) * 16 format (0: 16-bit linear, 24-bit linear) * 20 channels @@ -5436,7 +5436,7 @@ static int read_sox_header(const char *filename, int fd) * * 128 byte header starting with "MATLAB 5.0 MAT-file" * 124: version (normally 0x100) - * 126: endianess (the chars 'M' and 'I') + * 126: endianness (the chars 'M' and 'I') * data chunked much like aiff -- 8 bytes: type | number-of-bytes, followed by data * 4 bytes type: 1: s8 2: u8 3: s16 4: u16 5: s32 6: u32 * 7: IEEE 754 single 9: IEEE 754 double 12: s64 13: u64 diff --git a/s7.c b/s7.c index 6775c1c..5d58560 100644 --- a/s7.c +++ b/s7.c @@ -31281,7 +31281,7 @@ static s7_pointer find_make_iterator_method(s7_scheme *sc, s7_pointer e) s7_pointer it; it = call_method(sc, e, func, list_1(sc, e)); if (!is_iterator(it)) - return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an interator: ~S", 49), it))); + return(s7_error(sc, sc->wrong_type_arg_symbol, set_elist_2(sc, wrap_string(sc, "make-iterator method must return an iterator: ~S", 49), it))); return(it); } return(NULL); @@ -46419,7 +46419,7 @@ static s7_pointer hash_table_copy(s7_scheme *sc, s7_pointer old_hash, s7_pointer return(new_hash); } - /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the exisiting, non-empty new_hash) */ + /* this can't be optimized much because we have to look for key matches (we're copying old_hash into the existing, non-empty new_hash) */ for (i = 0; i < old_len; i++) for (x = old_lists[i]; x; x = hash_entry_next(x)) { @@ -86101,7 +86101,7 @@ static bool apply_unsafe_closure_star_1(s7_scheme *sc) static void apply_macro_star_1(s7_scheme *sc) { - /* here the defaults (if any) are not evalled, and there is not exisiting let */ + /* here the defaults (if any) are not evalled, and there is not existing let */ s7_pointer p; for (p = closure_args(sc->code); is_pair(p); p = cdr(p)) { @@ -95083,7 +95083,7 @@ static void sl_set_history_size(s7_scheme *sc, s7_int iv) sc->true_history_size = iv; } sc->history_size = iv; - /* clear out both bufffers to avoid GC confusion */ + /* clear out both buffers to avoid GC confusion */ for (p1 = sc->eval_history1, p2 = sc->eval_history2; ; p2 = cdr(p2)) { set_car(p1, sc->nil); @@ -96454,7 +96454,7 @@ static void init_syntax(s7_scheme *sc) the associated clauses are evaluated, whereupon cond returns." #define H_and "(and expr expr ...) evaluates each of its arguments in order, quitting (and returning #f) \ as soon as one of them returns #f. If all are non-#f, it returns the last value." - #define H_or "(or expr expr ...) evaluates each of its argments in order, quitting as soon as one of them is not #f. \ + #define H_or "(or expr expr ...) evaluates each of its arguments in order, quitting as soon as one of them is not #f. \ If all are #f, or returns #f." #define H_case "(case val ((key...) clause...)...) looks for val in the various lists of keys, and if a \ match is found (via eqv?), the associated clauses are evaluated, and case returns." diff --git a/snd-edits.c b/snd-edits.c index ecaf1b8..ac570a2 100644 --- a/snd-edits.c +++ b/snd-edits.c @@ -279,7 +279,7 @@ char *run_save_state_hook(const char *file) * * each channel has a list of lists containing the current edit history and the associated sound temp files or buffers * undo: back up current list position - * redo: push position foward + * redo: push position forward * No actual changes are flushed out to the file system until the file is saved. * * the editing possibilities are insert, change, delete, scale, zero, env, mix @@ -2029,7 +2029,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case ZERO_EDIT: @@ -2109,7 +2109,7 @@ void edit_history_to_file(FILE *fd, chan_info *cp, bool with_save_state_hook) break; case EXTEND_EDIT: - /* not currently savable (this is a dummy edit fragment for zero-mix-drag position change) */ + /* not currently saveable (this is a dummy edit fragment for zero-mix-drag position change) */ break; case SCALED_EDIT: diff --git a/snd-nogui.c b/snd-nogui.c index 8a2dc4a..22715af 100644 --- a/snd-nogui.c +++ b/snd-nogui.c @@ -268,7 +268,7 @@ snd_info *add_sound_window(char *filename, read_only_t read_only, file_info *hdr if (nchans > MUS_MAX_CHANS) { - /* either a screwed up header, or Snd was built with wrong endianess */ + /* either a screwed up header, or Snd was built with wrong endianness */ /* this kind of error is trapped by raw_data_explanation in make_file_info in the motif cases */ fprintf(stderr, "%s has %d channels? ", filename, nchans); if (mus_char_to_bint((unsigned char *)&nchans) < 8) diff --git a/snd-prefs.c b/snd-prefs.c index 6348be6..56ac038 100644 --- a/snd-prefs.c +++ b/snd-prefs.c @@ -3412,7 +3412,7 @@ static void transform_type_from_text(prefs_info *prf) } if (curpos >= 0) set_transform_type(curpos); - else post_prefs_error("unknown tranform", prf); + else post_prefs_error("unknown transform", prf); } else post_prefs_error("no transform?", prf); free(trimmed_str); diff --git a/snd-snd.c b/snd-snd.c index cb549dc..13d82d1 100644 --- a/snd-snd.c +++ b/snd-snd.c @@ -3530,7 +3530,7 @@ with_two_setter_args(g_set_read_only_reversed, g_set_read_only) static Xen g_contrast_control_on(Xen snd) { - #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel constrast button state" + #define H_contrast_control_on "(" S_contrast_control_on " :optional snd): snd's control panel contrast button state" return(sound_get(snd, SP_CONTRASTING, S_contrast_control_on)); } diff --git a/tools/ffitest.c b/tools/ffitest.c index 6c5ba67..f4e46ab 100644 --- a/tools/ffitest.c +++ b/tools/ffitest.c @@ -1870,7 +1870,7 @@ int main(int argc, char **argv) s7_pointer iter, x; iter = s7_make_iterator(sc, s7_list(sc, 3, TO_S7_INT(1), TO_S7_INT(2), TO_S7_INT(3))); if (!s7_is_iterator(iter)) - fprintf(stderr, "%d: %s is not an interator\n", __LINE__, TO_STR(iter)); + fprintf(stderr, "%d: %s is not an iterator\n", __LINE__, TO_STR(iter)); if (s7_iterator_is_at_end(sc, iter)) fprintf(stderr, "%d: %s is prematurely done\n", __LINE__, TO_STR(iter)); x = s7_iterate(sc, iter); diff --git a/tools/sam.c b/tools/sam.c index 1df6bb5..7d0a4c9 100644 --- a/tools/sam.c +++ b/tools/sam.c @@ -270,7 +270,7 @@ static void dac_write(double data, int chan) * SAWTOOTH Phase13 (but 0 when Phase13 is 1000000000000) * SQUARE -1/2 (on a scale from -1 to +1) if Phase13 is negative, * else +1/2 - * PULSE +1/2 if overflow occured in step 1) or 4) above; + * PULSE +1/2 if overflow occurred in step 1) or 4) above; * else 0. * SIN(K) TblOut13 * SIN(J+Fm) TblOut13 -- cgit v1.2.3 From e5ac327c57c678e9121777f237a6f560dd59922d Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Thu, 19 Nov 2020 13:16:52 +0100 Subject: compatibility fixes for notcurses2 Forwarded: no Last-Update: 2020-11-19 notcurses has stabilized it's API as notcurses2 Last-Update: 2020-11-19 Gbp-Pq: Name notcurses2.patch --- notcurses_s7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notcurses_s7.c b/notcurses_s7.c index 44f3e0e..2e00936 100644 --- a/notcurses_s7.c +++ b/notcurses_s7.c @@ -3897,8 +3897,8 @@ void notcurses_s7_init(s7_scheme *sc) nc_int(NCBLIT_DEFAULT); nc_int(NCBLIT_1x1); nc_int(NCBLIT_2x1); - nc_int(NCBLIT_1x1x4); nc_int(NCBLIT_2x2); + nc_int(NCBLIT_3x2); nc_int(NCBLIT_4x1); nc_int(NCBLIT_BRAILLE); nc_int(NCBLIT_8x1); -- cgit v1.2.3