Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at 2020-06-11 14:45:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old) and /work/SRC/openSUSE:Factory/.alsa-utils.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-utils" Thu Jun 11 14:45:55 2020 rev:124 rq:812898 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes 2020-05-09 19:52:08.396810260 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-utils.new.3606/alsa-utils.changes 2020-06-11 14:46:37.005717185 +0200 @@ -1,0 +2,15 @@ +Tue Jun 9 11:21:59 CEST 2020 - [email protected] + +- Update to alsa-utils 1.2.3: + including previous fixes, see the detailed changes at: + https://www.alsa-project.org/wiki/Detailed_changes_v1.2.2_v1.2.3 +- Dropped obsoleted patches: + 0001-alsaloop-reduce-cumulative-error-caused-by-non-atomi.patch + 0002-alsactl-don-t-exit-on-EINTR-from-epoll_wait.patch + 0003-alsactl-avoid-needless-wakeups-in-monitor-loop.patch + 0004-alsactl-fix-error-handling-for-sched_setscheduler-ca.patch + 0005-alsa-info.sh-add-ALT-to-DISTRO-list.patch + 0006-alsa-info-initial-rpm-deb-package-info.patch + 0007-alsa-info.sh-increase-version-to-0.4.65.patch + +------------------------------------------------------------------- Old: ---- 0001-alsaloop-reduce-cumulative-error-caused-by-non-atomi.patch 0002-alsactl-don-t-exit-on-EINTR-from-epoll_wait.patch 0003-alsactl-avoid-needless-wakeups-in-monitor-loop.patch 0004-alsactl-fix-error-handling-for-sched_setscheduler-ca.patch 0005-alsa-info.sh-add-ALT-to-DISTRO-list.patch 0006-alsa-info-initial-rpm-deb-package-info.patch 0007-alsa-info.sh-increase-version-to-0.4.65.patch alsa-utils-1.2.2.tar.bz2 New: ---- alsa-utils-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.DLF2Z0/_old 2020-06-11 14:46:40.305726798 +0200 +++ /var/tmp/diff_new_pack.DLF2Z0/_new 2020-06-11 14:46:40.309726809 +0200 @@ -16,10 +16,10 @@ # -%define do_autoreconf 1 +%define do_autoreconf 0 %define _udevdir %(pkg-config --variable=udevdir udev) Name: alsa-utils -Version: 1.2.2 +Version: 1.2.3 Release: 0 Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0-or-later @@ -29,13 +29,6 @@ Source1: 01beep.conf Source2: sound-extra.service Source5: load-sound-modules.sh -Patch1: 0001-alsaloop-reduce-cumulative-error-caused-by-non-atomi.patch -Patch2: 0002-alsactl-don-t-exit-on-EINTR-from-epoll_wait.patch -Patch3: 0003-alsactl-avoid-needless-wakeups-in-monitor-loop.patch -Patch4: 0004-alsactl-fix-error-handling-for-sched_setscheduler-ca.patch -Patch5: 0005-alsa-info.sh-add-ALT-to-DISTRO-list.patch -Patch6: 0006-alsa-info-initial-rpm-deb-package-info.patch -Patch7: 0007-alsa-info.sh-increase-version-to-0.4.65.patch Patch101: alsa-utils-configure-version-revert.patch BuildRequires: alsa-devel BuildRequires: alsa-topology-devel @@ -76,13 +69,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %if 0%{?do_autoreconf} %patch101 -p1 # fix stupid automake's automatic action ++++++ alsa-utils-1.2.2.tar.bz2 -> alsa-utils-1.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsa-info/alsa-info.sh new/alsa-utils-1.2.3/alsa-info/alsa-info.sh --- old/alsa-utils-1.2.2/alsa-info/alsa-info.sh 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsa-info/alsa-info.sh 2020-06-07 19:19:42.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.64 +SCRIPT_VERSION=0.4.65 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"; ################################################################################# @@ -238,6 +238,23 @@ echo "" >> $FILE } +withpackages() { + local RPM="$(which rpmquery 2>/dev/null | sed 's|^[^/]*||' 2>/dev/null)" + local DPKG="$(which dpkg 2>/dev/null | sed 's|^[^/]*||' 2>/dev/null)" + [ -n "$RPM$DPKG" ] || return + local PATTERN='(alsa-(lib|oss|plugins|tools|(topology|ucm)-conf|utils)|libalsa|tinycompress)' + { + echo "!!Packages installed" + echo "!!--------------------" + echo "" + { + if [ -x "$RPM" ]; then "$RPM" -a; fi + if [ -x "$DPKG" ]; then "$DPKG" -l; fi + } | grep -E "$PATTERN" + echo "" + } >> "$FILE" +} + withall() { withdevices withconfigs @@ -247,6 +264,7 @@ withmodules withsysfs withdmesg + withpackages WITHALL="no" } @@ -357,6 +375,7 @@ aplay amixer alsactl + rpm, dpkg /proc/asound/ /sys/class/sound/ ~/.asoundrc (etc.) @@ -394,7 +413,7 @@ # Fetch the info and store in temp files/variables TSTAMP=$(LANG=C TZ=UTC date) -DISTRO=$(grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}) +DISTRO=$(grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus\|ALT" /etc/{issue,*release,*version}) KERNEL_VERSION=$(uname -r) KERNEL_PROCESSOR=$(uname -p) KERNEL_MACHINE=$(uname -m) @@ -699,6 +718,10 @@ withconfigs WITHALL="no" ;; + --with-packages) + withpackages + WITHALL="no" + ;; --stdout) UPLOAD="no" if [ -z "$WITHALL" ]; then @@ -730,6 +753,7 @@ echo " /etc/asound.conf if they exist)" echo " --with-devices (shows the device nodes in /dev/snd/)" echo " --with-dmesg (shows the ALSA/HDA kernel messages)" + echo " --with-packages (includes known packages installed)" echo "" echo " --output FILE (specify the file to output for no-upload mode)" echo " --update (check server for script updates)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/Makefile.am new/alsa-utils-1.2.3/alsactl/Makefile.am --- old/alsa-utils-1.2.2/alsactl/Makefile.am 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/Makefile.am 2020-06-07 19:19:42.000000000 +0200 @@ -9,8 +9,8 @@ AM_CFLAGS = -D_GNU_SOURCE -alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c \ - monitor.c +alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c init_ucm.c \ + daemon.c monitor.c alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU \ -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/Makefile.in new/alsa-utils-1.2.3/alsactl/Makefile.in --- old/alsa-utils-1.2.2/alsactl/Makefile.in 2020-02-19 13:07:15.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/Makefile.in 2020-06-07 19:24:30.000000000 +0200 @@ -114,8 +114,8 @@ PROGRAMS = $(sbin_PROGRAMS) am_alsactl_OBJECTS = alsactl-alsactl.$(OBJEXT) alsactl-state.$(OBJEXT) \ alsactl-lock.$(OBJEXT) alsactl-utils.$(OBJEXT) \ - alsactl-init_parse.$(OBJEXT) alsactl-daemon.$(OBJEXT) \ - alsactl-monitor.$(OBJEXT) + alsactl-init_parse.$(OBJEXT) alsactl-init_ucm.$(OBJEXT) \ + alsactl-daemon.$(OBJEXT) alsactl-monitor.$(OBJEXT) alsactl_OBJECTS = $(am_alsactl_OBJECTS) alsactl_LDADD = $(LDADD) alsactl_LINK = $(CCLD) $(alsactl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -137,7 +137,8 @@ am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/alsactl-alsactl.Po \ ./$(DEPDIR)/alsactl-daemon.Po \ - ./$(DEPDIR)/alsactl-init_parse.Po ./$(DEPDIR)/alsactl-lock.Po \ + ./$(DEPDIR)/alsactl-init_parse.Po \ + ./$(DEPDIR)/alsactl-init_ucm.Po ./$(DEPDIR)/alsactl-lock.Po \ ./$(DEPDIR)/alsactl-monitor.Po ./$(DEPDIR)/alsactl-state.Po \ ./$(DEPDIR)/alsactl-utils.Po am__mv = mv -f @@ -415,8 +416,8 @@ EXTRA_DIST = alsactl.1 alsactl_init.xml alsa-state.service.in \ alsa-restore.service.in 90-alsa-restore.rules.in AM_CFLAGS = -D_GNU_SOURCE -alsactl_SOURCES = alsactl.c state.c lock.c utils.c init_parse.c daemon.c \ - monitor.c +alsactl_SOURCES = alsactl.c state.c lock.c utils.c init_parse.c init_ucm.c \ + daemon.c monitor.c alsactl_CFLAGS = $(AM_CFLAGS) -D__USE_GNU \ -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" \ @@ -534,6 +535,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-alsactl.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-daemon.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-init_parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-init_ucm.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-lock.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-monitor.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsactl-state.Po@am__quote@ # am--include-marker @@ -629,6 +631,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-init_parse.obj `if test -f 'init_parse.c'; then $(CYGPATH_W) 'init_parse.c'; else $(CYGPATH_W) '$(srcdir)/init_parse.c'; fi` +alsactl-init_ucm.o: init_ucm.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-init_ucm.o -MD -MP -MF $(DEPDIR)/alsactl-init_ucm.Tpo -c -o alsactl-init_ucm.o `test -f 'init_ucm.c' || echo '$(srcdir)/'`init_ucm.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/alsactl-init_ucm.Tpo $(DEPDIR)/alsactl-init_ucm.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init_ucm.c' object='alsactl-init_ucm.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-init_ucm.o `test -f 'init_ucm.c' || echo '$(srcdir)/'`init_ucm.c + +alsactl-init_ucm.obj: init_ucm.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-init_ucm.obj -MD -MP -MF $(DEPDIR)/alsactl-init_ucm.Tpo -c -o alsactl-init_ucm.obj `if test -f 'init_ucm.c'; then $(CYGPATH_W) 'init_ucm.c'; else $(CYGPATH_W) '$(srcdir)/init_ucm.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/alsactl-init_ucm.Tpo $(DEPDIR)/alsactl-init_ucm.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init_ucm.c' object='alsactl-init_ucm.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -c -o alsactl-init_ucm.obj `if test -f 'init_ucm.c'; then $(CYGPATH_W) 'init_ucm.c'; else $(CYGPATH_W) '$(srcdir)/init_ucm.c'; fi` + alsactl-daemon.o: daemon.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(alsactl_CFLAGS) $(CFLAGS) -MT alsactl-daemon.o -MD -MP -MF $(DEPDIR)/alsactl-daemon.Tpo -c -o alsactl-daemon.o `test -f 'daemon.c' || echo '$(srcdir)/'`daemon.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/alsactl-daemon.Tpo $(DEPDIR)/alsactl-daemon.Po @@ -990,6 +1006,7 @@ -rm -f ./$(DEPDIR)/alsactl-alsactl.Po -rm -f ./$(DEPDIR)/alsactl-daemon.Po -rm -f ./$(DEPDIR)/alsactl-init_parse.Po + -rm -f ./$(DEPDIR)/alsactl-init_ucm.Po -rm -f ./$(DEPDIR)/alsactl-lock.Po -rm -f ./$(DEPDIR)/alsactl-monitor.Po -rm -f ./$(DEPDIR)/alsactl-state.Po @@ -1044,6 +1061,7 @@ -rm -f ./$(DEPDIR)/alsactl-alsactl.Po -rm -f ./$(DEPDIR)/alsactl-daemon.Po -rm -f ./$(DEPDIR)/alsactl-init_parse.Po + -rm -f ./$(DEPDIR)/alsactl-init_ucm.Po -rm -f ./$(DEPDIR)/alsactl-lock.Po -rm -f ./$(DEPDIR)/alsactl-monitor.Po -rm -f ./$(DEPDIR)/alsactl-state.Po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/alsactl.1 new/alsa-utils-1.2.3/alsactl/alsactl.1 --- old/alsa-utils-1.2.2/alsactl/alsactl.1 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/alsactl.1 2020-06-07 19:19:42.000000000 +0200 @@ -142,6 +142,11 @@ \fI\-c, \-\-sched-idle\fP Set the process scheduling policy to idle (SCHED_IDLE). +.TP +\fI\-D, \-\-ucm-defaults\fP +Execute also the 'defaults' section from the UCM configuration. The standard +behaviour is to execute only 'once' section. + .SH FILES \fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the \fB\-f\fP flag) is used to store current settings for your diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/alsactl.c new/alsa-utils-1.2.3/alsactl/alsactl.c --- old/alsa-utils-1.2.2/alsactl/alsactl.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/alsactl.c 2020-06-07 19:19:42.000000000 +0200 @@ -96,6 +96,9 @@ { 's', "syslog", "use syslog for messages" }, { INTARG | 'n', "nice", "set the process priority (see 'man nice')" }, { 'c', "sched-idle", "set the process scheduling policy to idle (SCHED_IDLE)" }, +#ifdef HAVE_ALSA_USE_CASE_H +{ 'D', "ucm-defaults", "execute also the UCM 'defaults' section" }, +#endif { HEADER, NULL, "Available commands:" }, { CARDCMD, "store", "save current driver setup for one or each soundcards" }, { EMPCMD, NULL, " to configuration file" }, @@ -161,7 +164,7 @@ if (sched_idle) { if (sched_getparam(0, &sched_param) >= 0) { sched_param.sched_priority = 0; - if (!sched_setscheduler(0, SCHED_IDLE, &sched_param)) + if (sched_setscheduler(0, SCHED_IDLE, &sched_param) < 0) error("sched_setparam failed: %s", strerror(errno)); } else { error("sched_getparam failed: %s", strerror(errno)); @@ -191,6 +194,7 @@ int daemoncmd = 0; int use_nice = NO_NICE; int sched_idle = 0; + int initflags = 0; struct arg *a; struct option *o; int i, j, k, res; @@ -263,6 +267,9 @@ case 'I': init_fallback = 0; break; + case 'D': + initflags |= FLAG_UCM_DEFAULTS; + break; case 'r': statefile = optarg; break; @@ -354,8 +361,10 @@ syslog(LOG_INFO, "alsactl " SND_UTIL_VERSION_STR " daemon started"); } + snd_lib_error_set_handler(error_handler); + if (!strcmp(cmd, "init")) { - res = init(initfile, cardname); + res = init(initfile, initflags, cardname); snd_config_update_free_global(); } else if (!strcmp(cmd, "store")) { res = save_state(cfgfile, cardname); @@ -364,7 +373,7 @@ !strcmp(cmd, "nrestore")) { if (removestate) remove(statefile); - res = load_state(cfgfile, initfile, cardname, init_fallback); + res = load_state(cfgfile, initfile, initflags, cardname, init_fallback); if (!strcmp(cmd, "rdaemon")) { do_nice(use_nice, sched_idle); res = state_daemon(cfgfile, cardname, period, pidfile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/alsactl.h new/alsa-utils-1.2.3/alsactl/alsactl.h --- old/alsa-utils-1.2.2/alsactl/alsactl.h 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/alsactl.h 2020-06-07 19:19:42.000000000 +0200 @@ -11,6 +11,7 @@ void error_(const char *fcn, long line, const char *fmt, ...); void cerror_(const char *fcn, long line, int cond, const char *fmt, ...); void dbg_(const char *fcn, long line, const char *fmt, ...); +void error_handler(const char *file, int line, const char *function, int err, const char *fmt, ...); #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define info(...) do { info_(__func__, __LINE__, __VA_ARGS__); } while (0) @@ -24,12 +25,15 @@ #define dbg(args...) do { dbg_(__func__, __LINE__, ##args); } while (0) #endif -int init(const char *file, const char *cardname); +#define FLAG_UCM_DEFAULTS (1<<0) + +int init(const char *file, int flags, const char *cardname); +int init_ucm(int flags, int cardno); int state_lock(const char *file, int timeout); int state_unlock(int fd, const char *file); int save_state(const char *file, const char *cardname); -int load_state(const char *file, const char *initfile, const char *cardname, - int do_init); +int load_state(const char *file, const char *initfile, int initflags, + const char *cardname, int do_init); int power(const char *argv[], int argc); int monitor(const char *name); int state_daemon(const char *file, const char *cardname, int period, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/daemon.c new/alsa-utils-1.2.3/alsactl/daemon.c --- old/alsa-utils-1.2.2/alsactl/daemon.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/daemon.c 2020-06-07 19:19:42.000000000 +0200 @@ -293,7 +293,7 @@ static int write_pid_file(const char *pidfile) { int fd, err; - char pid_txt[12]; + char pid_txt[14]; sprintf(pid_txt, "%10li\n", (long)getpid()); fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0600); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/init_parse.c new/alsa-utils-1.2.3/alsactl/init_parse.c --- old/alsa-utils-1.2.2/alsactl/init_parse.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/init_parse.c 2020-06-07 19:19:42.000000000 +0200 @@ -1742,10 +1742,10 @@ return err ? err : -abs(space->exit_code); } -int init(const char *filename, const char *cardname) +int init(const char *filename, int flags, const char *cardname) { struct space *space; - int err = 0, card, first; + int err = 0, lasterr = 0, card, first; sysfs_init(); if (!cardname) { @@ -1762,22 +1762,34 @@ break; } first = 0; + err = init_ucm(flags, card); + if (err == 0) + continue; err = init_space(&space, card); if (err == 0) { space->rootdir = new_root_dir(filename); if (space->rootdir != NULL) err = parse(space, filename); + if (err <= -99) { /* non-fatal errors */ + if (lasterr == 0) + lasterr = err; + err = 0; + } free_space(space); } if (err < 0) break; } + err = lasterr; } else { card = snd_card_get_index(cardname); if (card < 0) { error("Cannot find soundcard '%s'...", cardname); goto error; } + err = init_ucm(flags, card); + if (err == 0) + return 0; memset(&space, 0, sizeof(space)); err = init_space(&space, card); if (err == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/init_ucm.c new/alsa-utils-1.2.3/alsactl/init_ucm.c --- old/alsa-utils-1.2.2/alsactl/init_ucm.c 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/init_ucm.c 2020-06-07 19:19:42.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * Advanced Linux Sound Architecture Control Program - UCM Initialization + * Copyright (c) by Jaroslav Kysela <[email protected]> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "aconfig.h" +#include <stddef.h> +#include "alsactl.h" + +#ifdef HAVE_ALSA_USE_CASE_H + +#include <alsa/use-case.h> + +/* + * Keep it as simple as possible. Execute commands from the SectionOnce only. + */ +int init_ucm(int flags, int cardno) +{ + snd_use_case_mgr_t *uc_mgr; + char id[32]; + int err; + + snprintf(id, sizeof(id), "hw:%d", cardno); + err = snd_use_case_mgr_open(&uc_mgr, id); + if (err < 0) + return err; + err = snd_use_case_set(uc_mgr, "_boot", NULL); + if (err < 0) + goto _error; + if ((flags & FLAG_UCM_DEFAULTS) != 0) { + err = snd_use_case_set(uc_mgr, "_defaults", NULL); + if (err < 0) + goto _error; + } +_error: + snd_use_case_mgr_close(uc_mgr); + return err; +} + +#else + +int init_ucm(int flags, int cardno) +{ + return 0; +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/monitor.c new/alsa-utils-1.2.3/alsactl/monitor.c --- old/alsa-utils-1.2.2/alsactl/monitor.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/monitor.c 2020-06-07 19:19:42.000000000 +0200 @@ -340,8 +340,10 @@ int count; int i; - count = epoll_wait(epfd, epev, max_ev_count, 200); + count = epoll_wait(epfd, epev, max_ev_count, -1); if (count < 0) { + if (errno == EINTR) + continue; err = count; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/state.c new/alsa-utils-1.2.3/alsactl/state.c --- old/alsa-utils-1.2.2/alsactl/state.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/state.c 2020-06-07 19:19:42.000000000 +0200 @@ -1645,8 +1645,8 @@ return err; } -int load_state(const char *file, const char *initfile, const char *cardname, - int do_init) +int load_state(const char *file, const char *initfile, int initflags, + const char *cardname, int do_init) { int err, finalerr = 0; snd_config_t *config; @@ -1704,7 +1704,7 @@ if (!do_init) break; sprintf(cardname1, "%i", card); - err = init(initfile, cardname1); + err = init(initfile, initflags, cardname1); if (err < 0) { finalerr = err; initfailed(card, "init", err); @@ -1743,7 +1743,7 @@ /* do a check if controls matches state file */ if (do_init && set_controls(card, config, 0)) { sprintf(cardname1, "%i", card); - err = init(initfile, cardname1); + err = init(initfile, initflags, cardname1); if (err < 0) { initfailed(card, "init", err); finalerr = err; @@ -1766,7 +1766,7 @@ } /* do a check if controls matches state file */ if (do_init && set_controls(cardno, config, 0)) { - err = init(initfile, cardname); + err = init(initfile, initflags, cardname); if (err < 0) { initfailed(cardno, "init", err); finalerr = err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsactl/utils.c new/alsa-utils-1.2.3/alsactl/utils.c --- old/alsa-utils-1.2.2/alsactl/utils.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsactl/utils.c 2020-06-07 19:19:42.000000000 +0200 @@ -111,7 +111,7 @@ buf[sizeof(buf)-1] = '\0'; vsnprintf(buf + strlen(buf), sizeof(buf)-strlen(buf), fmt, ap); buf[sizeof(buf)-1] = '\0'; - syslog(LOG_INFO, "%s", buf); + syslog(prio, "%s", buf); } void info_(const char *fcn, long line, const char *fmt, ...) @@ -177,3 +177,19 @@ } va_end(ap); } + +void error_handler(const char *file, int line, const char *function, int err, const char *fmt, ...) +{ + char buf[2048]; + va_list arg; + + va_start(arg, fmt); + vsnprintf(buf, sizeof(buf), fmt, arg); + va_end(arg); + if (use_syslog) + syslog(LOG_ERR, "alsa-lib %s:%i:(%s) %s%s%s\n", file, line, function, + buf, err ? ": " : "", err ? snd_strerror(err) : ""); + else + fprintf(stderr, "alsa-lib %s:%i:(%s) %s%s%s\n", file, line, function, + buf, err ? ": " : "", err ? snd_strerror(err) : ""); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsaloop/pcmjob.c new/alsa-utils-1.2.3/alsaloop/pcmjob.c --- old/alsa-utils-1.2.2/alsaloop/pcmjob.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsaloop/pcmjob.c 2020-06-07 19:19:42.000000000 +0200 @@ -1951,8 +1951,16 @@ } if (loop->sync != SYNC_TYPE_NONE) { snd_pcm_sframes_t pqueued, cqueued; - pqueued = get_queued_playback_samples(loop); - cqueued = get_queued_capture_samples(loop); + + /* Reduce cumulative error by interleaving playback vs capture reading order */ + if (loop->total_queued_count & 1) { + pqueued = get_queued_playback_samples(loop); + cqueued = get_queued_capture_samples(loop); + } else { + cqueued = get_queued_capture_samples(loop); + pqueued = get_queued_playback_samples(loop); + } + if (verbose > 4) snd_output_printf(loop->output, "%s: queued %li/%li samples\n", loop->id, pqueued, cqueued); if (pqueued > 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsamixer/utils.c new/alsa-utils-1.2.3/alsamixer/utils.c --- old/alsa-utils-1.2.2/alsamixer/utils.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsamixer/utils.c 2020-06-07 19:19:42.000000000 +0200 @@ -16,7 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE +#endif #include "aconfig.h" #include <limits.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsaucm/89-alsa-ucm.rules.in new/alsa-utils-1.2.3/alsaucm/89-alsa-ucm.rules.in --- old/alsa-utils-1.2.2/alsaucm/89-alsa-ucm.rules.in 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsaucm/89-alsa-ucm.rules.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -SUBSYSTEM!="sound", GOTO="ucm_end" -ACTION!="change", GOTO="ucm_end" -KERNEL!="card*", GOTO="ucm_end" - -ATTRS{id}=="PAZ00", RUN+="@bindir@/alsaucm -c PAZ00 set _verb HiFi" -ATTRS{id}=="PAZ00", RUN+="@bindir@/alsaucm -c PAZ00 set _verb Record" - -LABEL="ucm_end" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsaucm/Makefile.am new/alsa-utils-1.2.3/alsaucm/Makefile.am --- old/alsa-utils-1.2.2/alsaucm/Makefile.am 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/alsaucm/Makefile.am 2020-06-07 19:19:42.000000000 +0200 @@ -15,17 +15,6 @@ %.1: %.rst rst2man $< > $@ -udevrules_DATA = \ - 89-alsa-ucm.rules +EXTRA_DIST = alsaucm.rst -edit = \ - $(SED) -r -e 's,@bindir\@,$(bindir),g' \ - -e 's,@mydatadir\@,$(mydatadir),g' \ - < $< > $@ || rm $@ - -89-alsa-ucm.rules: 89-alsa-ucm.rules.in - $(edit) - -EXTRA_DIST = alsaucm.rst 89-alsa-ucm.rules.in - -CLEANFILES = alsaucm.1 89-alsa-ucm.rules +CLEANFILES = alsaucm.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/alsaucm/Makefile.in new/alsa-utils-1.2.3/alsaucm/Makefile.in --- old/alsa-utils-1.2.2/alsaucm/Makefile.in 2020-02-19 13:07:15.000000000 +0100 +++ new/alsa-utils-1.2.3/alsaucm/Makefile.in 2020-06-07 19:24:31.000000000 +0200 @@ -15,7 +15,6 @@ @SET_MAKE@ - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -107,8 +106,7 @@ CONFIG_HEADER = $(top_builddir)/include/aconfig.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(udevrulesdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am_alsaucm_OBJECTS = usecase.$(OBJEXT) dump.$(OBJEXT) alsaucm_OBJECTS = $(am_alsaucm_OBJECTS) @@ -179,7 +177,6 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) -DATA = $(udevrules_DATA) HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -358,16 +355,8 @@ AM_CPPFLAGS = \ -Wall -I$(top_srcdir)/include -udevrules_DATA = \ - 89-alsa-ucm.rules - -edit = \ - $(SED) -r -e 's,@bindir\@,$(bindir),g' \ - -e 's,@mydatadir\@,$(mydatadir),g' \ - < $< > $@ || rm $@ - -EXTRA_DIST = alsaucm.rst 89-alsa-ucm.rules.in -CLEANFILES = alsaucm.1 89-alsa-ucm.rules +EXTRA_DIST = alsaucm.rst +CLEANFILES = alsaucm.1 all: all-am .SUFFIXES: @@ -519,27 +508,6 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -install-udevrulesDATA: $(udevrules_DATA) - @$(NORMAL_INSTALL) - @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \ - done - -uninstall-udevrulesDATA: - @$(NORMAL_UNINSTALL) - @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -628,9 +596,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) +all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(udevrulesdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -687,7 +655,7 @@ info-am: -install-data-am: install-man install-udevrulesDATA +install-data-am: install-man install-dvi: install-dvi-am @@ -733,8 +701,7 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-man \ - uninstall-udevrulesDATA +uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-man: uninstall-man1 @@ -748,12 +715,11 @@ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ install-man install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-udevrulesDATA installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-man \ - uninstall-man1 uninstall-udevrulesDATA + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-man uninstall-man1 .PRECIOUS: Makefile @@ -761,9 +727,6 @@ %.1: %.rst rst2man $< > $@ -89-alsa-ucm.rules: 89-alsa-ucm.rules.in - $(edit) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/amixer/amixer.c new/alsa-utils-1.2.3/amixer/amixer.c --- old/alsa-utils-1.2.2/amixer/amixer.c 2020-02-19 13:02:10.000000000 +0100 +++ new/alsa-utils-1.2.3/amixer/amixer.c 2020-06-07 19:19:42.000000000 +0200 @@ -192,16 +192,22 @@ int tmp; if (range == 0) - return 0; + return min; val -= min; tmp = rint((double)val/(double)range * 100); return tmp; } -/* Function to convert from percentage to volume. val = percentage */ +/* Function to convert from percentage to volume. perc = percentage */ +static long convert_prange1(long perc, long min, long max) +{ + long tmp; -#define convert_prange1(val, min, max) \ - ceil((val) * ((max) - (min)) * 0.01 + (min)) + tmp = rint((double)perc * (double)(max - min) * 0.01); + if (tmp == 0 && perc > 0) + tmp++; + return tmp + min; +} struct volume_ops { int (*get_range)(snd_mixer_elem_t *elem, long *min, long *max); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/configure new/alsa-utils-1.2.3/configure --- old/alsa-utils-1.2.2/configure 2020-02-19 13:07:16.000000000 +0100 +++ new/alsa-utils-1.2.3/configure 2020-06-07 19:24:32.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for alsa-utils 1.2.2. +# Generated by GNU Autoconf 2.69 for alsa-utils 1.2.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='alsa-utils' PACKAGE_TARNAME='alsa-utils' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='alsa-utils 1.2.2' +PACKAGE_VERSION='1.2.3' +PACKAGE_STRING='alsa-utils 1.2.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1400,7 +1400,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures alsa-utils 1.2.2 to adapt to many kinds of systems. +\`configure' configures alsa-utils 1.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1470,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alsa-utils 1.2.2:";; + short | recursive ) echo "Configuration of alsa-utils 1.2.3:";; esac cat <<\_ACEOF @@ -1622,7 +1622,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alsa-utils configure 1.2.2 +alsa-utils configure 1.2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1987,7 +1987,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alsa-utils $as_me 1.2.2, which was +It was created by alsa-utils $as_me 1.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2853,7 +2853,7 @@ # Define the identity of the package. PACKAGE='alsa-utils' - VERSION='1.2.2' + VERSION='1.2.3' cat >>confdefs.h <<_ACEOF @@ -10896,7 +10896,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alsa-utils $as_me 1.2.2, which was +This file was extended by alsa-utils $as_me 1.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10962,7 +10962,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alsa-utils config.status 1.2.2 +alsa-utils config.status 1.2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/configure.ac new/alsa-utils-1.2.3/configure.ac --- old/alsa-utils-1.2.2/configure.ac 2020-02-19 13:07:12.000000000 +0100 +++ new/alsa-utils-1.2.3/configure.ac 2020-06-07 19:24:28.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(alsa-utils, 1.2.2) +AC_INIT(alsa-utils, 1.2.3) AC_CONFIG_SRCDIR([aplay/aplay.c]) AC_PREFIX_DEFAULT(/usr) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/include/version.h new/alsa-utils-1.2.3/include/version.h --- old/alsa-utils-1.2.2/include/version.h 2020-02-19 13:07:29.000000000 +0100 +++ new/alsa-utils-1.2.3/include/version.h 2020-06-07 19:24:44.000000000 +0200 @@ -4,9 +4,9 @@ #define SND_UTIL_MAJOR 1 #define SND_UTIL_MINOR 2 -#define SND_UTIL_SUBMINOR 2 +#define SND_UTIL_SUBMINOR 3 #define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\ (SND_UTIL_MINOR<<8)|\ SND_UTIL_SUBMINOR) -#define SND_UTIL_VERSION_STR "1.2.2" +#define SND_UTIL_VERSION_STR "1.2.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/po/alsa-utils.pot new/alsa-utils-1.2.3/po/alsa-utils.pot --- old/alsa-utils-1.2.2/po/alsa-utils.pot 2020-02-19 13:07:36.000000000 +0100 +++ new/alsa-utils-1.2.3/po/alsa-utils.pot 2020-06-07 19:24:53.000000000 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: alsa-utils 1.2.2\n" +"Project-Id-Version: alsa-utils 1.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 12:07+0000\n" +"POT-Creation-Date: 2020-06-07 17:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" Binary files old/alsa-utils-1.2.2/po/de.gmo and new/alsa-utils-1.2.3/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/po/de.po new/alsa-utils-1.2.3/po/de.po --- old/alsa-utils-1.2.2/po/de.po 2020-02-19 13:07:36.000000000 +0100 +++ new/alsa-utils-1.2.3/po/de.po 2020-06-07 19:24:53.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 12:07+0000\n" +"POT-Creation-Date: 2020-06-07 17:24+0000\n" "PO-Revision-Date: 2010-11-09 21:12+0100\n" "Last-Translator: Clemens Ladisch <[email protected]>\n" "Language-Team: German\n" Binary files old/alsa-utils-1.2.2/po/fr.gmo and new/alsa-utils-1.2.3/po/fr.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/po/fr.po new/alsa-utils-1.2.3/po/fr.po --- old/alsa-utils-1.2.2/po/fr.po 2020-02-19 13:07:36.000000000 +0100 +++ new/alsa-utils-1.2.3/po/fr.po 2020-06-07 19:24:53.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 12:07+0000\n" +"POT-Creation-Date: 2020-06-07 17:24+0000\n" "PO-Revision-Date: 2011-01-07 06:23+0100\n" "Last-Translator: Christoph J. Thompson <[email protected]>\n" "Language-Team: French <[email protected]>\n" Binary files old/alsa-utils-1.2.2/po/ja.gmo and new/alsa-utils-1.2.3/po/ja.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-utils-1.2.2/po/ja.po new/alsa-utils-1.2.3/po/ja.po --- old/alsa-utils-1.2.2/po/ja.po 2020-02-19 13:07:36.000000000 +0100 +++ new/alsa-utils-1.2.3/po/ja.po 2020-06-07 19:24:53.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: alsa-utils 1.0.9a\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 12:07+0000\n" +"POT-Creation-Date: 2020-06-07 17:24+0000\n" "PO-Revision-Date: 2009-05-27 15:08+0200\n" "Last-Translator: Takashi Iwai <[email protected]>\n" "Language-Team: Japanese\n"
