commit: db2038052c929ca06bc315ba06e7bfa837fc1418
parent cc1f4c24778bfbd2a7d28f32661009deaeecfbf5
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 27 Jun 2021 01:40:32 -0700
alsa-utils: Update to 1.2.5.1
Diffstat:
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/pkg/alsa-utils/aconfig.h b/pkg/alsa-utils/aconfig.h
@@ -3,11 +3,11 @@
/* #undef ENABLE_NLS_IN_CURSES */
#define HAVE_ALSA_MIXER_H 1
#define HAVE_ALSA_PCM_H 1
-/* #undef HAVE_ALSA_RAWMIDI_H */
+#define HAVE_ALSA_RAWMIDI_H 1
#define HAVE_ALSA_SEQ_H 1
/* #undef HAVE_ALSA_TOPOLOGY_H */
#define HAVE_ALSA_USE_CASE_H 1
-/* #undef HAVE_CFLOCALECOPYCURRENT */
+/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
#define HAVE_CLOCK_GETTIME 1
/* #undef HAVE_CURSES_ESCDELAY */
@@ -23,6 +23,7 @@
#define HAVE_LIBPTHREAD 1
#define HAVE_LIBRT 1
/* #undef HAVE_LIBTINYALSA */
+#define HAVE_MEMFD_CREATE 1
/* #undef HAVE_MEMORY_H */
/* #undef HAVE_MENU_H */
/* #undef HAVE_PANEL_H */
@@ -39,14 +40,14 @@
#define PACKAGE "alsa-utils"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "alsa-utils"
-#define PACKAGE_STRING "alsa-utils 1.2.4"
+#define PACKAGE_STRING "alsa-utils 1.2.5.1"
#define PACKAGE_TARNAME "alsa-utils"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.2.4"
+#define PACKAGE_VERSION "1.2.5.1"
#define SOUNDSDIR "/share/sounds/alsa"
#define STDC_HEADERS 1
#define TIME_WITH_SYS_TIME 1
-#define VERSION "1.2.4"
+#define VERSION "1.2.5.1"
/* #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
@@ -1,4 +1,4 @@
-From 2be689a3a8bb453d7ed588eeae6e32cb7c71e488 Mon Sep 17 00:00:00 2001
+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
@@ -10,10 +10,10 @@ 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 0a65ad6..7c7ba71 100644
+index cc51dcb..288ac05 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)
+@@ -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);
@@ -22,7 +22,7 @@ index 0a65ad6..7c7ba71 100644
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)
+@@ -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;
@@ -31,7 +31,7 @@ index 0a65ad6..7c7ba71 100644
snd_pcm_chmap_t *hw_chmap;
unsigned int ch, i;
int err;
-@@ -2085,7 +2085,7 @@ static ssize_t pcm_writev(u_char **data, unsigned int channels, size_t count)
+@@ -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;
@@ -40,7 +40,7 @@ index 0a65ad6..7c7ba71 100644
size_t offset = result;
for (channel = 0; channel < channels; channel++)
bufs[channel] = data[channel] + offset * bits_per_sample / 8;
-@@ -2178,7 +2178,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
+@@ -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;
@@ -49,7 +49,7 @@ index 0a65ad6..7c7ba71 100644
size_t offset = result;
for (channel = 0; channel < channels; channel++)
bufs[channel] = data[channel] + offset * bits_per_sample / 8;
-@@ -3247,7 +3247,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t
+@@ -3310,7 +3310,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 0a65ad6..7c7ba71 100644
header(rtype, names[0]);
set_params();
-@@ -3299,7 +3299,7 @@ static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtyp
+@@ -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;
@@ -67,7 +67,7 @@ index 0a65ad6..7c7ba71 100644
header(rtype, names[0]);
set_params();
-@@ -3336,7 +3336,7 @@ static void playbackv(char **names, unsigned int count)
+@@ -3401,7 +3401,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 0a65ad6..7c7ba71 100644
for (channel = 0; channel < channels; ++channel)
fds[channel] = -1;
-@@ -3389,7 +3389,7 @@ static void capturev(char **names, unsigned int count)
+@@ -3454,7 +3454,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 0a65ad6..7c7ba71 100644
fds[channel] = -1;
--
-2.29.0
+2.31.1
