commit: 29b0d64dd0221c051b4d5cd619c87645ac630b19
parent c73cf94e0daaef825c57b2bfb3dfb85b806c9b54
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 31 Aug 2021 19:24:16 -0700
Remove alsa-utils in favor of tinyalsa
Diffstat:
10 files changed, 0 insertions(+), 216 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -6,10 +6,6 @@
path = pkg/alsa-lib/src
url = https://github.com/alsa-project/alsa-lib.git
ignore = all
-[submodule "pkg/alsa-utils/src"]
- path = pkg/alsa-utils/src
- url = https://github.com/alsa-project/alsa-utils.git
- ignore = all
[submodule "pkg/atinout/src"]
path = pkg/atinout/src
url = https://git.code.sf.net/p/atinout/code
diff --git a/pkg/alsa-utils/README.md b/pkg/alsa-utils/README.md
@@ -1,11 +0,0 @@
-# alsa-utils
-
-## config.h
-Generated with
-
- ./configure \
- --prefix= \
- --disable-alsamixer \
- --disable-nls \
- CPPFLAGS=-I/src/oasis/out/pkg/alsa-lib/include \
- LDFLAGS=-L/src/oasis/out/pkg/alsa-lib
diff --git a/pkg/alsa-utils/aconfig.h b/pkg/alsa-utils/aconfig.h
@@ -1,60 +0,0 @@
-#define DATADIR "/share/alsa"
-/* #undef ENABLE_NLS */
-/* #undef ENABLE_NLS_IN_CURSES */
-#define HAVE_ALSA_MIXER_H 1
-#define HAVE_ALSA_PCM_H 1
-#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_CFLOCALECOPYPREFERREDLANGUAGES */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-#define HAVE_CLOCK_GETTIME 1
-/* #undef HAVE_CURSES_ESCDELAY */
-/* #undef HAVE_DCGETTEXT */
-/* #undef HAVE_FORM_H */
-/* #undef HAVE_GETTEXT */
-/* #undef HAVE_ICONV */
-/* #undef HAVE_INTTYPES_H */
-#define HAVE_LIBASOUND 1
-/* #undef HAVE_LIBATOPOLOGY */
-/* #undef HAVE_LIBFFTW3F */
-#define HAVE_LIBM 1
-#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 */
-/* #undef HAVE_SAMPLERATE_H */
-/* #undef HAVE_SEQ_CLIENT_INFO_GET_CARD */
-/* #undef HAVE_SEQ_CLIENT_INFO_GET_PID */
-/* #undef HAVE_STDINT_H */
-/* #undef HAVE_STDLIB_H */
-/* #undef HAVE_STRINGS_H */
-/* #undef HAVE_STRING_H */
-/* #undef HAVE_SYS_STAT_H */
-/* #undef HAVE_SYS_TYPES_H */
-/* #undef HAVE_UNISTD_H */
-#define PACKAGE "alsa-utils"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "alsa-utils"
-#define PACKAGE_STRING "alsa-utils 1.2.5.1"
-#define PACKAGE_TARNAME "alsa-utils"
-#define PACKAGE_URL ""
-#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.5.1"
-/* #undef WITH_FFADO */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGE_FILES */
-/* #undef const */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
diff --git a/pkg/alsa-utils/gen.lua b/pkg/alsa-utils/gen.lua
@@ -1,21 +0,0 @@
-cflags{
- '-D _GNU_SOURCE=',
- '-I $dir',
- '-I $srcdir/include',
- '-isystem $builddir/pkg/alsa-lib/include',
-}
-
-pkg.deps = {'pkg/alsa-lib/headers'}
-
-exe('bin/amixer', {'amixer/amixer.c', 'amixer/volume_mapping.c', '$builddir/pkg/alsa-lib/libasound.a'})
-file('bin/amixer', '755', '$outdir/bin/amixer')
-man{'amixer/amixer.1'}
-
-exe('bin/aplay', {'aplay/aplay.c', '$builddir/pkg/alsa-lib/libasound.a'})
-file('bin/aplay', '755', '$outdir/bin/aplay')
-man{'aplay/aplay.1'}
-
-sym('bin/arecord', 'aplay')
-sym('share/man/man1/arecord.1.gz', 'aplay.1.gz')
-
-fetch 'git'
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
@@ -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
@@ -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
-
diff --git a/pkg/alsa-utils/src b/pkg/alsa-utils/src
@@ -1 +0,0 @@
-Subproject commit 9e59c928afb0e3e1d9cdcbcac21cc1affc395400
diff --git a/pkg/alsa-utils/ver b/pkg/alsa-utils/ver
@@ -1 +0,0 @@
-1.2.5.1 r0
diff --git a/pkg/alsa-utils/version.h b/pkg/alsa-utils/version.h
@@ -1,5 +0,0 @@
-#define SND_UTIL_MAJOR 1
-#define SND_UTIL_MINOR 2
-#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.4"
diff --git a/pkg/gen.lua b/pkg/gen.lua
@@ -2,7 +2,6 @@ subgen 'acme-client'
subgen 'acpid'
subgen 'adobe-source-fonts'
subgen 'alsa-lib'
-subgen 'alsa-utils'
subgen 'atinout'
subgen 'awk'
subgen 'b3sum'
