commit: b6b022627e6e561a90df50065c2d0143b798b3b2 parent 928717b9d8aaa14be6c4a1a543b9d418f5d4d1cb Author: Michael Forney <mforney@mforney.org> Date: Thu, 20 Feb 2020 16:07:45 -0800 alsa-lib: Update to 1.2.2Diffstat:
10 files changed, 97 insertions(+), 310 deletions(-)diff --git a/pkg/alsa-utils/README.md b/pkg/alsa-utils/README.md@@ -6,5 +6,6 @@ Generated with ./configure \ --prefix= \ --disable-alsamixer \ + --disable-nls \ CPPFLAGS=-I/src/oasis/out/pkg/alsa-lib/include \ LDFLAGS=-L/src/oasis/out/pkg/alsa-libdiff --git a/pkg/alsa-utils/aconfig.h b/pkg/alsa-utils/aconfig.h@@ -14,9 +14,10 @@ /* #undef HAVE_DCGETTEXT */ /* #undef HAVE_FORM_H */ /* #undef HAVE_GETTEXT */ -#define HAVE_ICONV 1 +/* #undef HAVE_ICONV */ /* #undef HAVE_INTTYPES_H */ #define HAVE_LIBASOUND 1 +/* #undef HAVE_LIBATOPOLOGY */ /* #undef HAVE_LIBFFTW3F */ #define HAVE_LIBM 1 #define HAVE_LIBPTHREAD 1 @@ -38,14 +39,14 @@ #define PACKAGE "alsa-utils" #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "alsa-utils" -#define PACKAGE_STRING "alsa-utils 1.2.1" +#define PACKAGE_STRING "alsa-utils 1.2.2" #define PACKAGE_TARNAME "alsa-utils" #define PACKAGE_URL "" -#define PACKAGE_VERSION "1.2.1" +#define PACKAGE_VERSION "1.2.2" #define SOUNDSDIR "/share/sounds/alsa" #define STDC_HEADERS 1 #define TIME_WITH_SYS_TIME 1 -#define VERSION "1.2.1" +#define VERSION "1.2.2" /* #undef WITH_FFADO */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1diff --git a/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/pkg/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch@@ -1,81 +0,0 @@ -From a9700bf75911baa9a6382cdbfc3d97608cdb46ce Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sat, 2 Jul 2016 23:48:43 -0700 -Subject: [PATCH] Include poll.h instead of sys/poll.h - ---- - amidi/amidi.c | 2 +- - amixer/amixer.c | 2 +- - aplay/aplay.c | 2 +- - seq/aplaymidi/arecordmidi.c | 2 +- - seq/aseqdump/aseqdump.c | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/amidi/amidi.c b/amidi/amidi.c -index b6e05e1..c6268e4 100644 ---- a/amidi/amidi.c -+++ b/amidi/amidi.c -@@ -31,7 +31,7 @@ - #include <signal.h> - #include <sys/timerfd.h> - #include <sys/types.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> -diff --git a/amixer/amixer.c b/amixer/amixer.c -index 9c3f9bf..64fd4bb 100644 ---- a/amixer/amixer.c -+++ b/amixer/amixer.c -@@ -28,7 +28,7 @@ - #include <errno.h> - #include <assert.h> - #include <alsa/asoundlib.h> --#include <sys/poll.h> -+#include <poll.h> - #include <stdint.h> - #include "amixer.h" - #include "../alsamixer/volume_mapping.h" -diff --git a/aplay/aplay.c b/aplay/aplay.c -index bbd7fff..66e9cb9 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -44,7 +44,7 @@ - #include <assert.h> - #include <termios.h> - #include <signal.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/uio.h> - #include <sys/time.h> - #include <sys/stat.h> -diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c -index 19dbb7d..4d212b6 100644 ---- a/seq/aplaymidi/arecordmidi.c -+++ b/seq/aplaymidi/arecordmidi.c -@@ -27,7 +27,7 @@ - #include <string.h> - #include <signal.h> - #include <getopt.h> --#include <sys/poll.h> -+#include <poll.h> - #include <alsa/asoundlib.h> - #include "aconfig.h" - #include "version.h" -diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c -index 7904540..578e06f 100644 ---- a/seq/aseqdump/aseqdump.c -+++ b/seq/aseqdump/aseqdump.c -@@ -25,7 +25,7 @@ - #include <string.h> - #include <signal.h> - #include <getopt.h> --#include <sys/poll.h> -+#include <poll.h> - #include <alsa/asoundlib.h> - #include "aconfig.h" - #include "version.h" --- -2.17.0 -diff --git a/pkg/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch b/pkg/alsa-utils/patch/0001-amixer.h-Just-include-version.h.patchdiff --git a/pkg/alsa-utils/patch/0002-aplay-Error-on-WAV-files-with-more-than-256-channels.patch b/pkg/alsa-utils/patch/0002-aplay-Error-on-WAV-files-with-more-than-256-channels.patch@@ -0,0 +1,90 @@ +From 2fbd98389e3ff9f2810c9a6de17c10e2d1f9c1dd Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sun, 11 Aug 2019 04:26:06 +0000 +Subject: [PATCH] aplay: Error on WAV files with more than 256 channels + +This allows using fixed size arrays in some places, and 256 is the +limit for channels manually specified on the command-line anyway. +--- + aplay/aplay.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/aplay/aplay.c b/aplay/aplay.c +index 08395f6..91765e7 100644 +--- a/aplay/aplay.c ++++ b/aplay/aplay.c +@@ -1057,7 +1057,7 @@ static ssize_t test_wavefile(int fd, u_char *_buffer, size_t size) + prg_exit(EXIT_FAILURE); + } + channels = TO_CPU_SHORT(f->channels, big_endian); +- if (channels < 1) { ++ if (channels < 1 || channels > 256) { + error(_("can't play WAVE-files with %d tracks"), channels); + prg_exit(EXIT_FAILURE); + } +@@ -1232,7 +1232,7 @@ static void show_available_sample_formats(snd_pcm_hw_params_t* params) + static int setup_chmap(void) + { + snd_pcm_chmap_t *chmap = channel_map; +- char mapped[hwparams.channels]; ++ char mapped[256]; + snd_pcm_chmap_t *hw_chmap; + unsigned int ch, i; + int err; +@@ -2088,7 +2088,7 @@ static ssize_t pcm_writev(u_char **data, unsigned int channels, size_t count) + data = remap_datav(data, count); + while (count > 0 && !in_aborting) { + unsigned int channel; +- void *bufs[channels]; ++ void *bufs[256]; + size_t offset = result; + for (channel = 0; channel < channels; channel++) + bufs[channel] = data[channel] + offset * bits_per_sample / 8; +@@ -2176,7 +2176,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) + + while (count > 0 && !in_aborting) { + unsigned int channel; +- void *bufs[channels]; ++ void *bufs[256]; + size_t offset = result; + for (channel = 0; channel < channels; channel++) + bufs[channel] = data[channel] + offset * bits_per_sample / 8; +@@ -3242,7 +3242,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t + size_t vsize; + + unsigned int channel; +- u_char *bufs[channels]; ++ u_char *bufs[256]; + + header(rtype, names[0]); + set_params(); +@@ -3294,7 +3294,7 @@ static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtyp + ssize_t r; + unsigned int channel; + size_t vsize; +- u_char *bufs[channels]; ++ u_char *bufs[256]; + + header(rtype, names[0]); + set_params(); +@@ -3331,7 +3331,7 @@ static void playbackv(char **names, unsigned int count) + unsigned int channel; + unsigned int channels = rhwparams.channels; + int alloced = 0; +- int fds[channels]; ++ int fds[256]; + for (channel = 0; channel < channels; ++channel) + fds[channel] = -1; + +@@ -3384,7 +3384,7 @@ static void capturev(char **names, unsigned int count) + unsigned int channel; + unsigned int channels = rhwparams.channels; + int alloced = 0; +- int fds[channels]; ++ int fds[256]; + for (channel = 0; channel < channels; ++channel) + fds[channel] = -1; + +-- +2.25.0 +diff --git a/pkg/alsa-utils/patch/0003-Use-__func__-instead-of-__FUNCTION__.patch b/pkg/alsa-utils/patch/0003-Use-__func__-instead-of-__FUNCTION__.patch@@ -1,65 +0,0 @@ -From a0d257af5b6e2ecdc1300263b232a7829b3e5f3e Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 1 Jul 2019 23:44:21 -0700 -Subject: [PATCH] Use __func__ instead of __FUNCTION__ - -They are equivalent, but __func__ is in C99. __FUNCTION__ exists only -for backwards compatibility with old gcc versions. - -Signed-off-by: Michael Forney <mforney@mforney.org> ---- - alsactl/alsactl.h | 16 ++++++++-------- - aplay/aplay.c | 4 ++-- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h -index 4f969ec..69b539c 100644 ---- a/alsactl/alsactl.h -+++ b/alsactl/alsactl.h -@@ -13,15 +13,15 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...); - void dbg_(const char *fcn, long line, const char *fmt, ...); - - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) --#define info(...) do { info_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) --#define error(...) do { error_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) --#define cerror(cond, ...) do { cerror_(__FUNCTION__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) --#define dbg(...) do { dbg_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) -+#define info(...) do { info_(__func__, __LINE__, __VA_ARGS__); } while (0) -+#define error(...) do { error_(__func__, __LINE__, __VA_ARGS__); } while (0) -+#define cerror(cond, ...) do { cerror_(__func__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) -+#define dbg(...) do { dbg_(__func__, __LINE__, __VA_ARGS__); } while (0) - #else --#define info(args...) do { info_(__FUNCTION__, __LINE__, ##args); } while (0) --#define error(args...) do { error_(__FUNCTION__, __LINE__, ##args); } while (0) --#define cerror(cond, ...) do { error_(__FUNCTION__, __LINE__, (cond) != 0, ##args); } while (0) --#define dbg(args...) do { dbg_(__FUNCTION__, __LINE__, ##args); } while (0) -+#define info(args...) do { info_(__func__, __LINE__, ##args); } while (0) -+#define error(args...) do { error_(__func__, __LINE__, ##args); } while (0) -+#define cerror(cond, ...) do { error_(__func__, __LINE__, (cond) != 0, ##args); } while (0) -+#define dbg(args...) do { dbg_(__func__, __LINE__, ##args); } while (0) - #endif - - int init(const char *file, const char *cardname); -diff --git a/aplay/aplay.c b/aplay/aplay.c -index 33e0f77..ecfc8b8 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -184,13 +184,13 @@ static const struct fmt_capture { - - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) - #define error(...) do {\ -- fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ -+ fprintf(stderr, "%s: %s:%d: ", command, __func__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - putc('\n', stderr); \ - } while (0) - #else - #define error(args...) do {\ -- fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ -+ fprintf(stderr, "%s: %s:%d: ", command, __func__, __LINE__); \ - fprintf(stderr, ##args); \ - putc('\n', stderr); \ - } while (0) --- -2.22.0 -diff --git a/pkg/alsa-utils/patch/0004-aplay-Avoid-pointer-arithmetic-on-void.patch b/pkg/alsa-utils/patch/0004-aplay-Avoid-pointer-arithmetic-on-void.patch@@ -1,35 +0,0 @@ -From c77b78a4a71d8e0950bde18e1a38f8795f4deac7 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 2 Jul 2019 00:26:12 -0700 -Subject: [PATCH] aplay: Avoid pointer arithmetic on `void *` - -Signed-off-by: Michael Forney <mforney@mforney.org> ---- - aplay/aplay.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index ecfc8b8..d789222 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -440,7 +440,7 @@ static ssize_t xwrite(int fd, const void *buf, size_t count) - size_t offset = 0; - - while (offset < count) { -- written = write(fd, buf + offset, count - offset); -+ written = write(fd, (char *)buf + offset, count - offset); - if (written <= 0) - return written; - -@@ -1208,7 +1208,7 @@ static int test_au(int fd, void *buffer) - hwparams.channels = BE_INT(ap->channels); - if (hwparams.channels < 1 || hwparams.channels > 256) - return -1; -- if ((size_t)safe_read(fd, buffer + sizeof(AuHeader), BE_INT(ap->hdr_size) - sizeof(AuHeader)) != BE_INT(ap->hdr_size) - sizeof(AuHeader)) { -+ if ((size_t)safe_read(fd, (char *)buffer + sizeof(AuHeader), BE_INT(ap->hdr_size) - sizeof(AuHeader)) != BE_INT(ap->hdr_size) - sizeof(AuHeader)) { - error(_("read error")); - prg_exit(EXIT_FAILURE); - } --- -2.22.0 -diff --git a/pkg/alsa-utils/patch/0005-amixer-Use-lli-for-long-long-in-printf.patch b/pkg/alsa-utils/patch/0005-amixer-Use-lli-for-long-long-in-printf.patch@@ -1,34 +0,0 @@ -From 84e7fe3fde8ffd80aea4c45ab6431b19cbde5cc3 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 2 Jul 2019 00:26:36 -0700 -Subject: [PATCH] amixer: Use %lli for long long in printf - ---- - amixer/amixer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/amixer/amixer.c b/amixer/amixer.c -index f7f31f0..7048cac 100644 ---- a/amixer/amixer.c -+++ b/amixer/amixer.c -@@ -620,7 +620,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem, - snd_ctl_elem_info_get_step(info)); - break; - case SND_CTL_ELEM_TYPE_INTEGER64: -- printf(",min=%Li,max=%Li,step=%Li\n", -+ printf(",min=%lli,max=%lli,step=%lli\n", - snd_ctl_elem_info_get_min64(info), - snd_ctl_elem_info_get_max64(info), - snd_ctl_elem_info_get_step64(info)); -@@ -662,7 +662,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem, - printf("%li", snd_ctl_elem_value_get_integer(control, idx)); - break; - case SND_CTL_ELEM_TYPE_INTEGER64: -- printf("%Li", snd_ctl_elem_value_get_integer64(control, idx)); -+ printf("%lli", snd_ctl_elem_value_get_integer64(control, idx)); - break; - case SND_CTL_ELEM_TYPE_ENUMERATED: - printf("%u", snd_ctl_elem_value_get_enumerated(control, idx)); --- -2.24.0 -diff --git a/pkg/alsa-utils/patch/0006-aplay-Error-on-WAV-files-with-more-than-256-channels.patch b/pkg/alsa-utils/patch/0006-aplay-Error-on-WAV-files-with-more-than-256-channels.patch@@ -1,90 +0,0 @@ -From 8b90edf6b15a825548aac6cda3006e8a89880bc7 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sun, 11 Aug 2019 04:26:06 +0000 -Subject: [PATCH] aplay: Error on WAV files with more than 256 channels - -This allows using fixed size arrays in some places, and 256 is the -limit for channels manually specified on the command-line anyway. ---- - aplay/aplay.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index 46f7dd5..281957e 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -1055,7 +1055,7 @@ static ssize_t test_wavefile(int fd, u_char *_buffer, size_t size) - prg_exit(EXIT_FAILURE); - } - channels = TO_CPU_SHORT(f->channels, big_endian); -- if (channels < 1) { -+ if (channels < 1 || channels > 256) { - error(_("can't play WAVE-files with %d tracks"), channels); - prg_exit(EXIT_FAILURE); - } -@@ -1230,7 +1230,7 @@ static void show_available_sample_formats(snd_pcm_hw_params_t* params) - static int setup_chmap(void) - { - snd_pcm_chmap_t *chmap = channel_map; -- char mapped[hwparams.channels]; -+ char mapped[256]; - snd_pcm_chmap_t *hw_chmap; - unsigned int ch, i; - int err; -@@ -2086,7 +2086,7 @@ static ssize_t pcm_writev(u_char **data, unsigned int channels, size_t count) - data = remap_datav(data, count); - while (count > 0 && !in_aborting) { - unsigned int channel; -- void *bufs[channels]; -+ void *bufs[256]; - size_t offset = result; - for (channel = 0; channel < channels; channel++) - bufs[channel] = data[channel] + offset * bits_per_sample / 8; -@@ -2174,7 +2174,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) - - while (count > 0 && !in_aborting) { - unsigned int channel; -- void *bufs[channels]; -+ void *bufs[256]; - size_t offset = result; - for (channel = 0; channel < channels; channel++) - bufs[channel] = data[channel] + offset * bits_per_sample / 8; -@@ -3240,7 +3240,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t - size_t vsize; - - unsigned int channel; -- u_char *bufs[channels]; -+ u_char *bufs[256]; - - header(rtype, names[0]); - set_params(); -@@ -3292,7 +3292,7 @@ static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtyp - ssize_t r; - unsigned int channel; - size_t vsize; -- u_char *bufs[channels]; -+ u_char *bufs[256]; - - header(rtype, names[0]); - set_params(); -@@ -3329,7 +3329,7 @@ static void playbackv(char **names, unsigned int count) - unsigned int channel; - unsigned int channels = rhwparams.channels; - int alloced = 0; -- int fds[channels]; -+ int fds[256]; - for (channel = 0; channel < channels; ++channel) - fds[channel] = -1; - -@@ -3382,7 +3382,7 @@ static void capturev(char **names, unsigned int count) - unsigned int channel; - unsigned int channels = rhwparams.channels; - int alloced = 0; -- int fds[channels]; -+ int fds[256]; - for (channel = 0; channel < channels; ++channel) - fds[channel] = -1; - --- -2.24.0 -diff --git a/pkg/alsa-utils/ver b/pkg/alsa-utils/ver@@ -1 +1 @@ -1.2.1 r1 +1.2.2 r0