![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package alsa-utils for openSUSE:Factory
checked in at Thu Jan 22 16:45:39 CET 2009.
--------
--- alsa-utils/alsa-utils.changes 2008-11-26 14:32:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/alsa-utils/alsa-utils.changes 2009-01-22 14:00:51.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 22 14:00:31 CET 2009 - tiwai@suse.de
+
+- updated to version 1.0.19
+- use ANSI-C functions instead of index()
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
alsa-utils-1.0.18.tar.bz2
alsa-utils-speaker-test-parameter-get-fix.diff
New:
----
alsa-utils-1.0.19.tar.bz2
alsa-utils-git-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-utils.spec ++++++
--- /var/tmp/diff_new_pack.h27957/_old 2009-01-22 16:45:24.000000000 +0100
+++ /var/tmp/diff_new_pack.h27957/_new 2009-01-22 16:45:24.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package alsa-utils (Version 1.0.18)
+# spec file for package alsa-utils (Version 1.0.19)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,19 +20,17 @@
Name: alsa-utils
BuildRequires: alsa-devel ncurses-devel xmlto
-%define package_version 1.0.18
+%define package_version 1.0.19
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Players
Provides: alsa-conf
Requires: dialog pciutils
AutoReqProv: on
Summary: Advanced Linux Sound Architecture Utilities
-Version: 1.0.18
-Release: 6
+Version: 1.0.19
+Release: 1
Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
-# Patch: alsa-utils-git-fixes.diff
-# Patch1: alsa-utils-%{package_version}-package-fix.diff
-Patch2: alsa-utils-speaker-test-parameter-get-fix.diff
+Patch: alsa-utils-git-fixes.diff
Url: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,9 +47,7 @@
%prep
%setup -q -n %{name}-%{package_version}
-# %patch1 -p1
-# %patch -p1
-%patch2 -p1
+%patch -p1
mv alsamixer/README alsamixer/README-alsamixer
%build
@@ -60,7 +56,7 @@
make %{?jobs:-j %jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
%find_lang %{name} --all-name
%clean
@@ -80,6 +76,9 @@
%{_datadir}/alsa
%changelog
+* Thu Jan 22 2009 tiwai@suse.de
+- updated to version 1.0.19
+- use ANSI-C functions instead of index()
* Wed Nov 26 2008 tiwai@suse.de
- fix division-by-zero error in speaker-test program
* Wed Oct 29 2008 tiwai@suse.de
++++++ alsa-utils-1.0.18.tar.bz2 -> alsa-utils-1.0.19.tar.bz2 ++++++
++++ 2181 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsaconf/alsaconf.in new/alsa-utils-1.0.19/alsaconf/alsaconf.in
--- old/alsa-utils-1.0.18/alsaconf/alsaconf.in 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsaconf/alsaconf.in 2009-01-19 12:17:19.000000000 +0100
@@ -65,6 +65,8 @@
distribution="redhat"
elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then
distribution="fedora"
+elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then
+ distribution="slackware"
else
distribution="unknown"
fi
@@ -490,6 +492,8 @@
if [ "$distribution" = "debian" ]; then
rcalsasound=/etc/init.d/alsa
+elif [ -x /etc/rc.d/rc.alsa ]; then
+ rcalsasound=/etc/rc.d/rc.alsa
elif [ -x /etc/init.d/alsasound ]; then
rcalsasound=/etc/init.d/alsasound
elif [ -x /usr/sbin/rcalsasound ]; then
@@ -904,13 +908,12 @@
farewell
clear
- if [ "$distribution" = "gentoo" ]; then
- xecho "Running modules-update..."
- modules-update
- elif [ "$distribution" = "debian" ]; then
- xecho "Running update-modules..."
- update-modules
- fi
+ case "$distribution" in
+ gentoo | debian)
+ xecho "Running update-modules..."
+ update-modules
+ ;;
+ esac
if [ -x $rcalsasound ] ; then
echo Loading driver...
$rcalsasound restart
@@ -1407,7 +1410,7 @@
Following card(s) are found on your system.
Choose a soundcard to configure:
")
- $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" 2> $FOUND || acex 0
+ $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" --output-fd 3 3> $FOUND || acex 0
card=`head -n 1 $FOUND`
if [ "$card" = "legacy" ]; then
ac_config_legacy
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/alsactl.1 new/alsa-utils-1.0.19/alsactl/alsactl.1
--- old/alsa-utils-1.0.18/alsactl/alsactl.1 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/alsactl.1 2009-01-19 12:17:19.000000000 +0100
@@ -61,6 +61,15 @@
This option was the old default behavior.
.TP
+\fI\-I, \-\-no\-init\-fallback\fP
+Don't initialize cards if restore fails. Since version 1.0.18,
+\fBalsactl\fP tries to initialize the card with the restore operation
+as default. But this can cause incompatibility with the older version.
+The caller may expect that the state won't be touched if no state file
+exists. This option takes the restore behavior back to the older
+version by suppressing the initialization.
+
+.TP
\fI\-r, \-\-runstate\fP
Save restore and init state to this file. The file will contain only errors.
Errors are appended with the soundcard id to the end of file.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/alsactl.c new/alsa-utils-1.0.19/alsactl/alsactl.c
--- old/alsa-utils-1.0.18/alsactl/alsactl.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/alsactl.c 2009-01-19 12:17:19.000000000 +0100
@@ -51,6 +51,8 @@
printf(" (default mode)\n");
printf(" -g,--ignore ignore 'No soundcards found' error\n");
printf(" -P,--pedantic do not restore mismatching controls (old default)\n");
+ printf(" -I,--no-init-fallback\n"
+ " don't initialize even if restore fails\n");
printf(" -r,--runstate # save restore and init state to this file (only errors)\n");
printf(" default settings is 'no file set'\n");
printf(" -R,--remove remove runstate file at first, otherwise append errors\n");
@@ -70,12 +72,13 @@
int main(int argc, char *argv[])
{
- struct option long_option[] =
+ static const struct option long_option[] =
{
{"help", 0, NULL, 'h'},
{"file", 1, NULL, 'f'},
{"env", 1, NULL, 'E'},
{"initfile", 1, NULL, 'i'},
+ {"no-init-fallback", 0, NULL, 'I'},
{"force", 0, NULL, 'F'},
{"ignore", 0, NULL, 'g'},
{"pedantic", 0, NULL, 'P'},
@@ -85,7 +88,7 @@
{"version", 0, NULL, 'v'},
{NULL, 0, NULL, 0},
};
- char *devfiles[] = {
+ static const char *const devfiles[] = {
"/dev/snd/controlC",
"/dev/snd/pcmC",
"/dev/snd/midiC",
@@ -96,6 +99,7 @@
char *initfile = DATADIR "/init/00main";
char *cardname, **tmp, ncardname[16];
int removestate = 0;
+ int init_fallback = 1; /* new default behavior */
int res;
command = argv[0];
@@ -126,6 +130,9 @@
case 'i':
initfile = optarg;
break;
+ case 'I':
+ init_fallback = 0;
+ break;
case 'r':
statefile = optarg;
break;
@@ -173,7 +180,7 @@
} else if (!strcmp(argv[optind], "restore")) {
if (removestate)
remove(statefile);
- res = load_state(cfgfile, initfile, cardname);
+ res = load_state(cfgfile, initfile, cardname, init_fallback);
} else {
fprintf(stderr, "alsactl: Unknown command '%s'...\n",
argv[optind]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/alsactl.h new/alsa-utils-1.0.19/alsactl/alsactl.h
--- old/alsa-utils-1.0.18/alsactl/alsactl.h 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/alsactl.h 2009-01-19 12:17:19.000000000 +0100
@@ -68,7 +68,8 @@
int init(const char *file, const char *cardname);
int save_state(const char *file, const char *cardname);
-int load_state(const char *file, const char *initfile, const char *cardname);
+int load_state(const char *file, const char *initfile, const char *cardname,
+ int do_init);
int power(const char *argv[], int argc);
int generate_names(const char *cfgfile);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/init_parse.c new/alsa-utils-1.0.19/alsactl/init_parse.c
--- old/alsa-utils-1.0.18/alsactl/init_parse.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/init_parse.c 2009-01-19 12:17:19.000000000 +0100
@@ -136,7 +136,7 @@
free(space);
}
-struct pair *value_find(struct space *space, const char *key)
+static struct pair *value_find(struct space *space, const char *key)
{
struct pair *pair = space->pairs;
@@ -272,7 +272,7 @@
snd_ctl_elem_type_t type;
unsigned int idx, count;
static char res[1024], tmp[16];
- static const char *hex = "0123456789abcdef";
+ static const char hex[] = "0123456789abcdef";
char *pos;
const char *pos1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/init_sysdeps.c new/alsa-utils-1.0.19/alsactl/init_sysdeps.c
--- old/alsa-utils-1.0.18/alsactl/init_sysdeps.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/init_sysdeps.c 2009-01-19 12:17:19.000000000 +0100
@@ -17,7 +17,7 @@
*
*/
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
static size_t strlcpy(char *dst, const char *src, size_t size)
{
size_t bytes = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/Makefile.am new/alsa-utils-1.0.19/alsactl/Makefile.am
--- old/alsa-utils-1.0.18/alsactl/Makefile.am 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/Makefile.am 2009-01-19 12:17:19.000000000 +0100
@@ -1,7 +1,10 @@
SUBDIRS = init
sbin_PROGRAMS=alsactl
-man_MANS=alsactl.1 alsactl_init.7
+man_MANS=alsactl.1
+if USE_XMLTO
+man_MANS += alsactl_init.7
+endif
EXTRA_DIST=alsactl.1 alsactl_init.xml
alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsactl/state.c new/alsa-utils-1.0.19/alsactl/state.c
--- old/alsa-utils-1.0.18/alsactl/state.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsactl/state.c 2009-01-19 12:17:19.000000000 +0100
@@ -34,7 +34,7 @@
#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a)[0])
-char *id_str(snd_ctl_elem_id_t *id)
+static char *id_str(snd_ctl_elem_id_t *id)
{
static char str[128];
assert(id);
@@ -47,7 +47,7 @@
return str;
}
-char *num_str(long n)
+static char *num_str(long n)
{
static char str[32];
sprintf(str, "%ld", n);
@@ -600,10 +600,6 @@
goto _close;
}
count = snd_ctl_elem_list_get_count(list);
- if (count < 0) {
- err = 0;
- goto _close;
- }
err = snd_config_compound_add(card, "control", count > 0, &control);
if (err < 0) {
error("snd_config_compound_add: %s", snd_strerror(err));
@@ -1166,7 +1162,7 @@
return -EINVAL;
}
numid = atoi(id);
- if (numid > *maxnumid)
+ if ((int)numid > *maxnumid)
*maxnumid = numid;
snd_config_for_each(i, next, control) {
snd_config_t *n = snd_config_iterator_entry(i);
@@ -1183,10 +1179,6 @@
}
if (strcmp(fld, "iface") == 0) {
iface = (snd_ctl_elem_iface_t)config_iface(n);
- if (iface < 0) {
- cerror(doit, "control.%d.%s is invalid", numid, fld);
- return -EINVAL;
- }
continue;
}
if (strcmp(fld, "device") == 0) {
@@ -1243,22 +1235,20 @@
snd_ctl_elem_info_set_numid(info, numid);
err = snd_ctl_elem_info(handle, info);
}
- if (err < 0) {
- if (iface >= 0 && name) {
- snd_ctl_elem_info_set_numid(info, 0);
- snd_ctl_elem_info_set_interface(info, iface);
- snd_ctl_elem_info_set_device(info, device);
- snd_ctl_elem_info_set_subdevice(info, subdevice);
- snd_ctl_elem_info_set_name(info, name);
- snd_ctl_elem_info_set_index(info, index);
- err = snd_ctl_elem_info(handle, info);
- if (err < 0 && comment && is_user_control(comment)) {
- err = add_user_control(handle, info, comment);
- if (err < 0) {
- cerror(doit, "failed to add user control #%d (%s)",
- numid, snd_strerror(err));
- return err;
- }
+ if (err < 0 && name) {
+ snd_ctl_elem_info_set_numid(info, 0);
+ snd_ctl_elem_info_set_interface(info, iface);
+ snd_ctl_elem_info_set_device(info, device);
+ snd_ctl_elem_info_set_subdevice(info, subdevice);
+ snd_ctl_elem_info_set_name(info, name);
+ snd_ctl_elem_info_set_index(info, index);
+ err = snd_ctl_elem_info(handle, info);
+ if (err < 0 && comment && is_user_control(comment)) {
+ err = add_user_control(handle, info, comment);
+ if (err < 0) {
+ cerror(doit, "failed to add user control #%d (%s)",
+ numid, snd_strerror(err));
+ return err;
}
}
}
@@ -1372,8 +1362,7 @@
if (snd_config_get_id(n, &id) < 0)
continue;
idx = atoi(id);
- if (idx < 0 || idx >= count ||
- set[idx]) {
+ if (idx >= count || set[idx]) {
cerror(doit, "bad control.%d.value index", numid);
if (!force_restore || !doit)
return -EINVAL;
@@ -1409,7 +1398,7 @@
snd_ctl_card_info_t *info;
snd_config_t *control;
snd_config_iterator_t i, next;
- int err, maxnumid;
+ int err, maxnumid = -1;
char name[32], tmpid[16];
const char *id;
snd_ctl_card_info_alloca(&info);
@@ -1453,7 +1442,7 @@
/* check if we have additional controls in driver */
/* in this case we should go through init procedure */
- if (!doit) {
+ if (!doit && maxnumid >= 0) {
snd_ctl_elem_id_t *id;
snd_ctl_elem_info_t *info;
snd_ctl_elem_id_alloca(&id);
@@ -1548,7 +1537,8 @@
return 0;
}
-int load_state(const char *file, const char *initfile, const char *cardname)
+int load_state(const char *file, const char *initfile, const char *cardname,
+ int do_init)
{
int err, finalerr = 0;
snd_config_t *config;
@@ -1586,6 +1576,8 @@
if (card < 0)
break;
first = 0;
+ if (!do_init)
+ break;
sprintf(cardname1, "%i", card);
err = init(initfile, cardname1);
if (err < 0) {
@@ -1594,7 +1586,7 @@
}
initfailed(card, "restore");
}
- if (!first)
+ if (first)
finalerr = 0; /* no cards, no error code */
return finalerr;
}
@@ -1621,7 +1613,7 @@
}
first = 0;
/* do a check if controls matches state file */
- if (set_controls(card, config, 0)) {
+ if (do_init && set_controls(card, config, 0)) {
sprintf(cardname1, "%i", card);
err = init(initfile, cardname1);
if (err < 0) {
@@ -1644,7 +1636,7 @@
return -ENODEV;
}
/* do a check if controls matches state file */
- if (set_controls(cardno, config, 0)) {
+ if (do_init && set_controls(cardno, config, 0)) {
err = init(initfile, cardname);
if (err < 0) {
initfailed(cardno, "init");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/alsamixer/alsamixer.c new/alsa-utils-1.0.19/alsamixer/alsamixer.c
--- old/alsa-utils-1.0.18/alsamixer/alsamixer.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/alsamixer/alsamixer.c 2009-01-19 12:17:19.000000000 +0100
@@ -222,7 +222,7 @@
#define MIXER_ELEM_HAS_VOLUME 0x800
/* left and right channels for each type */
-static snd_mixer_selem_channel_id_t mixer_elem_chn[][2] = {
+static const snd_mixer_selem_channel_id_t mixer_elem_chn[][2] = {
{ SND_MIXER_SCHN_FRONT_LEFT, SND_MIXER_SCHN_FRONT_RIGHT },
{ SND_MIXER_SCHN_REAR_LEFT, SND_MIXER_SCHN_REAR_RIGHT },
{ SND_MIXER_SCHN_FRONT_CENTER, SND_MIXER_SCHN_UNKNOWN },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/amidi/amidi.c new/alsa-utils-1.0.19/amidi/amidi.c
--- old/alsa-utils-1.0.18/amidi/amidi.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/amidi/amidi.c 2009-01-19 12:17:19.000000000 +0100
@@ -445,7 +445,7 @@
stop = 1;
}
-void add_send_hex_data(const char *str)
+static void add_send_hex_data(const char *str)
{
int length;
char *s;
@@ -465,8 +465,8 @@
int main(int argc, char *argv[])
{
- static char short_options[] = "hVlLp:s:r:S::dt:a";
- static struct option long_options[] = {
+ static const char short_options[] = "hVlLp:s:r:S::dt:a";
+ static const struct option long_options[] = {
{"help", 0, NULL, 'h'},
{"version", 0, NULL, 'V'},
{"list-devices", 0, NULL, 'l'},
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/amixer/amixer.c new/alsa-utils-1.0.19/amixer/amixer.c
--- old/alsa-utils-1.0.18/amixer/amixer.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/amixer/amixer.c 2009-01-19 12:17:19.000000000 +0100
@@ -310,7 +310,7 @@
return snd_mixer_selem_set_capture_dB(elem, c, value, 0);
}
-static struct volume_ops_set vol_ops[2] = {
+static const struct volume_ops_set vol_ops[2] = {
{
.has_volume = snd_mixer_selem_has_playback_volume,
.v = {{ snd_mixer_selem_get_playback_volume_range,
@@ -1346,7 +1346,7 @@
char *name;
unsigned int mask;
} channel_mask_t;
-static channel_mask_t chanmask[] = {
+static const channel_mask_t chanmask[] = {
{"frontleft", 1 << SND_MIXER_SCHN_FRONT_LEFT},
{"frontright", 1 << SND_MIXER_SCHN_FRONT_RIGHT},
{"frontcenter", 1 << SND_MIXER_SCHN_FRONT_CENTER},
@@ -1363,7 +1363,7 @@
static unsigned int channels_mask(char **arg, unsigned int def)
{
- channel_mask_t *c;
+ const channel_mask_t *c;
for (c = chanmask; c->name; c++) {
if (strncasecmp(*arg, c->name, strlen(c->name)) == 0) {
@@ -1665,7 +1665,7 @@
printf("\n");
}
-int element_callback(snd_hctl_elem_t *elem, unsigned int mask)
+static int element_callback(snd_hctl_elem_t *elem, unsigned int mask)
{
if (mask == SND_CTL_EVENT_MASK_REMOVE) {
events_remove(elem);
@@ -1689,7 +1689,7 @@
snd_hctl_elem_set_callback(helem, element_callback);
}
-int ctl_callback(snd_hctl_t *ctl, unsigned int mask,
+static int ctl_callback(snd_hctl_t *ctl, unsigned int mask,
snd_hctl_elem_t *elem)
{
if (mask & SND_CTL_EVENT_MASK_ADD)
@@ -1743,7 +1743,7 @@
printf("event remove: '%s',%i\n", snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid));
}
-int melem_event(snd_mixer_elem_t *elem, unsigned int mask)
+static int melem_event(snd_mixer_elem_t *elem, unsigned int mask)
{
snd_mixer_selem_id_t *sid;
snd_mixer_selem_id_alloca(&sid);
@@ -1768,7 +1768,7 @@
snd_mixer_elem_set_callback(elem, melem_event);
}
-int mixer_event(snd_mixer_t *mixer, unsigned int mask,
+static int mixer_event(snd_mixer_t *mixer, unsigned int mask,
snd_mixer_elem_t *elem)
{
if (mask & SND_CTL_EVENT_MASK_ADD)
@@ -1892,7 +1892,7 @@
{
int morehelp, level = 0;
int read_stdin = 0;
- static struct option long_option[] =
+ static const struct option long_option[] =
{
{"help", 0, NULL, 'h'},
{"card", 1, NULL, 'c'},
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/aplay/aplay.c new/alsa-utils-1.0.19/aplay/aplay.c
--- old/alsa-utils-1.0.18/aplay/aplay.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/aplay/aplay.c 2009-01-19 12:17:19.000000000 +0100
@@ -127,7 +127,7 @@
static void begin_au(int fd, size_t count);
static void end_au(int fd);
-struct fmt_capture {
+static const struct fmt_capture {
void (*start) (int fd, size_t count);
void (*end) (int fd);
char *what;
@@ -287,7 +287,7 @@
name = snd_device_name_get_hint(*n, "NAME");
descr = snd_device_name_get_hint(*n, "DESC");
io = snd_device_name_get_hint(*n, "IOID");
- if (io != NULL && strcmp(io, filter) == 0)
+ if (io != NULL && strcmp(io, filter) != 0)
goto __end;
printf("%s\n", name);
if ((descr1 = descr) != NULL) {
@@ -356,8 +356,8 @@
int main(int argc, char *argv[])
{
int option_index;
- char *short_options = "hnlLD:qt:c:f:r:d:MNF:A:R:T:B:vV:IPC";
- static struct option long_options[] = {
+ static const char short_options[] = "hnlLD:qt:c:f:r:d:MNF:A:R:T:B:vV:IPC";
+ static const struct option long_options[] = {
{"help", 0, 0, 'h'},
{"version", 0, 0, OPT_VERSION},
{"list-devnames", 0, 0, 'n'},
@@ -663,7 +663,7 @@
* Safe read (for pipes)
*/
-ssize_t safe_read(int fd, void *buf, size_t count)
+static ssize_t safe_read(int fd, void *buf, size_t count)
{
ssize_t result = 0, res;
@@ -701,7 +701,7 @@
* helper for test_wavefile
*/
-size_t test_wavefile_read(int fd, u_char *buffer, size_t *size, size_t reqsize, int line)
+static size_t test_wavefile_read(int fd, u_char *buffer, size_t *size, size_t reqsize, int line)
{
if (*size >= reqsize)
return *size;
@@ -2129,7 +2129,7 @@
/* playing raw data */
-void playback_go(int fd, size_t loaded, off64_t count, int rtype, char *name)
+static void playback_go(int fd, size_t loaded, off64_t count, int rtype, char *name)
{
int l, r;
off64_t written = 0;
@@ -2369,7 +2369,7 @@
} while ((file_type == FORMAT_RAW && !timelimit) || count > 0);
}
-void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t count, int rtype, char **names)
+static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t count, int rtype, char **names)
{
int r;
size_t vsize;
@@ -2421,7 +2421,7 @@
snd_pcm_nonblock(handle, nonblock);
}
-void capturev_go(int* fds, unsigned int channels, off64_t count, int rtype, char **names)
+static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtype, char **names)
{
size_t c;
ssize_t r;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/configure.in new/alsa-utils-1.0.19/configure.in
--- old/alsa-utils-1.0.18/configure.in 2008-10-29 13:48:01.000000000 +0100
+++ new/alsa-utils-1.0.19/configure.in 2009-01-19 12:24:19.000000000 +0100
@@ -2,7 +2,7 @@
AC_PREREQ(2.59)
AC_INIT(alsamixer/alsamixer.c)
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.18)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.19)
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.15])
@@ -52,6 +52,17 @@
esac],[alsaconf=true])
AM_CONDITIONAL(ALSACONF, test x$alsaconf = xtrue)
+xmlto=""
+if test x"$alsaconf" = xtrue; then
+ AC_ARG_ENABLE(xmlto,
+ AS_HELP_STRING([--disable-xmlto], [Disable man page creation via xmlto]),
+ xmlto="$enableval", xmlto="yes")
+ if test "$xmlto" = "yes"; then
+ AC_CHECK_PROG([xmlto], [xmlto], [yes])
+ fi
+fi
+AM_CONDITIONAL(USE_XMLTO, test x"$xmlto" = xyes)
+
dnl Checks for header files.
AC_HEADER_STDC
if test x$alsamixer = xtrue; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/iecset/iecbits.c new/alsa-utils-1.0.19/iecset/iecbits.c
--- old/alsa-utils-1.0.18/iecset/iecbits.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/iecset/iecbits.c 2009-01-19 12:17:19.000000000 +0100
@@ -25,7 +25,7 @@
const char *name;
};
-static struct category_str con_category[] = {
+static const struct category_str con_category[] = {
{ IEC958_AES1_CON_GENERAL, "general" },
{ IEC958_AES1_CON_IEC908_CD, "CD" },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/iecset/iecset.c new/alsa-utils-1.0.19/iecset/iecset.c
--- old/alsa-utils-1.0.18/iecset/iecset.c 2008-10-29 13:42:11.000000000 +0100
+++ new/alsa-utils-1.0.19/iecset/iecset.c 2009-01-19 12:17:19.000000000 +0100
@@ -52,7 +52,7 @@
const char *desc;
};
-static struct cmdtbl cmds[] = {
+static const struct cmdtbl cmds[] = {
{ "pro", IDX_PRO, CMD_BOOL,
"professional (common)\n\toff = consumer mode, on = professional mode" },
{ "aud", IDX_NOAUDIO, CMD_BOOL_INV,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/include/version.h new/alsa-utils-1.0.19/include/version.h
--- old/alsa-utils-1.0.18/include/version.h 2008-10-29 13:48:10.000000000 +0100
+++ new/alsa-utils-1.0.19/include/version.h 2009-01-19 12:24:28.000000000 +0100
@@ -4,9 +4,9 @@
#define SND_UTIL_MAJOR 1
#define SND_UTIL_MINOR 0
-#define SND_UTIL_SUBMINOR 18
+#define SND_UTIL_SUBMINOR 19
#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\
(SND_UTIL_MINOR<<8)|\
SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR "1.0.18"
+#define SND_UTIL_VERSION_STR "1.0.19"
Files old/alsa-utils-1.0.18/po/ja.gmo and new/alsa-utils-1.0.19/po/ja.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-utils-1.0.18/po/ja.po new/alsa-utils-1.0.19/po/ja.po
--- old/alsa-utils-1.0.18/po/ja.po 2008-10-29 13:48:20.000000000 +0100
+++ new/alsa-utils-1.0.19/po/ja.po 2009-01-19 12:24:37.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: alsa-utils 1.0.9a\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-29 13:48+0100\n"
+"POT-Creation-Date: 2009-01-19 12:24+0100\n"
"PO-Revision-Date: 2006-04-18 15:51+0200\n"
"Last-Translator: Takashi Iwai