From b481ee3af7360db9dc3b67d4cc3cbe8eda228fc0 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 26 Oct 2020 02:57:32 -0700 Subject: [PATCH] alsa-utils: Update to 1.2.4 --- pkg/alsa-utils/aconfig.h | 8 +++---- ...AV-files-with-more-than-256-channels.patch | 22 +++++++++---------- pkg/alsa-utils/src | 2 +- pkg/alsa-utils/ver | 2 +- pkg/alsa-utils/version.h | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/alsa-utils/aconfig.h b/pkg/alsa-utils/aconfig.h index fe1dcd2b..15fe161d 100644 --- a/pkg/alsa-utils/aconfig.h +++ b/pkg/alsa-utils/aconfig.h @@ -6,7 +6,7 @@ /* #undef HAVE_ALSA_RAWMIDI_H */ #define HAVE_ALSA_SEQ_H 1 /* #undef HAVE_ALSA_TOPOLOGY_H */ -/* #undef HAVE_ALSA_USE_CASE_H */ +#define HAVE_ALSA_USE_CASE_H 1 /* #undef HAVE_CFLOCALECOPYCURRENT */ /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ #define HAVE_CLOCK_GETTIME 1 @@ -39,14 +39,14 @@ #define PACKAGE "alsa-utils" #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "alsa-utils" -#define PACKAGE_STRING "alsa-utils 1.2.3" +#define PACKAGE_STRING "alsa-utils 1.2.4" #define PACKAGE_TARNAME "alsa-utils" #define PACKAGE_URL "" -#define PACKAGE_VERSION "1.2.3" +#define PACKAGE_VERSION "1.2.4" #define SOUNDSDIR "/share/sounds/alsa" #define STDC_HEADERS 1 #define TIME_WITH_SYS_TIME 1 -#define VERSION "1.2.3" +#define VERSION "1.2.4" /* #undef WITH_FFADO */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 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 index 6f66a059..e3bdb857 100644 --- 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 @@ -1,4 +1,4 @@ -From 2fbd98389e3ff9f2810c9a6de17c10e2d1f9c1dd Mon Sep 17 00:00:00 2001 +From 2be689a3a8bb453d7ed588eeae6e32cb7c71e488 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 11 Aug 2019 04:26:06 +0000 Subject: [PATCH] aplay: Error on WAV files with more than 256 channels @@ -10,7 +10,7 @@ limit for channels manually specified on the command-line anyway. 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/aplay/aplay.c b/aplay/aplay.c -index 08395f6..91765e7 100644 +index 0a65ad6..7c7ba71 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) @@ -31,7 +31,7 @@ index 08395f6..91765e7 100644 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) +@@ -2085,7 +2085,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; @@ -40,16 +40,16 @@ index 08395f6..91765e7 100644 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) { +@@ -2178,7 +2178,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; -@@ -3242,7 +3242,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t +@@ -3247,7 +3247,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t size_t vsize; unsigned int channel; @@ -58,7 +58,7 @@ index 08395f6..91765e7 100644 header(rtype, names[0]); set_params(); -@@ -3294,7 +3294,7 @@ static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtyp +@@ -3299,7 +3299,7 @@ static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtyp ssize_t r; unsigned int channel; size_t vsize; @@ -67,7 +67,7 @@ index 08395f6..91765e7 100644 header(rtype, names[0]); set_params(); -@@ -3331,7 +3331,7 @@ static void playbackv(char **names, unsigned int count) +@@ -3336,7 +3336,7 @@ static void playbackv(char **names, unsigned int count) unsigned int channel; unsigned int channels = rhwparams.channels; int alloced = 0; @@ -76,7 +76,7 @@ index 08395f6..91765e7 100644 for (channel = 0; channel < channels; ++channel) fds[channel] = -1; -@@ -3384,7 +3384,7 @@ static void capturev(char **names, unsigned int count) +@@ -3389,7 +3389,7 @@ static void capturev(char **names, unsigned int count) unsigned int channel; unsigned int channels = rhwparams.channels; int alloced = 0; @@ -86,5 +86,5 @@ index 08395f6..91765e7 100644 fds[channel] = -1; -- -2.25.0 +2.29.0 diff --git a/pkg/alsa-utils/src b/pkg/alsa-utils/src index 247d9e33..b2ae0b07 160000 --- a/pkg/alsa-utils/src +++ b/pkg/alsa-utils/src @@ -1 +1 @@ -Subproject commit 247d9e336d56d223f1e51dd164c39d82af5a5523 +Subproject commit b2ae0b074669f976c53a52bcd0129227321f88c9 diff --git a/pkg/alsa-utils/ver b/pkg/alsa-utils/ver index 3dcecf2e..258c2c41 100644 --- a/pkg/alsa-utils/ver +++ b/pkg/alsa-utils/ver @@ -1 +1 @@ -1.2.3 r0 +1.2.4 r0 diff --git a/pkg/alsa-utils/version.h b/pkg/alsa-utils/version.h index 54126ca1..cb1446f8 100644 --- a/pkg/alsa-utils/version.h +++ b/pkg/alsa-utils/version.h @@ -1,5 +1,5 @@ #define SND_UTIL_MAJOR 1 #define SND_UTIL_MINOR 2 -#define SND_UTIL_SUBMINOR 1 +#define SND_UTIL_SUBMINOR 4 #define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|(SND_UTIL_MINOR<<8)|SND_UTIL_SUBMINOR) -#define SND_UTIL_VERSION_STR "1.2.1" +#define SND_UTIL_VERSION_STR "1.2.4"