From 686690e0441ca3a9372024b92a5fb2fc8db35b8e Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 12 May 2021 14:13:21 +0000 Subject: alsa-utils: Update to 1.2.4 Changelog: 1.2.4 Core Release v1.2.4 ALSA Control (alsactl) alsactl: 00main - fix typo in goto label alsactl: add new -U argument text to man page alsactl: init - add -U option to disable UCM based init alsactl: fix the syslog message - add : delimiter after function:line Audio Transfer utility treewide: fix typos in manual pages alsa-info.sh alsa-info: provide DMI system sku alsa-info.sh: command -v cleanups alsa-info.sh: declare variables separately from the assign (coverity) alsaloop alsaloop: Fix the silence generation in xrun_sync alsamixer alsamixer: remove wrong free(buf) call in read_file() alsamixer: small optimizations alsamixer: added configuration file parser alsamixer: Use a struct for storing color attributes alsamixer: added mouse support alsamixer: Replaced hardcoded keys by binding arrays alsamixer: Fix window_size_changed() alsatplg (topology) topology: check for the remove() error (coverity) topology: fix the error path in load() alsaucm alsaucm: Fix ending with quotes commands aplay/arecord aplay: fix the wrong count in compute_max_peak() for 16bit+ sample widths minor aplay man page correction aplay: Fix typo in error message treewide: fix typos in manual pages aplay: capture: write only the amount of read frames aplay: pcm_read(): return read samples instead of requested upon abort aplay: pcm_readv(): return read samples instead of requested upon abort aplay: fix possible string overflow (coverity) bat (basic audio tester) alsabat: fix typo 1.2.3 Core Release v1.2.3 github actions: ubuntu - fix the non-interactive build github workflow: fix tag fetch ALSA Control (alsactl) alsactl: ucm - rename _once command to _boot command alsactl: allow to compile alsactl without UCM support alsactl: use the right priority for syslog messages alsactl: add -D argument to execute also the UCM defaults section alsactl: redirect alsa-lib errors alsactl: add initial support for UCM init alsactl: init - iterate through all cards for the initial settings alsactl: daemon.c - fix gcc warning in write_pid_file() alsactl: fix error handling for sched_setscheduler() call alsactl: avoid needless wakeups in monitor loop. alsactl: don't exit on EINTR from epoll_wait(). alsa-info.sh alsa-info.sh: increase version to 0.4.65 alsa-info: initial rpm/deb package info alsa-info.sh: add ALT to DISTRO list alsaloop alsaloop: reduce cumulative error caused by non-atomic samples calculation alsamixer alsamixer: suppress _XOPEN_SOURCE compile warning alsaucm alsaucm: remove custom rules, alsactl is UCM aware now alsactl: ucm - rename _once command to _boot command amixer amixer: retype to double in convert_prange1() like in convert_prange() amixer: improve the raw percentual volume rounding 1.1.9 Core Release v1.1.9 axfer: add an entry of axfer to README ALSA Control (alsactl) alsactl: monitor - remove dead code in run_dispatcher() (coverity) alsactl: simple coverity fix Audio Transfer utility axfer/test: fix uninitialized warning axfer/test: fix uninitialized warning axfer: Declare global variables as 'extern' in header axfer: Fix creation of v1.2 headers on big-endian systems xfer: fix possible minor memory leak in xfer_options_parse_args() (coverity) axfer: return back unsigned avail variable, do proper retype in xfer-libasound-irq-mmap.c axfer: coverity fixes axfer: add missing header file of unit test to distribution axfer: allow to be compiled with glibc-2.11 or former axfer: correct invalid usage of escape of itaric text axfer: supplement value of options for the manual of transfer subcommand axfer: correct message to notice that help text is implemented axfer: correct description about snoop mode of libffado axfer: fulfill section for backward compatibitity for chmap option axfer: add a section about unit test alsa-info.sh alsa-info.sh: cleanups alsaloop alsaloop: remove unused assignment warning (coverity) alsamixer alsamixer: define _GNU_SOURCE to get exp10 amixer amixer: define _GNU_SOURCE to get exp10 aplay/arecord aplay: check the return value for snd_pcm_sw_params_current() (coverity) aplay: fix the multiple open file descriptors for the raw capture aplaymidi/arecordmidi arecordmidi: simple coverity fix seq: arecordmidi: Add num-events option 1.1.8 Core Release v1.1.8 Makefile.am: add README.md to EXTRA_DIST axfer: add support for libffado transmission backend axfer: add unit test for container interface axfer: add an entry point for this command initial version of .travis.yml rename and update README.md Audio Transfer utility axfer: add an explanation about advantages/issues of Timer-based scheduling model axfer: add an explanation about Timer-based scheduling model axfer: add an explanation about IRQ-based scheduling model axfer: add text for compatibility loss of sw parameter in libasound backend axfer: fulfill manual section for libasound backend axfer: print help for libasound backend axfer: fulfill manual section for libffado backend axfer: print help for libffado backend axfer: correct description about signal handling axfer: fix typo in axfer(1) manual axfer: fix no return statement in print_help() function axfer: enable each backend to print own help axfer: print help text of transfer subcommand just for common options axfer: print help text of list subcommand axfer: print help text of command entry axfer: add a section about design of transfer subcommand axfer: add a section to describe compatibility to aplay(1) axfer: add a manual for transfer subcommand axfer: add a manual for list subcommand axfer: add a manual for entry point axfer: check whether a terminal is referred for stdio axfer: truncate parsed arguments before operating subcommand axfer: use transfer subcommand as a default for compatibility mode to aplay(1) axfer: use second argument in command line for transmission direction axfer: apply refactoring in list subcommand for new command system axfer: apply refactoring to list subcommand for backward compatibility to aplay(1) axfer: add support for libffado transmission backend axfer: obsolete some unimplemented options axfer: add support for timer-based scheduling model with MMAP operation axfer: add an implementation of waiter for epoll(7) axfer: add an implementation of waiter for select(2) axfer: add an implementation of waiter for poll(2) axfer: add an option for waiter type axfer: add a common interface of waiter for I/O event notification axfer: add options for plugins in alsa-lib axfer: add options for software parameters of PCM substream axfer: add options for buffer arrangement axfer: add an option to suppress event waiting axfer: add support for MMAP PCM operation axfer: add support for non-blocking operation axfer: add an option to finish transmission at XRUN axfer: add options related to duration and obsolete '--max-file-size' option axfer: add an option to dump available hardware parameters axfer: add informative output and an option to suppress it axfer: add a sub-command to transfer data frames axfer: add support for blocking data transmission operation of alsa-lib PCM API axfer: add support to transfer data frames by alsa-lib PCM APIs axfer: add a parser for command-line options axfer: add a common interface to transfer data frames axfer: add a unit test for mapper interface axfer: add support for a mapper for multiple target axfer: add support for a mapper for single target axfer: add a common interface to align data frames on different layout axfer: add unit test for container interface axfer: add support for a container of raw data axfer: add support for a container of Creative Tech. voice format axfer: add support for a container of Sparc AU format axfer: add support for a container of Microsoft/IBM RIFF/Wave format axfer: add a common interface to handle a file with audio-specific data format axfer: add a sub-command to print list of PCMs/devices axfer: add an entry point for this command alsaloop alsaloop: more avail_min cleanups alsatplg (topology) topology/topology.c: drop unneeded include aplay/arecord aplay: improve available conditions for '--samples' and '--duration' options aplay: add a paragraph for '--samples' ('-s') option to aplay manual aplay: delete paragraph for obsoleted '--sleep-min' ('-s') option from aplay manual 1.1.7 Core Release v1.1.7 Release v1.1.6 ALSA Control (alsactl) alsactl: lock - fix the array size (gcc warning) alsactl: use signalfd to catch UNIX signal alsactl: handle detection of new sound card alsactl: handle disconnection of sound card alsactl: obsolete array for maintenance of handlers alsactl: use a list of source for event dispatcher instead of an array of source alsactl: use link list to maintain source of events alsactl: use epoll(7) instead of poll(2) alsactl: add an iterator of registered instances of sound card alsactl: split event loop code to a function Speaker Test speaker-test: Allow sampling rates up to 768000 speaker-test: Remove unused variable speaker-test: Support S24_3LE sample format alsaloop alsaloop: pcmjob - fix few warnings alsamixer alsamixer: fix gcc warnings alsatplg (topology) alsatplg: add man file alsaucm alsatplg: add man file alsaucm: add alsa-ucm udev rules for PAZ00 (Toshiba AC100/Dynabook AZ). aplay/arecord aplay: add missing block brackets aplay: Fix invalid file size check for non-regular files bat (basic audio tester) alsabat: Allow custom sample format for round trip latency test bat: alsa.c - move the thread cleanup pop before goto exit3 1.1.6 Core Release v1.1.6 ALSA Control (alsactl) alsactl: Only start restore service when asoundrc file exists Change FSF address (Franklin Street) ALSA RawMidi Utility (amidi) Change FSF address (Franklin Street) Speaker Test speaker-test: Refactor the tone-generator codes alsaloop alsaloop: fix a typo in the comparison Change FSF address (Franklin Street) amixer Change FSF address (Franklin Street) aplay/arecord aplay: Fix wav file not being split on 32 bit platforms aplay: Adjust sample rate limits to support newer hardware bat (basic audio tester) bat: alsa.c - move the thread cleanup pop before goto exit3 1.1.5 Core Release v1.1.5 alsactl: Move systemd unit start-up from basic.target to sound.target ALSA Control (alsactl) alsactl: Move systemd unit start-up from basic.target to sound.target alsatplg (topology) alsatplg: fix topology compiler long option parsing topology: delete output file if parsing fails. aplay/arecord aplay: Fix playback for small raw files aplay: Refactor playback code aplay: Add samples argument for playing/recording a given number of samples aplay: interrupt streaming via signal in voc_pcm_write aplay: Fix --max-file-time option 32 bits overflow bat (basic audio tester) alsabat: fix one uninitialized warning issue 1.1.4 Core Release v1.1.4 ALSA Control (alsactl) alsactl: Remove standard output definition in systemd unit ALSA RawMidi Utility (amidi) amidi: optarg might be NULL, fix 't' argument parsing alsa-info.sh alsa-info: add ACPI device status alsa-info: provide more DMI information alsaucm alsaucm: Add alsaucm.rst to EXTRA_DIST aplay/arecord aplay: Introduce and use xwrite helper 1.1.3 Core Release v1.1.3 INSTALL: document how to configure a build for installation in a local dir configure.ac: add a check for rst2man, a reStructuredText man page generator configure.ac: fix the check for xmlto availability alsabat: add amixer config files alsabat: automation test scripts ALSA Control (alsactl) alsactl: Fix potential NULL dereferences in daemon mode ALSA RawMidi Utility (amidi) amidi: add sysex-interval option amidi: fix timeout handling amidi: ignore not only Active Sensing but also Clock bytes Speaker Test speaker-test: Fix chmap wav file selection. alsaloop alsaloop: try adapt avail_min for playback to avoid 100% CPU usage alsaucm alsaucm: add a man page, generated from reStructuredText alsaucm: mention the "list1" command in the usage output aplay/arecord aplay: Fix to handle pause when system is suspended/Resumed bat (basic audio tester) alsabat: add system power management S3 test alsabat: fix alsabat -86 error alsabat: add amixer config files alsabat: automation test scripts 1.1.2 Core Release v1.1.2 alsabat: align the data type on float aplay/arecord aplay: fix lurking capture file overwrite bug bat (basic audio tester) alsabat: make snr_is_valid static alsabat: fix a missing break in switch alsabat: add noise detection alsabat: add a single channel sine wave generator alsabat: add channels parameter for adjust_waveform() alsabat: align the data type on float alsabat: add round trip audio latency test alsabat: fix a possible memory leak alsabat: add buffer size and period size settings alsabat: add terminate status check for capture thread --- audio/alsa-utils/Makefile | 11 ++++++++--- audio/alsa-utils/PLIST | 6 +++++- audio/alsa-utils/distinfo | 17 +++++++++-------- audio/alsa-utils/patches/patch-aa | 8 ++++---- audio/alsa-utils/patches/patch-ab | 10 +++++----- audio/alsa-utils/patches/patch-alsactl_alsactl.c | 14 ++++++++++++++ .../patches/patch-alsamixer_volume__mapping.c | 19 ------------------- audio/alsa-utils/patches/patch-bat_alsa.c | 15 +++++++++++++++ 8 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 audio/alsa-utils/patches/patch-alsactl_alsactl.c delete mode 100644 audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c create mode 100644 audio/alsa-utils/patches/patch-bat_alsa.c (limited to 'audio') diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index 76a15596954..95cdb994bec 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2018/04/21 13:38:04 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2021/05/12 14:13:21 ryoon Exp $ -DISTNAME= alsa-utils-1.1.1 -PKGREVISION= 1 +DISTNAME= alsa-utils-1.2.4 CATEGORIES= audio MASTER_SITES= ftp://ftp.alsa-project.org/pub/utils/ EXTRACT_SUFX= .tar.bz2 @@ -17,8 +16,12 @@ USE_PKGLOCALEDIR= yes USE_NCURSES= yes LDFLAGS.DragonFly= -lm LDFLAGS.SunOS+= -lm -lsocket -lnsl +LDFLAGS.NetBSD+= -lepoll-shim +LDFLAGS.NetBSD+= -linotify CPPFLAGS.NetBSD+= -D__u32=uint32_t -D__u64=uint64_t CPPFLAGS.NetBSD+= -Dbswap_16=bswap16 -Dbswap_32=bswap32 +CPPFLAGS.NetBSD+= -Doff64_t=off_t +CPPFLAGS.NetBSD+= -Dlseek64=lseek CFLAGS+= -g @@ -31,6 +34,8 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto CONFIGURE_ARGS+= --disable-nls .include "../../audio/alsa-lib/buildlink3.mk" +.include "../../devel/libepoll-shim/buildlink3.mk" +.include "../../devel/libinotify/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../math/fftw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/alsa-utils/PLIST b/audio/alsa-utils/PLIST index b63a161e1df..a471fdea595 100644 --- a/audio/alsa-utils/PLIST +++ b/audio/alsa-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2016/04/15 08:50:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2021/05/12 14:13:21 ryoon Exp $ bin/aconnect bin/alsabat bin/alsaloop @@ -13,6 +13,7 @@ bin/arecord bin/arecordmidi bin/aseqdump bin/aseqnet +bin/axfer bin/iecset bin/speaker-test man/fr/man8/alsaconf.8 @@ -30,6 +31,9 @@ man/man1/arecord.1 man/man1/arecordmidi.1 man/man1/aseqdump.1 man/man1/aseqnet.1 +man/man1/axfer-list.1 +man/man1/axfer-transfer.1 +man/man1/axfer.1 man/man1/iecset.1 man/man1/speaker-test.1 man/man7/alsactl_init.7 diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index f0d028553c3..9628ecb0e3d 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.11 2016/04/15 08:50:21 wiz Exp $ +$NetBSD: distinfo,v 1.12 2021/05/12 14:13:21 ryoon Exp $ -SHA1 (alsa-utils-1.1.1.tar.bz2) = a5fb61b41685001c9a2a41a38e61cdaf7e60ef2e -RMD160 (alsa-utils-1.1.1.tar.bz2) = efa1dc575a1a08e48c17f83eeddd85c7e168da6b -SHA512 (alsa-utils-1.1.1.tar.bz2) = 3af1e43cb2eab7e5119d83036ab6f4eeb106b66b4a57122cc8df243b6dbda90d39a0290a2af3a904b4929e2d90e8fcded9eda2a38bae1fd8e371a6d7a043376e -Size (alsa-utils-1.1.1.tar.bz2) = 1186408 bytes -SHA1 (patch-aa) = 78087e7a7fe860e002d592b0c7b83e98b10ea2c3 -SHA1 (patch-ab) = 6bbdb3c16e49b6fba05120c243292c9ef51ebca4 +SHA1 (alsa-utils-1.2.4.tar.bz2) = 84b2c5e8f0c345844e03e8e4ae73b761c3ae8829 +RMD160 (alsa-utils-1.2.4.tar.bz2) = 7bb2671858cf3d631e98a22be8f4de35eb4b5d8f +SHA512 (alsa-utils-1.2.4.tar.bz2) = 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770 +Size (alsa-utils-1.2.4.tar.bz2) = 1286259 bytes +SHA1 (patch-aa) = c1f3ef3636640d7ccdc2430b4b6b417f3ea1363f +SHA1 (patch-ab) = a24b76ddf0573679113d99e428229c5c81a486eb SHA1 (patch-ac) = 19f9570bedfb00068aad244033eb6e6436a6546d SHA1 (patch-ad) = 4da5adfbd3fcc0611c6394bf00f2b684e735dbd2 +SHA1 (patch-alsactl_alsactl.c) = e9e63fd8d4fe50da918faae8e77ac1cf71dd74d0 SHA1 (patch-alsaloop_alsaloop.c) = f281b7cdc75a31a4b06fbce56fc2c51b2371cd0b SHA1 (patch-alsaloop_pcmjob.c) = 9a09a103d390ee5d7586e19c688a2c621ee1c6f6 -SHA1 (patch-alsamixer_volume__mapping.c) = a543c74ba4f3f3b3cc7768623fbca760b06a7872 +SHA1 (patch-bat_alsa.c) = e38111b0541c76f9d7d8330e59b2294e7f8ab820 diff --git a/audio/alsa-utils/patches/patch-aa b/audio/alsa-utils/patches/patch-aa index e5a48681c4f..70033a4b59d 100644 --- a/audio/alsa-utils/patches/patch-aa +++ b/audio/alsa-utils/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2014/06/09 12:34:26 ryoon Exp $ +$NetBSD: patch-aa,v 1.4 2021/05/12 14:13:22 ryoon Exp $ ---- configure.orig 2013-07-10 07:29:37.000000000 +0000 +--- configure.orig 2020-10-15 11:46:16.000000000 +0000 +++ configure -@@ -7112,7 +7112,7 @@ if test "$alsa_prefix" != "" ; then +@@ -7575,7 +7575,7 @@ if test "$alsa_prefix" != "" ; then LDFLAGS="$LDFLAGS $ALSA_LIBS" fi --ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" +-ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" +ALSA_LIBS="$(pkg-config --libs alsa)" LIBS="$ALSA_LIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 diff --git a/audio/alsa-utils/patches/patch-ab b/audio/alsa-utils/patches/patch-ab index c62d76bfc30..e7a2ae5f2a9 100644 --- a/audio/alsa-utils/patches/patch-ab +++ b/audio/alsa-utils/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2014/09/24 11:10:38 jperkin Exp $ +$NetBSD: patch-ab,v 1.6 2021/05/12 14:13:22 ryoon Exp $ ---- aplay/aplay.c.orig 2013-07-09 15:28:37.000000000 +0000 +--- aplay/aplay.c.orig 2020-10-15 11:32:33.000000000 +0000 +++ aplay/aplay.c -@@ -48,7 +48,11 @@ +@@ -49,7 +49,11 @@ #include #include #include @@ -11,10 +11,10 @@ $NetBSD: patch-ab,v 1.5 2014/09/24 11:10:38 jperkin Exp $ +#elif !defined(__sun) +#include +#endif - #include "aconfig.h" #include "gettext.h" #include "formats.h" -@@ -70,6 +74,22 @@ + #include "version.h" +@@ -72,6 +76,22 @@ #define be32toh(x) __be32_to_cpu(x) #endif diff --git a/audio/alsa-utils/patches/patch-alsactl_alsactl.c b/audio/alsa-utils/patches/patch-alsactl_alsactl.c new file mode 100644 index 00000000000..28d20d6c014 --- /dev/null +++ b/audio/alsa-utils/patches/patch-alsactl_alsactl.c @@ -0,0 +1,14 @@ +$NetBSD: patch-alsactl_alsactl.c,v 1.1 2021/05/12 14:13:22 ryoon Exp $ + +--- alsactl/alsactl.c.orig 2020-10-15 11:32:33.000000000 +0000 ++++ alsactl/alsactl.c +@@ -155,6 +155,9 @@ static void help(void) + } + + #define NO_NICE (-100000) ++#if !defined(SCHED_IDLE) ++#define SCHED_IDLE SCHED_OTHER ++#endif + + static void do_nice(int use_nice, int sched_idle) + { diff --git a/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c b/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c deleted file mode 100644 index caa9e5c208e..00000000000 --- a/audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-alsamixer_volume__mapping.c,v 1.2 2014/09/24 11:10:38 jperkin Exp $ - -* NetBSD and SunOS have no exp10() - ---- alsamixer/volume_mapping.c.orig 2013-07-09 15:28:37.000000000 +0000 -+++ alsamixer/volume_mapping.c -@@ -37,10 +37,10 @@ - #include - #include "volume_mapping.h" - --#ifdef __UCLIBC__ -+#if defined(__UCLIBC__) || defined(__NetBSD__) || defined(__sun) - /* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ - #define exp10(x) (exp((x) * log(10))) --#endif /* __UCLIBC__ */ -+#endif /* __UCLIBC__ || __NetBSD__ || __sun */ - - #define MAX_LINEAR_DB_SCALE 24 - diff --git a/audio/alsa-utils/patches/patch-bat_alsa.c b/audio/alsa-utils/patches/patch-bat_alsa.c new file mode 100644 index 00000000000..02e33d15bb1 --- /dev/null +++ b/audio/alsa-utils/patches/patch-bat_alsa.c @@ -0,0 +1,15 @@ +$NetBSD: patch-bat_alsa.c,v 1.1 2021/05/12 14:13:22 ryoon Exp $ + +--- bat/alsa.c.orig 2020-10-15 11:32:33.000000000 +0000 ++++ bat/alsa.c +@@ -29,6 +29,10 @@ + #include "alsa.h" + #include "latencytest.h" + ++#if !defined(ESTRPIPE) ++#define ESTRPIPE EPIPE ++#endif ++ + struct pcm_container { + snd_pcm_t *handle; + snd_pcm_uframes_t period_size; -- cgit v1.2.3