.gear/alsa-utils-git.patch | 84 +++++ .gear/rules | 3 + .../tags/618e583be2ca57343f3e3c651c6e6783a4647c98 | 133 +++++++ .gear/tags/list | 1 + alsa-utils.spec | 401 +++++++++++++++++++++ alsaconf/alsaconf.in | 20 +- alsactl/init_sysdeps.c | 2 +- configure.ac | 3 + 8 files changed, 627 insertions(+), 20 deletions(-) diff --git a/.gear/alsa-utils-git.patch b/.gear/alsa-utils-git.patch new file mode 100644 index 0000000..9851a38 --- /dev/null +++ b/.gear/alsa-utils-git.patch @@ -0,0 +1,84 @@ +From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 1 Jun 2021 17:47:42 +0200 +Subject: [PATCH 1/2] alsactl: fix the nested iteration + +There may be nested iterations for hw: card names. +Handle this card name in snd_card_iterator_sinit(). + +BugLink: https://github.com/alsa-project/alsa-lib/issues/142 +Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops") +Signed-off-by: Jaroslav Kysela +--- + alsactl/utils.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/alsactl/utils.c b/alsactl/utils.c +index c79fd95..881b505 100644 +--- a/alsactl/utils.c ++++ b/alsactl/utils.c +@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname + int cardno = -1; + + if (cardname) { ++ if (strncmp(cardname, "hw:", 3) == 0) ++ cardname += 3; + cardno = snd_card_get_index(cardname); + if (cardno < 0) { + error("Cannot find soundcard '%s'...", cardname); +-- +2.30.2 + + +From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001 +From: Chao Song +Date: Mon, 31 May 2021 10:29:57 +0800 +Subject: [PATCH 2/2] topology: fix potential null pointer from strchr + +This patch adds check to the return pointer from strchr, +because it may be null and cause segment fault, if component +is not properly constructed. + +Fixes: https://github.com/alsa-project/alsa-utils/pull/91 +Signed-off-by: Chao Song +Signed-off-by: Jaroslav Kysela +--- + topology/pre-process-dapm.c | 5 +++++ + topology/pre-process-object.c | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c +index 450ca71..dbaf2f1 100644 +--- a/topology/pre-process-dapm.c ++++ b/topology/pre-process-dapm.c +@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp, + + /* get class name */ + args = strchr(string, '.'); ++ if (!args) { ++ SNDERR("Error getting class name for %s\n", string); ++ return -EINVAL; ++ } ++ + class_name = calloc(1, strlen(string) - strlen(args) + 1); + if (!class_name) + return -ENOMEM; +diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c +index 09aa375..ac8caec 100644 +--- a/topology/pre-process-object.c ++++ b/topology/pre-process-object.c +@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp, + } + + type = strchr(token_ref, '.'); ++ if(!type) { ++ SNDERR("Error getting type for %s\n", token_ref); ++ return -EINVAL; ++ } ++ + token = calloc(1, strlen(token_ref) - strlen(type) + 1); + if (!token) + return -ENOMEM; +-- +2.30.2 + diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..48de7f6 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +copy: .gear/*.patch +tar: v@version@:. +diff: v@version@:. . diff --git a/.gear/tags/618e583be2ca57343f3e3c651c6e6783a4647c98 b/.gear/tags/618e583be2ca57343f3e3c651c6e6783a4647c98 new file mode 100644 index 0000000..ef5b211 --- /dev/null +++ b/.gear/tags/618e583be2ca57343f3e3c651c6e6783a4647c98 @@ -0,0 +1,133 @@ +object ef62ab34fc418cfcd4ff63ecbbe9b1c0e9e3381c +type commit +tag v1.2.5 +tagger Jaroslav Kysela 1622454708 +0200 + +Release v1.2.5 + +Core + - Release v1.2.5 + - autotools: preparation to use memfd_create(2) + - alsactl: add 'clean' command to remove the application controls +ALSA Control (alsactl) + - alsactl: ucm - try both fixed boot and boot sequences + - alsactl: clean the boot / hotplug card specific configuration directory + - alsactl: snd_ctl_elem_id_compare was renamed to snd_ctl_elem_id_compare_set + - alsactl: use card iterator functions for all card loops + - alsactl: Add ucm support for the FixedBootSequence + - alsactl: fix possible memory leak for dump-cfg + - alsactl: add 'clean' cmd to help, improve man page + - alsactl: fix the compiler warning (uninitialized variable res) + - alsactl: add dump-cfg and dump-state commands + - alsactl: init command now honors -g flag as well + - alsactl: honor ignore_nocards flag in init() + - alsactl: fix some compiler warnings + - alsactl: add 'clean' command to remove the application controls + - alsactl: init - parse() - fix possible double free + - alsactl: init - set_ctl_value() - fix bytes parsing + - alsactl: daemon - read_pid_file() fix the returned code on read error + - alsactl: Remove asound.state file check from alsa-restore.service again + - alsactl: Fix race at creating a lock file + - alsactl: Fix double decrease of lock timeout +ALSA RawMidi Utility (amidi) + - amidi, aseqnet: handle write errors +Audio Transfer utility + - axfer: fix regression of timeout in timer-based scheduling model + - axfer: test: reduce test case for maximum number of samples per frame + - Revert "axfer: test - add run-test-in-tmpdir.sh script" + - axfer: test: reduce test case for maximum number of frame count + - axfer: test: use memfd_create() for mapper-test + - axfer: test: minor code arrangement to use the same file descriptor for mappter-test + - axfer: test: use memfd_create() for container-test + - axfer: test: minor code arrangement to use the same file descriptor for container-test + - axfer: maintain lifetime of file descriptor outside of container module + - axfer: open file descriptor outside of container module + - axfer: minor code arrangement to allocate containers + - axfer: minor code arrangement in a point of opened file descriptor + - axfer: minor code arrangement in a point of stdio detection + - axfer: minor code arrangement for container module in a point of nonblocking flag + - axfer: test - add run-test-in-tmpdir.sh script +Speaker Test + - speaker-test: add support for S24_LE and S24_BE +alsa-info.sh + - alsa-info.sh: Add jack2 (jackdbus) detection + - alsa-info.sh: Use HTTPS instead of HTTP + - alsa-info.sh: add PipeWire daemon detection + - alsa-info.sh: bumb version to 0.5.0 + - alsa-info.sh: add sysfs card info section + - alsa-info.sh: add card number to the ALSA module list section + - alsa-info.sh: add audio keyword to the dmesg filter + - alsa-info: Add lsusb and stream outputs +alsaconf + - Add Basque translation +alsaloop + - alsaloop: man page - correct "rate" option + - alsaloop: samplerate - fix the wrong pointer operation + - alsaloop: get_queued_playback_samples() - simplify code + - alsaloop: fix possible memory leak in create_loopback_handle() +alsamixer + - alsamixer: increase control device name buffer (sysdefault) + - amixer/alsamixer: use sysdefault: devices instead hw: + - alsamixer: use background color instead of COLOR_BLACK + - alsamixer: fix shift in parse_words() + - alsamixer: remove unused variable y in display_scroll_indicators() + - alsamixer: remove dead fcn widget_handle_key() in widget.c + - alsamixer: Fix the mixer views description in man page +alsatplg (topology) + - topology: some whitespace fixups + - topology: pre-process-object: add support for prepocessing child objects + - topology: pre-process-dai: add support for pcm_caps objects + - topology: pre-process-dai: add support for fe_dai objects + - topology: pre-process-dai: add support for hwcfg objects + - topology: pre-process-dai: add support for PCM and BE DAI objects + - topology: pre-process-dapm: add support for route objects + - topology: pre-process-dapm: add support for widget control objects + - topology: pre-process-dapm: add support for scale/ops/channel objects + - topology: pre-process-dapm: Add support for tlv objects + - topology: pre-process-dapm: Add support for DAPM Widget objects + - topology: pre-process-base: add support for VendorToken objects + - topology: pre-process-object: Add support for data objects + - topology: pre-process-obejct: add helper function to get the section config + - topology: pre-process-object: add data section for attributes with token reference + - topology: pre-process-object: Add support for processing Manifest object + - topology: pre-process-object: construct object name from its constructor attributes + - topology: pre-process-object: check attribute validity + - topology/pre-process-object: update object config with attributes + - topology: pre-process-object: Add support for pre-processing Objects + - topology: pre-process-class: add function to convert valid attribute values to integer tuple values + - topology: pre-process-class: add function to look up token_ref for an attribute in class + - topology: pre-process-class: function to get attribute type + - topology: pre-process-class: add funcion to get the name of the unique attribute in a class + - topology: pre-process-class: Add functions to check attribute constraints + - topology: pre-process-class: Add function to look up attribute definition in class + - topology: pre-process-class: Add helper function to look up class definition + - topology: pre-processor: Add a helper function to concat strings + - topology: pre-processor: Add a couple of config helpers + - topology: pre-processor: Add debug print helpers + - topology: Add support for pre-processing Topology2.0 syntax + - topology: fix possible double free in load() +alsaucm + - alsaucm: add 'getval' and 'getival' commands + - ucm: fix typo in docs +amixer + - amixer: Makefile - add volume_mapping.h to noinst_HEADERS + - amixer: add the volume_mapping.h link + - amixer: link volume_mapping.c from alsamixer to amixer + - amixer: don't show help on argument parsing error + - amixer/alsamixer: use sysdefault: devices instead hw: + - amixer: cleanups for valgrind + - amixer: print error when snd_hctl_handle_events() fails + - amixer: Expand on channel docs in man page +aplay/arecord + - aplay: avoid any further PCM writing if in abort + - aplay: fix the wrong pointer dereference in playbackv_go() + - aplay: fix the test position test for playback (avail > delay) + - aplay: add avail > delay checks to --test-position + - aplay: add test code for snd_pcm_status() to --test-position + - aplay: fix the CPU busy loop in the pause handler + - aplay: cosmetic code fix in xrun() + - aplay: try to use 16-bit format to increase capture quality +aseqnet + - amidi, aseqnet: handle write errors + +Signed-off-by: Jaroslav Kysela diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..5cc65ed --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +618e583be2ca57343f3e3c651c6e6783a4647c98 v1.2.5 diff --git a/alsa-utils.spec b/alsa-utils.spec new file mode 100644 index 0000000..215dba1 --- /dev/null +++ b/alsa-utils.spec @@ -0,0 +1,401 @@ +%def_with systemd + +Name: alsa-utils +Version: 1.2.5 +Release: alt1.1 +Epoch: 1 + +Summary: Advanced Linux Sound Architecture (ALSA) utils +License: GPLv2+ +Group: System/Kernel and hardware + +Url: http://www.alsa-project.org +Source: %name-%version.tar +Patch0: %name-%version-%release.patch +# FIXME! delete after 1.2.5.1 release +Patch1: %name-git.patch +Packager: Valery Inozemtsev + +Requires: dialog +Obsoletes: alsa2-utils < 0.9.4 +Provides: alsa2-utils = %version +Conflicts: alsa-utils < 1.0.9a-alt1 + +BuildRequires: intltool libalsa-devel libncursesw-devel xmlto libfftw3-devel +%{?_with_systemd:BuildRequires: systemd-devel} +Requires: libncursesw >= 5.7 +Requires: sysfsutils + +Obsoletes: alsa-bat <= 1.1.0 +Provides: alsa-bat = %version + +%add_findreq_skiplist %_sbindir/alsa-info.sh + +%description +Advanced Linux Sound Architecture (ALSA) utils. Modularized +architecture with support for a large range of ISA and PCI cards. +Fully compatible with OSS/Lite but contains many enhanced features. + +%package -n aplay +Summary: play utility for ALSA +Group: Sound + +%description -n aplay +This package contains minimal client utility for ALSA: +"aplay" is traditional "play" equivalent. + +%package -n amixer +Summary: Command-line mixer for ALSA soundcard driver +License: GPL-2.0-or-later +Group: Sound + +%description -n amixer +amixer allows command-line control of the mixer for the ALSA soundcard +driver. amixer supports multiple soundcards. + +%prep +%setup +%patch0 -p1 +%patch1 -p1 +touch config.rpath + +%build +%autoreconf +%configure \ + --with-curses=ncursesw \ + %{?_with_systemd:--with-systemdsystemunitdir=%_unitdir} \ + --disable-alsaconf +%make_build + +%install +%makeinstall_std +%find_lang --with-man --output=%name.lang %name + +%files -f %name.lang +%doc ChangeLog README* +%_udevrulesdir/*.rules +%_bindir/* +%exclude %_bindir/aplay +%exclude %_bindir/arecord +%exclude %_bindir/amixer +%_sbindir/* +%_datadir/alsa/speaker-test +%_datadir/alsa/init +%_datadir/sounds/alsa +%_man1dir/*.1* +%exclude %_man1dir/aplay.1* +%exclude %_man1dir/arecord.1* +%exclude %_man1dir/amixer.1* +%_man7dir/*.7* + +%if_with systemd +%_unitdir/alsa-restore.service +%_unitdir/alsa-state.service +%_unitdir/sound.target.wants/alsa-restore.service +%_unitdir/sound.target.wants/alsa-state.service +%endif + +%files -n aplay +%_bindir/aplay +%_bindir/arecord +%_man1dir/aplay.1* +%_man1dir/arecord.1* + +%files -n amixer +%_bindir/amixer +%_man1dir/amixer.1* + +%changelog +* Sat Jun 05 2021 L.A. Kostis 1:1.2.5-alt1.1 +- Apply upstream fixes from git (before 1.2.5.1 release). + +* Tue Jun 01 2021 Michael Shigorin 1:1.2.5-alt1 +- 1.2.5 + +* Wed Oct 21 2020 Michael Shigorin 1:1.2.4-alt1 +- 1.2.4 + +* Wed Jun 10 2020 Michael Shigorin 1:1.2.3-alt1 +- 1.2.3 (closes: #38416) +- dropped 89-alsa-ucm.rules (following upstream) + +* Thu Feb 20 2020 Michael Shigorin 1:1.2.2-alt1 +- 1.2.2 + +* Mon Jan 13 2020 Michael Shigorin 1:1.2.1-alt3 +- cherry-picked upstream commit 3c740d90490abe64c86c667934ba5d990817b873 + (closes: #37757) + +* Sun Dec 08 2019 Vladimir D. Seleznev 1:1.2.1-alt2 +- added systemd knob (on by default) +- spec: corrected license field (use specific SPDX identifier) + +* Mon Nov 18 2019 Michael Shigorin 1:1.2.1-alt1 +- 1.2.1 +- added 89-alsa-ucm.rules +- minor spec cleanup + +* Mon May 13 2019 Michael Shigorin 1:1.1.9-alt1 +- 1.1.9 + +* Thu Jan 24 2019 Michael Shigorin 1:1.1.8-alt1 +- 1.1.8 + +* Wed Oct 17 2018 Michael Shigorin 1:1.1.7-alt1 +- 1.1.7 + +* Wed Nov 22 2017 Michael Shigorin 1:1.1.5-alt1 +- 1.1.5 + +* Mon May 29 2017 Michael Shigorin 1:1.1.4-alt1 +- 1.1.4 + +* Thu Dec 22 2016 Michael Shigorin 1:1.1.3-alt1 +- 1.1.3 + +* Thu Oct 06 2016 Michael Shigorin 1:1.1.2-alt1 +- 1.1.2 + +* Thu Jun 23 2016 Michael Shigorin 1:1.1.1-alt1.1 +- dropped alsa-bat subpackage: upstream renamed bat(1) + which conflicted with existing bacula binary to alsabat(1) +- added 90-alsa-restore.rules + +* Mon Jun 20 2016 Michael Shigorin 1:1.1.1-alt1 +- 1.1.1 + +* Thu May 05 2016 Michael Shigorin 1:1.1.0-alt1.1.1 +- added R: sysfsutils (closes: #32065) + +* Mon Nov 09 2015 Michael Shigorin 1:1.1.0-alt1.1 +- added alsa-bat subpackage (Conflicts: bacula-bat over %_bindir/bat) + +* Mon Nov 09 2015 Michael Shigorin 1:1.1.0-alt1 +- 1.1.0 + +* Fri Feb 27 2015 Michael Shigorin 1:1.0.29-alt2 +- disabled autoreq for alsa-info.sh (R: lsb-core for no good reason) + +* Fri Feb 27 2015 Michael Shigorin 1:1.0.29-alt1 +- 1.0.29 + +* Wed Jun 18 2014 Michael Shigorin 1:1.0.28-alt1 +- 1.0.28 + +* Wed Apr 30 2014 Michael Shigorin 1:1.0.27.2-alt1 +- 1.0.27.2 + +* Wed Apr 17 2013 Michael Shigorin 1:1.0.27-alt3 +- post-1.0.27 fixes, see also rh#951750 (thanks ononim from opennet) + +* Sat Apr 13 2013 Michael Shigorin 1:1.0.27-alt2 +- retag + +* Sat Apr 13 2013 Michael Shigorin 1:1.0.27-alt1 +- 1.0.27 + +* Fri Sep 07 2012 Michael Shigorin 1:1.0.26-alt2 +- retag + +* Thu Sep 06 2012 Michael Shigorin 1:1.0.26-alt1 +- 1.0.26 + +* Wed Mar 07 2012 Michael Shigorin 1:1.0.24.2-alt2 +- cherry-picked upstream commit 4c09aaa to fix alsamixer segfault + with pulseaudio and libxcb-1.8 (debian #657538, rh #731381) + +* Wed Feb 16 2011 Michael Shigorin 1:1.0.24.2-alt1 +- 1.0.24.2 +- added alsactl_init(7) manpage +- dropped versioned libalsa dependency + +* Sun Apr 18 2010 Valery Inozemtsev 1:1.0.23-alt1 +- 1.0.23 + +* Fri Apr 09 2010 Michael Shigorin 1:1.0.22-alt2.1 +- slightly softened libalsa dependency (version only, dropped release) + +* Sat Mar 27 2010 Michael Shigorin 1:1.0.22-alt2 +- merge-up: shrek@ didn't notice my 1.0.22 "test please" announce + and did an independent update + + reverted localized descriptions removal, no policy so far + and I consider these useful + + minor spec cleanup + + re-added crude versioning of ncurses dependency (closes: #21991) + +* Thu Dec 24 2009 Valery Inozemtsev 1:1.0.22-alt1 +- 1.0.22 + +* Thu Dec 17 2009 Michael Shigorin 1.0.22-alt1 +- 1.0.22 + +* Sun Oct 25 2009 Michael Shigorin 1.0.21-alt2 +- added crude versioning of ncurses dependency (closes: #21991) +- _unpackaged_files_terminate_build again +- spec cleanup + +* Tue Sep 01 2009 Valery Inozemtsev 1.0.21-alt1 +- 1.0.21 + +* Sun May 17 2009 Valery Inozemtsev 1.0.20-alt2 +- rebuild + +* Thu May 07 2009 Valery Inozemtsev 1.0.20-alt1 +- 1.0.20 + +* Mon Jan 19 2009 Valery Inozemtsev 1.0.19-alt1 +- 1.0.19 + +* Wed Oct 29 2008 Valery Inozemtsev 1.0.18-alt1 +- 1.0.18 + +* Sun Aug 03 2008 Valery Inozemtsev 1.0.17-alt2 +- iecset update for new consumer status channel bits + +* Wed Jul 16 2008 Valery Inozemtsev 1.0.17-alt1 +- 1.0.17 + +* Thu May 01 2008 Valery Inozemtsev 1.0.16-alt1 +- 1.0.16 + +* Sun Jan 27 2008 Valery Inozemtsev 1.0.15-alt1 +- 1.0.15 +- spec cleanup +- update build dependencies + +* Mon Aug 06 2007 Michael Shigorin 1.0.14-alt3 +- changes by led (thanks!): + + added amixer subpackage (#12487) + + moved aplay.1 to aplay subpackage +- moved arecord binary and manpage to aplay subpackage too (symlinks) + +* Mon Jun 11 2007 Michael Shigorin 1.0.14-alt2 +- relaxed overly strict Requires, thanks shrek@ + +* Mon Jun 11 2007 Michael Shigorin 1.0.14-alt1 +- 1.0.14 +- set _unpackaged_files_terminate_build +- added localized manpages + +* Mon Oct 16 2006 Michael Shigorin 1.0.13-alt1 +- 1.0.13 + +* Sat Sep 02 2006 Michael Shigorin 1.0.12-alt1 +- 1.0.12 + +* Wed Apr 19 2006 Michael Shigorin 1.0.11-alt1 +- 1.0.11 + +* Wed Apr 05 2006 Michael Shigorin 1.0.11-alt0.4 +- 1.0.11rc4 +- packaged translations + +* Sat Mar 04 2006 Michael Shigorin 1.0.11-alt0.2 +- 1.0.11rc2 (due to strict libalsa version requirement and #9181) + +* Fri Feb 17 2006 Michael Shigorin 1.0.10-alt2 +- more strict libalsa requires (should fix #9028) + +* Wed Nov 16 2005 Michael Shigorin 1.0.10-alt1 +- 1.0.10 + +* Mon Jul 04 2005 Michael Shigorin 1.0.9a-alt2 +- added Conflicts: for previous versions due to aplay split + (#7279); thanks Andrey Rahmatullin (wrar@) + +* Thu Jun 23 2005 Michael Shigorin 1.0.9a-alt1 +- 1.0.9a +- temporarily fixated libalsa requires (build/install) at 1.0.9 + since usual condition (>=%%version) would fail +- moved aplay to separate subpackage (#7156), + required by main package +- added test sounds (were missing somehow) + +* Thu Jun 09 2005 Michael Shigorin 1.0.9a-alt0 +- 1.0.9a + +* Mon Jan 17 2005 ALT QA Team Robot 1.0.8-alt1.1 +- Rebuilt with ncurses-5.4.20050108-alt2 + +* Thu Jan 13 2005 Michael Shigorin 1.0.8-alt1 +- 1.0.8 +- updated alt-no-newt patch + +* Thu Dec 16 2004 Michael Shigorin 1.0.7-alt1 +- 1.0.7 + +* Sat Jul 03 2004 Michael Shigorin 1.0.5-alt3 +- *applied* the patch for #3824 from wrar@, whoops! + +* Sat Jun 26 2004 Michael Shigorin 1.0.5-alt2 +- fixed #3824, thanks to Andrey Rahmatullin (wrar@) for bug/patch +- added ru/uk package info + +* Mon May 31 2004 Michael Shigorin 1.0.5-alt1 +- 1.0.5 + +* Thu Apr 08 2004 Michael Shigorin 1.0.4-alt2 +- removed forbidden requires: alsa + +* Sat Apr 03 2004 Michael Shigorin 1.0.4-alt1 +- 1.0.4 + +* Tue Mar 02 2004 Michael Shigorin 1.0.3-alt1 +- 1.0.3 + +* Thu Jan 29 2004 Michael Shigorin 1.0.2-alt2 +- 1.0.2, Final Upload by ALSA Project (TM) 20040129 18:35 +0200 +- thanks to Sergey Vlasov (vsu@) for alerting about re-uploads + +* Wed Jan 28 2004 Michael Shigorin 1.0.2-alt1 +- 1.0.2 + +* Thu Jan 15 2004 Michael Shigorin 1.0.1-alt1 +- 1.0.1 +- added %_bindir/set_default_volume from SuSE package + +* Wed Oct 22 2003 Michael Shigorin 0.9.8-alt1 +- 0.9.8 + +* Fri Sep 26 2003 Michael Shigorin 0.9.7-alt1 +- 0.9.7 + +* Wed Jul 30 2003 Michael Shigorin 0.9.6-alt1 +- 0.9.6 +- relaxed alsa (kernel module) dependency -- any alsa2 should suffice + and userspace upgrade shouldn't force kernel module upgrade + +* Tue Jul 15 2003 Michael Shigorin 0.9.5-alt1 +- 0.9.5 + +* Mon Jun 23 2003 Michael Shigorin 0.9.4-alt1 +- 0.9.4 +- renamed to alsa-utils + +* Wed Apr 02 2003 Michael Shigorin 0.9.2-alt0.1 +- 0.9.2 (unofficial build) + +* Tue Feb 04 2003 Rider 0.9.0rc7-alt1 +- 0.9.0rc7 + +* Tue Nov 26 2002 Konstantin Volckov 0.9.0rc6-alt1 +- 0.9.0rc6 +- Rebuilt in new environment + +* Fri Jun 07 2002 Konstantin Volckov 0.9.0rc1-alt1 +- 0.9.0rc1 + +* Thu Feb 28 2002 Konstantin Volckov 0.9.0beta12-alt1 +- 0.9.0beta12 + +* Wed Dec 26 2001 Konstantin Volckov 0.9.0beta10-alt1a +- 0.9.0beta10a + +* Wed Nov 21 2001 Konstantin Volckov 0.9.0beta9-alt1 +- 0.9.0beta9 + +* Fri Oct 12 2001 Konstantin Volckov 0.9.0beta8-alt1 +- 0.9.0beta8 + +* Fri Sep 21 2001 Konstantin Volckov 0.9.0beta7-alt1 +- First build for Sisyphus diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in index 3d6adca..a1a3a96 100644 --- a/alsaconf/alsaconf.in +++ b/alsaconf/alsaconf.in @@ -331,27 +331,9 @@ else fi fi -# Check for dialog, whiptail, gdialog, awk, ... ? +# Check for dialog, gdialog, awk, ... ? if type -p dialog > /dev/null; then DIALOG=dialog -else - if type -p whiptail > /dev/null; then - whiptail_wrapper() { - X1="$1" - X2="$2" - if [ $1 = --yesno ]; then - X3=`expr $3 + 2` - else - X3=$3 - fi - shift 3 - whiptail "$X1" "$X2" $X3 "$@" - } - DIALOG=whiptail_wrapper - else - xecho "Error, dialog or whiptail not found." - exit 1 - fi fi if type -p awk > /dev/null; then : else diff --git a/alsactl/init_sysdeps.c b/alsactl/init_sysdeps.c index 3aca1b4..245fb28 100644 --- a/alsactl/init_sysdeps.c +++ b/alsactl/init_sysdeps.c @@ -17,7 +17,7 @@ * */ -#if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD)) +#ifndef __GLIBC__ static size_t strlcpy(char *dst, const char *src, size_t size) { size_t bytes = 0; diff --git a/configure.ac b/configure.ac index 22a126d..a2f3878 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,9 @@ AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) +IT_PROG_INTLTOOL([0.35.0]) +GETTEXT_PACKAGE=alsa-utils +AC_SUBST([GETTEXT_PACKAGE]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.19.8])