Skip to content

Commit

Permalink
alsa-utils: Update to 1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelforney
michaelforney committed Oct 26, 2020
1 parent 3356088 commit b481ee3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions pkg/alsa-utils/aconfig.h
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions pkg/alsa-utils/patch/0002-aplay-Error-on-WAV-files-with-more-than-256-channels.patch
View file
@@ -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 <mforney@mforney.org>
Date: Sun, 11 Aug 2019 04:26:06 +0000
Subject: [PATCH] aplay: Error on WAV files with more than 256 channels
Expand All @@ -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)
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -86,5 +86,5 @@ index 08395f6..91765e7 100644
fds[channel] = -1;

--
2.25.0
2.29.0

2 changes: 1 addition & 1 deletion pkg/alsa-utils/src
Submodule src updated 41 files
+23 −19 alsa-info/alsa-info.sh
+5 −0 alsactl/alsactl.1
+4 −0 alsactl/alsactl.c
+2 −1 alsactl/alsactl.h
+1 −1 alsactl/init/00main
+10 −6 alsactl/init_parse.c
+1 −1 alsactl/utils.c
+6 −3 alsaloop/pcmjob.c
+5 −0 alsamixer/Makefile.am
+132 −0 alsamixer/bindings.c
+81 −0 alsamixer/bindings.h
+18 −89 alsamixer/card_select.c
+30 −2 alsamixer/cli.c
+81 −79 alsamixer/colors.c
+30 −22 alsamixer/colors.h
+592 −0 alsamixer/configparser.c
+9 −0 alsamixer/configparser.h
+274 −0 alsamixer/curskey.c
+37 −0 alsamixer/curskey.h
+9 −11 alsamixer/device_name.c
+3 −1 alsamixer/mainloop.c
+1 −1 alsamixer/mainloop.h
+92 −0 alsamixer/menu_widget.c
+10 −0 alsamixer/menu_widget.h
+136 −0 alsamixer/mixer_clickable.c
+21 −0 alsamixer/mixer_clickable.h
+74 −53 alsamixer/mixer_display.c
+140 −128 alsamixer/mixer_widget.c
+8 −0 alsamixer/mixer_widget.h
+16 −78 alsamixer/proc_files.c
+31 −93 alsamixer/textbox.c
+35 −0 alsamixer/utils.c
+1 −0 alsamixer/utils.h
+8 −2 alsamixer/widget.c
+2 −0 alsaucm/usecase.c
+2 −2 aplay/aplay.1
+25 −20 aplay/aplay.c
+1 −1 axfer/axfer-transfer.1
+2 −2 bat/alsabat.1
+1 −1 configure.ac
+6 −4 topology/topology.c
2 changes: 1 addition & 1 deletion pkg/alsa-utils/ver
View file
@@ -1 +1 @@
1.2.3 r0
1.2.4 r0
4 changes: 2 additions & 2 deletions pkg/alsa-utils/version.h
View file
@@ -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"

0 comments on commit b481ee3

Please sign in to comment.