commit: ff10d722b657d1ad3ec85d7fe125a53c8d36f085
parent e0b1383ffb09c5d241a29949f33124cb01a0ad81
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 13 Nov 2019 23:34:57 -0800
alsa-utils: Update to 1.2.1
Diffstat:
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pkg/alsa-utils/aconfig.h b/pkg/alsa-utils/aconfig.h
@@ -38,14 +38,14 @@
#define PACKAGE "alsa-utils"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "alsa-utils"
-#define PACKAGE_STRING "alsa-utils 1.1.9"
+#define PACKAGE_STRING "alsa-utils 1.2.1"
#define PACKAGE_TARNAME "alsa-utils"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.1.9"
+#define PACKAGE_VERSION "1.2.1"
#define SOUNDSDIR "/share/sounds/alsa"
#define STDC_HEADERS 1
#define TIME_WITH_SYS_TIME 1
-#define VERSION "1.1.9"
+#define VERSION "1.2.1"
/* #undef WITH_FFADO */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
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,4 +1,4 @@
-From e835394dfbff2f34bbb081a6b0bd302e99e384b6 Mon Sep 17 00:00:00 2001
+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
@@ -8,10 +8,10 @@ Subject: [PATCH] amixer: Use %lli for long long in printf
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amixer/amixer.c b/amixer/amixer.c
-index 64fd4bb..00b0018 100644
+index f7f31f0..7048cac 100644
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
-@@ -617,7 +617,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem,
+@@ -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:
@@ -20,7 +20,7 @@ index 64fd4bb..00b0018 100644
snd_ctl_elem_info_get_min64(info),
snd_ctl_elem_info_get_max64(info),
snd_ctl_elem_info_get_step64(info));
-@@ -659,7 +659,7 @@ static int show_control(const char *space, snd_hctl_elem_t *elem,
+@@ -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:
@@ -30,5 +30,5 @@ index 64fd4bb..00b0018 100644
case SND_CTL_ELEM_TYPE_ENUMERATED:
printf("%u", snd_ctl_elem_value_get_enumerated(control, idx));
--
-2.22.0
+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,4 +1,4 @@
-From 495ea3f8ad785342e5e48ccc4a54a90ec7adff30 Mon Sep 17 00:00:00 2001
+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
@@ -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 d789222..a43ca55 100644
+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)
@@ -31,7 +31,7 @@ index d789222..a43ca55 100644
snd_pcm_chmap_t *hw_chmap;
unsigned int ch, i;
int err;
-@@ -2084,7 +2084,7 @@ static ssize_t pcm_writev(u_char **data, unsigned int channels, size_t count)
+@@ -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;
@@ -40,7 +40,7 @@ index d789222..a43ca55 100644
size_t offset = result;
for (channel = 0; channel < channels; channel++)
bufs[channel] = data[channel] + offset * bits_per_sample / 8;
-@@ -2172,7 +2172,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
+@@ -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;
@@ -49,7 +49,7 @@ index d789222..a43ca55 100644
size_t offset = result;
for (channel = 0; channel < channels; channel++)
bufs[channel] = data[channel] + offset * bits_per_sample / 8;
-@@ -3238,7 +3238,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t
+@@ -3240,7 +3240,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 d789222..a43ca55 100644
header(rtype, names[0]);
set_params();
-@@ -3290,7 +3290,7 @@ static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtyp
+@@ -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;
@@ -67,7 +67,7 @@ index d789222..a43ca55 100644
header(rtype, names[0]);
set_params();
-@@ -3327,7 +3327,7 @@ static void playbackv(char **names, unsigned int count)
+@@ -3329,7 +3329,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 d789222..a43ca55 100644
for (channel = 0; channel < channels; ++channel)
fds[channel] = -1;
-@@ -3380,7 +3380,7 @@ static void capturev(char **names, unsigned int count)
+@@ -3382,7 +3382,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 d789222..a43ca55 100644
fds[channel] = -1;
--
-2.22.0
+2.24.0
diff --git a/pkg/alsa-utils/ver b/pkg/alsa-utils/ver
@@ -1 +1 @@
-1.1.9 r2
+1.2.1 r0
diff --git 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 1
-#define SND_UTIL_SUBMINOR 9
+#define SND_UTIL_MINOR 2
+#define SND_UTIL_SUBMINOR 1
#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|(SND_UTIL_MINOR<<8)|SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR "1.1.9"
+#define SND_UTIL_VERSION_STR "1.2.1"
