Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at 2022-06-21 17:15:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa (Old) and /work/SRC/openSUSE:Factory/.alsa.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa" Tue Jun 21 17:15:27 2022 rev:216 rq:983999 version:1.2.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa/alsa.changes 2022-06-07 11:45:02.899223704 +0200 +++ /work/SRC/openSUSE:Factory/.alsa.new.1548/alsa.changes 2022-06-21 17:15:35.518356648 +0200 @@ -1,0 +2,10 @@ +Mon Jun 20 08:13:19 UTC 2022 - Takashi Iwai <ti...@suse.com> + +- Update to version 1.2.7.1: minor bug fixes, including the previous + patches. For details, see + https://www.alsa-project.org/wiki/Changes_v1.2.7_v1.2.7.1#alsa-lib +- Drop obsoleted patches: + 0001-conf-Use-ino64_t-to-save-and-compare-inode-numbers.patch + 0002-control-eld-fix-the-decoding-for-older-hw.patch + +------------------------------------------------------------------- Old: ---- 0001-conf-Use-ino64_t-to-save-and-compare-inode-numbers.patch 0002-control-eld-fix-the-decoding-for-older-hw.patch alsa-lib-1.2.7.tar.bz2 alsa-lib-1.2.7.tar.bz2.sig New: ---- alsa-lib-1.2.7.1.tar.bz2 alsa-lib-1.2.7.1.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.sJcMLX/_old 2022-06-21 17:15:36.286357430 +0200 +++ /var/tmp/diff_new_pack.sJcMLX/_new 2022-06-21 17:15:36.290357435 +0200 @@ -32,7 +32,7 @@ %endif Name: alsa -Version: 1.2.7 +Version: 1.2.7.1 Release: 0 Summary: Advanced Linux Sound Architecture License: LGPL-2.1-or-later @@ -53,8 +53,6 @@ Source31: all_notes_off.bin Source32: all_notes_off.mid Source34: alsa-init.sh -Patch1: 0001-conf-Use-ino64_t-to-save-and-compare-inode-numbers.patch -Patch2: 0002-control-eld-fix-the-decoding-for-older-hw.patch # rest suse fixes Patch101: alsa-lib-ignore-non-accessible-ALSA_CONFIG_PATH.patch BuildRequires: doxygen @@ -143,8 +141,6 @@ %prep %setup -q -n alsa-lib-%{version} -%patch1 -p1 -%patch2 -p1 %patch101 -p1 %build ++++++ alsa-lib-1.2.7.tar.bz2 -> alsa-lib-1.2.7.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/configure new/alsa-lib-1.2.7.1/configure --- old/alsa-lib-1.2.7/configure 2022-05-31 16:50:02.000000000 +0200 +++ new/alsa-lib-1.2.7.1/configure 2022-06-17 11:52:34.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-lib 1.2.7. +# Generated by GNU Autoconf 2.69 for alsa-lib 1.2.7.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='alsa-lib' PACKAGE_TARNAME='alsa-lib' -PACKAGE_VERSION='1.2.7' -PACKAGE_STRING='alsa-lib 1.2.7' +PACKAGE_VERSION='1.2.7.1' +PACKAGE_STRING='alsa-lib 1.2.7.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1471,7 +1471,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-lib 1.2.7 to adapt to many kinds of systems. +\`configure' configures alsa-lib 1.2.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1542,7 +1542,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alsa-lib 1.2.7:";; + short | recursive ) echo "Configuration of alsa-lib 1.2.7.1:";; esac cat <<\_ACEOF @@ -1704,7 +1704,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alsa-lib configure 1.2.7 +alsa-lib configure 1.2.7.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2115,7 +2115,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-lib $as_me 1.2.7, which was +It was created by alsa-lib $as_me 1.2.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3053,7 +3053,7 @@ # Define the identity of the package. PACKAGE='alsa-lib' - VERSION='1.2.7' + VERSION='1.2.7.1' cat >>confdefs.h <<_ACEOF @@ -14978,7 +14978,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alsa-lib $as_me 1.2.7, which was +This file was extended by alsa-lib $as_me 1.2.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15044,7 +15044,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-lib config.status 1.2.7 +alsa-lib config.status 1.2.7.1 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-lib-1.2.7/configure.ac new/alsa-lib-1.2.7.1/configure.ac --- old/alsa-lib-1.2.7/configure.ac 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/configure.ac 2022-06-17 11:42:05.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(alsa-lib, 1.2.7) +AC_INIT(alsa-lib, 1.2.7.1) AC_CONFIG_SRCDIR([src/control/control.c]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/include/input.h new/alsa-lib-1.2.7.1/include/input.h --- old/alsa-lib-1.2.7/include/input.h 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/include/input.h 2022-06-17 11:42:05.000000000 +0200 @@ -28,6 +28,8 @@ #ifndef __ALSA_INPUT_H #define __ALSA_INPUT_H +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/include/local.h new/alsa-lib-1.2.7.1/include/local.h --- old/alsa-lib-1.2.7/include/local.h 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/include/local.h 2022-06-17 11:42:05.000000000 +0200 @@ -84,6 +84,7 @@ #define scandir64 scandir #define versionsort64 versionsort #define alphasort64 alphasort +#define ino64_t ino_t #endif #define _snd_config_iterator list_head diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/include/output.h new/alsa-lib-1.2.7.1/include/output.h --- old/alsa-lib-1.2.7/include/output.h 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/include/output.h 2022-06-17 11:42:05.000000000 +0200 @@ -28,6 +28,8 @@ #ifndef __ALSA_OUTPUT_H #define __ALSA_OUTPUT_H +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/include/version.h new/alsa-lib-1.2.7.1/include/version.h --- old/alsa-lib-1.2.7/include/version.h 2022-05-31 16:50:10.000000000 +0200 +++ new/alsa-lib-1.2.7.1/include/version.h 2022-06-17 11:52:47.000000000 +0200 @@ -10,5 +10,5 @@ #define SND_LIB_VER(maj, min, sub) (((maj)<<16)|((min)<<8)|(sub)) #define SND_LIB_VERSION SND_LIB_VER(SND_LIB_MAJOR, SND_LIB_MINOR, SND_LIB_SUBMINOR) /** library version (string) */ -#define SND_LIB_VERSION_STR "1.2.7" +#define SND_LIB_VERSION_STR "1.2.7.1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/libtool new/alsa-lib-1.2.7.1/libtool --- old/alsa-lib-1.2.7/libtool 2022-05-31 16:50:10.000000000 +0200 +++ new/alsa-lib-1.2.7.1/libtool 2022-06-17 11:52:47.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# Generated automatically by config.status (alsa-lib) 1.2.7 +# Generated automatically by config.status (alsa-lib) 1.2.7.1 # Libtool was configured on host f420bc43a183: # NOTE: Changes made to this file will be lost: look at ltmain.sh. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/src/conf.c new/alsa-lib-1.2.7.1/src/conf.c --- old/alsa-lib-1.2.7/src/conf.c 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/src/conf.c 2022-06-17 11:42:05.000000000 +0200 @@ -3921,7 +3921,7 @@ struct finfo { char *name; dev_t dev; - ino_t ino; + ino64_t ino; time_t mtime; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/src/control/eld.c new/alsa-lib-1.2.7.1/src/control/eld.c --- old/alsa-lib-1.2.7/src/control/eld.c 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/src/control/eld.c 2022-06-17 11:42:05.000000000 +0200 @@ -74,8 +74,13 @@ if (cinfo.count < 20 || cinfo.count > 256) return -EIO; l = eld[4] & 0x1f; - if (l == 0 || l > 16 || 20 + l > cinfo.count) - return -EIO; + if (l == 0) + /* no monitor name detected */ + goto __present; + if (l > 16 || 20 + l > cinfo.count) { + SNDERR("ELD decode failed, using old HDMI output names\n"); + return 0; + } s = alloca(l + 1); s[l] = '\0'; /* sanitize */ @@ -90,7 +95,12 @@ s[l] = c; } } - if (valid > 3) + if (valid > 3) { snd_strlcpy((char *)info->name, s, sizeof(info->name)); + } else { +__present: + strncat((char *)info->name, " *", sizeof(info->name) - 1); + ((char *)info->name)[sizeof(info->name)-1] = '\0'; + } return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/src/pcm/pcm_dmix_i386.c new/alsa-lib-1.2.7.1/src/pcm/pcm_dmix_i386.c --- old/alsa-lib-1.2.7/src/pcm/pcm_dmix_i386.c 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/src/pcm/pcm_dmix_i386.c 2022-06-17 11:42:05.000000000 +0200 @@ -104,8 +104,7 @@ /* try to determine the capabilities of the CPU */ in = fopen("/proc/cpuinfo", "r"); if (in) { - while (!feof(in)) { - fgets(line, sizeof(line), in); + while (!feof(in) && (fgets(line, sizeof(line), in) != NULL)) { if (!strncmp(line, "processor", 9)) smp++; else if (!strncmp(line, "flags", 5)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/src/pcm/pcm_dmix_x86_64.c new/alsa-lib-1.2.7.1/src/pcm/pcm_dmix_x86_64.c --- old/alsa-lib-1.2.7/src/pcm/pcm_dmix_x86_64.c 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/src/pcm/pcm_dmix_x86_64.c 2022-06-17 11:42:05.000000000 +0200 @@ -87,8 +87,7 @@ /* try to determine, if we have SMP */ in = fopen("/proc/cpuinfo", "r"); if (in) { - while (!feof(in)) { - fgets(line, sizeof(line), in); + while (!feof(in) && (fgets(line, sizeof(line), in) != NULL)) { if (!strncmp(line, "processor", 9)) smp++; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/src/ucm/parser.c new/alsa-lib-1.2.7.1/src/ucm/parser.c --- old/alsa-lib-1.2.7/src/ucm/parser.c 2022-05-31 16:25:33.000000000 +0200 +++ new/alsa-lib-1.2.7.1/src/ucm/parser.c 2022-06-17 11:42:05.000000000 +0200 @@ -2880,13 +2880,27 @@ { char filename[PATH_MAX], dfl[PATH_MAX], fn[FILENAME_MAX]; char *env = getenv(ALSA_CONFIG_UCM2_VAR); + snd_use_case_mgr_t *uc_mgr; const char **list, *d_name; + char *s; snd_config_t *cfg, *c; - int i, j, cnt, err; + int i, j, cnt, err, cards; long l; ssize_t ss; struct dirent64 **namelist; + i = -1; + cards = 0; + while (1) { + err = snd_card_next(&i); + if (err < 0) + return err; + if (i < 0) + break; + cards++; + } + cards += 4; /* plug-and-play */ + if (env) snprintf(filename, sizeof(filename), "%s/conf.virt.d", env); else @@ -2921,13 +2935,46 @@ } } - list = calloc(1, cnt * 2 * sizeof(char *)); + j = 0; + list = calloc(1, (cards + cnt) * 2 * sizeof(char *)); if (list == NULL) { err = -ENOMEM; goto __err; } - for (i = j = 0; i < cnt; i++) { + i = -1; + while (j / 2 < cards) { + err = snd_card_next(&i); + if (err < 0) + goto __err; + if (i < 0) + break; + snprintf(fn, sizeof(fn), "-hw:%d", i); + err = snd_use_case_mgr_open(&uc_mgr, fn); + if (err == -ENOENT || err == -ENXIO) + continue; + if (err < 0) { + uc_error("Unable to open '%s': %s", fn, snd_strerror(err)); + goto __err; + } + err = snd_use_case_get(uc_mgr, "comment", (const char **)&s); + if (err < 0) { + err = snd_card_get_longname(i, &s); + if (err < 0) + goto __err; + } + snd_use_case_mgr_close(uc_mgr); + list[j] = strdup(fn + 1); + if (list[j] == NULL) { + free(s); + err = -ENOMEM; + goto __err; + } + list[j + 1] = s; + j += 2; + } + + for (i = 0; i < cnt; i++) { d_name = namelist[i]->d_name; @@ -2984,23 +3031,21 @@ } j += 2; } - err = j; + err = 0; __err: - for (i = 0; i < cnt; i++) { + for (i = 0; i < cnt; i++) free(namelist[i]); - if (err < 0) { + free(namelist); + if (err < 0) { + for (i = 0; i < j; i++) { free((void *)list[i * 2]); free((void *)list[i * 2 + 1]); } - } - free(namelist); - - if (err >= 0) { - *_list = list; - } else { free(list); + return err; } - return err; + *_list = list; + return j; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.2.7/version new/alsa-lib-1.2.7.1/version --- old/alsa-lib-1.2.7/version 2022-05-31 16:50:06.000000000 +0200 +++ new/alsa-lib-1.2.7.1/version 2022-06-17 11:52:43.000000000 +0200 @@ -1 +1 @@ -1.2.7 +1.2.7.1
