diff options
| author | Michael Forney <mforney@mforney.org> | 2021-08-31 19:24:16 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-08-31 19:38:53 -0700 |
| commit | 29b0d64dd0221c051b4d5cd619c87645ac630b19 (patch) | |
| tree | a77adf11873609f761aba8e83a8636a1e223bdd7 /pkg/alsa-utils/patch | |
| parent | c73cf94e0daaef825c57b2bfb3dfb85b806c9b54 (diff) | |
Remove alsa-utils in favor of tinyalsa
Diffstat (limited to 'pkg/alsa-utils/patch')
| -rw-r--r-- | pkg/alsa-utils/patch/0001-amixer.h-Just-include-version.h.patch | 22 | ||||
| -rw-r--r-- | pkg/alsa-utils/patch/0002-aplay-Error-on-WAV-files-with-more-than-256-channels.patch | 90 |
2 files changed, 0 insertions, 112 deletions
diff --git a/pkg/alsa-utils/patch/0001-amixer.h-Just-include-version.h.patch b/pkg/alsa-utils/patch/0001-amixer.h-Just-include-version.h.patch deleted file mode 100644 index 83cf3821..00000000 --- a/pkg/alsa-utils/patch/0001-amixer.h-Just-include-version.h.patch +++ /dev/null @@ -1,22 +0,0 @@ -From be89553bd363678ab75c44b8e0630920aba52987 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sun, 3 Jul 2016 00:01:24 -0700 -Subject: [PATCH] amixer.h: Just include "version.h" - ---- - amixer/amixer.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amixer/amixer.h b/amixer/amixer.h -index 3588f04..0daa5b7 100644 ---- a/amixer/amixer.h -+++ b/amixer/amixer.h -@@ -18,4 +18,4 @@ - * - */ - --#include "../include/version.h" -+#include "version.h" --- -2.9.2 - diff --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 deleted file mode 100644 index ede469ca..00000000 --- a/pkg/alsa-utils/patch/0002-aplay-Error-on-WAV-files-with-more-than-256-channels.patch +++ /dev/null @@ -1,90 +0,0 @@ -From f06989024588dc370962e4d7e46f29c5a92facae 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 cc51dcb..288ac05 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -1066,7 +1066,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); - } -@@ -1241,7 +1241,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; -@@ -2144,7 +2144,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; -@@ -2237,7 +2237,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) - if (in_aborting) - goto abort; - 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; -@@ -3310,7 +3310,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(); -@@ -3364,7 +3364,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(); -@@ -3401,7 +3401,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; - -@@ -3454,7 +3454,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.31.1 - |
