Accepting request 983888 from home:tiwai:branches:multimedia:libs
- 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
OBS-URL: https://build.opensuse.org/request/show/983888
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=307
This commit is contained in:
Git OBS Bridge
parent
1174d99af9
commit
ef5dac4bb4
@ -1,53 +0,0 @@
|
||||
From 87ff5318e327eb2343f10bd73dce5a32f12db622 Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <smcv@collabora.com>
|
||||
Date: Wed, 25 May 2022 12:33:42 +0100
|
||||
Subject: [PATCH 1/2] conf: Use ino64_t to save and compare inode numbers
|
||||
|
||||
On 32-bit platforms when not using the large-file-support ABI,
|
||||
struct stat64 contains ino64_t which is 64-bit, while ino_t is only
|
||||
32-bit.
|
||||
|
||||
snd_config_update_r() checks whether a file has been replaced by saving
|
||||
the ino member of a struct stat64 and comparing it with a previously-saved
|
||||
inode number. On 32-bit platforms, assigning the 64-bit member of struct
|
||||
stat64 to a 32-bit member of struct finfo will truncate it modulo 1<<32,
|
||||
which could conceivably result in libasound not reloading configuration
|
||||
when it should (although the inode number space is large enough to make
|
||||
this failure mode highly unlikely).
|
||||
|
||||
Fixes: https://github.com/alsa-project/alsa-lib/pull/231
|
||||
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
include/local.h | 1 +
|
||||
src/conf.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/local.h b/include/local.h
|
||||
index 51fa4063afa7..268a9ff1200e 100644
|
||||
--- a/include/local.h
|
||||
+++ b/include/local.h
|
||||
@@ -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 --git a/src/conf.c b/src/conf.c
|
||||
index 3d2b4a5bc184..a996e5f9f9be 100644
|
||||
--- a/src/conf.c
|
||||
+++ b/src/conf.c
|
||||
@@ -3921,7 +3921,7 @@ snd_config_t *snd_config = NULL;
|
||||
struct finfo {
|
||||
char *name;
|
||||
dev_t dev;
|
||||
- ino_t ino;
|
||||
+ ino64_t ino;
|
||||
time_t mtime;
|
||||
};
|
||||
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 89ee61914756a6f8bcafbad7fb1eca674b0a012f Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 6 Jun 2022 12:11:24 +0200
|
||||
Subject: [PATCH 2/2] control: eld - fix the decoding for older hw
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It seems that the monitor name is not always present in the
|
||||
ELD structure. Add asterisk suffix to notify user about
|
||||
the monitor present for this case.
|
||||
|
||||
Thanks goes to Bernhard Rosenkränzer <bero@lindev.ch> for the report.
|
||||
|
||||
Fixes: https://github.com/alsa-project/alsa-lib/pull/233
|
||||
Fixes: https://github.com/alsa-project/alsa-lib/pull/234
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
src/control/eld.c | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/control/eld.c b/src/control/eld.c
|
||||
index 1e161eb1d271..9be9605fd091 100644
|
||||
--- a/src/control/eld.c
|
||||
+++ b/src/control/eld.c
|
||||
@@ -74,8 +74,13 @@ int __snd_pcm_info_eld_fixup(snd_pcm_info_t * info)
|
||||
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 @@ int __snd_pcm_info_eld_fixup(snd_pcm_info_t * info)
|
||||
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;
|
||||
}
|
||||
--
|
||||
2.35.3
|
||||
|
||||
3
alsa-lib-1.2.7.1.tar.bz2
Normal file
3
alsa-lib-1.2.7.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:046dc42dfcfad269217be05954686137e5e7397f3041372f8c6dcd7d79461e61
|
||||
size 1084711
|
||||
16
alsa-lib-1.2.7.1.tar.bz2.sig
Normal file
16
alsa-lib-1.2.7.1.tar.bz2.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmKsT3IACgkQg4BZbabl
|
||||
nJEfFg//by6qV5F3c09J4ABA65joafCCwkTP2k3ecpJWFdxOmDECdWvXckVI0ryv
|
||||
yne9oNCBY7Fsrt2dQZURJOWOEoRQzXWAZaJY+CaAEgR2I8aNUUCViDyeamY7X50a
|
||||
Et7aPkIZjmGkqkJJ/9X4dfsnZXeRwFV9bPctSwotWiCGK6yhNLJ9aCsfcdrL7PSO
|
||||
Pdf5zlRY+YZW6wPrQCDwO44dPABW1v+J7cId9iNF/m3Nk3y0H7HWrLCopOaK4MK2
|
||||
DHP4588uqE+pGLO77kybL+DbuIQfTf+nfT9QUOb3QDdtQHvNemGeONSUdyS6i6DM
|
||||
Knzy8Gd3wamP6MLPMGNGCe2hgORLt8elFunoz/Z19LzkWSGIO9zpEXkmgJ2FCRei
|
||||
fQmFcz3uKIhWukv1pf5rgj501ovDfg8z+zsuKo/zVxkrViWTiFA2A1qtGaEo/yx8
|
||||
pQ8U7awpmI8ukp+k34wXVzeHNQ1XLZH6ucnnYTU8hKN4/2Ga67Faie+gd0BEW3sM
|
||||
fUmjmnYeAoFTPhXUtcw68s01jsYzya2+F6IA8HmQNHUOXWDMYbrHfkJyMKWw+hsl
|
||||
W64QBiVgIrcKrF1F2rPPj5K9ZWZEjwQKaqXQmMaKmC44BJJeCGzvYUo7c1n3tKI6
|
||||
d4cgxT9aRvGdX+Z8jjuAh5SiZuK5T+zq79Rk0SERjfPzaezr9WE=
|
||||
=WpP8
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8814e61f7ec6812c76e23a85cab00e0b0d3bba40816af36b726beb1bc04c74a7
|
||||
size 1084924
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmKWLEgACgkQg4BZbabl
|
||||
nJHQHQ/6A0deDqsaUyvHOuqZBlAekfyPSSv1aGFyhZpH/9nXnNS8L5bSQqB1yw+r
|
||||
Tac69mvjkDOvR+ng/q3aoYdTp8moIz4VF5Vw1wnGwvg7iH5Em8SU0uhMf44pPPAF
|
||||
hfJv8fKKu0oTrn/ffLlpIVVUnJjPSZ67ApH1et0kzrUkNh3qUWfCRj7MjEnMSwho
|
||||
vcBL5VQtL7fAiKCEalvs02eSAc5JnkOO43W9UayAY5n5dA0DYJvdq/5nSA/Ls7wb
|
||||
nsMNVl7PUTTRld8/nQds4bXhwdmoHNXeY2FczE+nfQGzWES4xZXHui68VgMwEDSf
|
||||
SUyjiJnB/P6vOVEYH4/T14eOBBVB9SAyoGefHStXX+vulzlOXAKv6L/Mc74lZ+XU
|
||||
OKCRpzvUZfmK+X4y6p3XGnMU5w5v5MC/TtwSquFd6U8MlrgTz6TMBF+7NMEedgBG
|
||||
G7bqjs7K1zSJGPalliJ4FmoF+64R3/RC0NNK0RmL7oQZb2GGs0OxIyaaOBqt3lla
|
||||
H9Cnp6XR+F46J55Lo2MK4wVk9clqZ9RcPtakUt/yVDmmsSc8TuE4LvUMFmpuyzXZ
|
||||
KlVz7UjnnS8A7VsqwgD3gc1QkpDartOkXfI/LL1ZtcReW0ej+JHC8FIz3Lx/BZ/u
|
||||
95Rbp4+MHpI312xU28P12E+CpFLy9Xw5JIaWezFuBTzepECMNdA=
|
||||
=vPpO
|
||||
-----END PGP SIGNATURE-----
|
||||
10
alsa.changes
10
alsa.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 08:13:19 UTC 2022 - Takashi Iwai <tiwai@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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 6 10:56:29 UTC 2022 - Takashi Iwai <tiwai@suse.com>
|
||||
|
||||
|
||||
@ -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 @@ Source30: all_notes_off
|
||||
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 @@ This package contains the library for ALSA topology support.
|
||||
|
||||
%prep
|
||||
%setup -q -n alsa-lib-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch101 -p1
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user