Accepting request 1108920 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1108920
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=220

0001-control.h-Fix-ump-header-file-detection.patch

@@ -0,0 +1,40 @@
+From fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 4 Sep 2023 09:38:26 +0200
+Subject: [PATCH] control.h: Fix ump header file detection
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Apparently, the control.h is used from apps separately (outside
+asoundlib.h). Avoid errors like:
+
+/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared
+  417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
+      |                                               ^~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared
+  418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
+      |                                            ^~~~~~~~~~~~~~~~~~~~
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/348
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ include/control.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/control.h b/include/control.h
+index ab482ba448c0..e7541d56d636 100644
+--- a/include/control.h
++++ b/include/control.h
+@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev);
+ int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device);
+ int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info);
+ int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev);
++#endif
++#ifdef __ALSA_UMP_H
+ int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device);
+ int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
+ int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
+-- 
+2.35.3
+

alsa-lib-1.2.10.tar.bz2.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmTyDKoACgkQg4BZbabl
+nJHkUQ/9FBYbT0I6HvjfJmkYBfpRDRbSxPimqho6CYdHPS4gEBksGha1obBoFEnn
+HAmv8pFWn4tYOPGJ6RD+mGHBntc9W7Mzg6J7NTcoaGK3u4szPwZ4iPhn5QSMOGzH
+wRFJFb1jt1Ryj8eKJQSELsy2VMJzSj3cObu8nILJlKAeV9AJfAFyXRQPUjJZOkDr
+27oItHV2vtEaIndHTNHYOnkDrPPp0DplM+gfUhLP0ghu0hknQI7PuOJzN9AWqkVD
+UiMsVGdXvPTmJd0+nzzUSY5lmStWcp7kujH5er/0YpB1/SWS9GgN4YN5q5nUFgVA
+b5xBb3/8xW0EZ9j53X+PgCE57iMe5/5UCto70ITO4o44k0rev/9ixdzBc5J5dyls
+cRLtXJwnxNS82pG429uOkEBAe309JCMKpDlOksKbPpqbtvcRN3yXlE92GEuUIrHT
+VCPzNQd5XXYXX4E06/ScbpYvFqEyoT+Ph6cyunwoL9ocioj+tsB4fHi1exbwoy6+
+/rx/70NjtFEVCdRpuflNmQZGyTtDd+sfaxsanH8MK7jdZCIXHyLBKqSRIrSoc8v/
+sU7fzSPQ2zh1dnmjzm69l1z/YmPHf+gbGwC4Tb6Wq37o49APQYh2csz6z4E0pMP3
+WgSPuWyXfgsQg9vu1/D+DnQAQFHFK8q2JKmpf7QoXpFGMN3G2nI=
+=qe38
+-----END PGP SIGNATURE-----

alsa-lib-1.2.9.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2
-size 1094660

alsa-lib-1.2.9.tar.bz2.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmRTX9IACgkQg4BZbabl
-nJGoPhAAhlKAUFkBwDCj4819yRKSoGlN6csHoXyivyEg2rhZYa0cSnx9pOBVcJMe
-Osz91JzsOIYy+bJT3RkQ7ysNGaM3FbMulwOciTusd9oqhKazQe9JLFmq3vKfaM1N
-9b3TkHFecvVDJls4R6A/oJPLpteCYHSJHJD7o/BOEbyeJRLu2wG3qJw3bx+fBKzq
-RknVEwYjBqFlbkP+ye74e7LwLwLdsngU98hAlq+dCQhuYtOlDywERG/WlkYisIT8
-KBsmUSISARbuexSNKpjVW+QCV1ArgkRjDsFwTpfocfPAAsPqltrqzuG7NWJPzMD0
-LkfBxhb65LJOM9v3oDMg0xcr2galDNYm4I+mClp55jroDB//etDCpkg/am9H1i12
-iRVILZRvDFpAKqgwnh+7VhBi7bY4K9PyTEGUqov3lnyGyc9syYUfxlB3Pa6PV+vP
-u64OaHwmSwm4rtHEIXZoHX58jvdAzfzGr9cjwuBv1e+LjBoK9K1ldkhKgcpgmu+t
-3L3mw4nVtNmicWYV0Q673ZuyF+lM7YnrzwV6QN7FDpeVKANJyDYqvPKL0gczt5oi
-NG6inpIefX8hQpI+08dd6WgAj8/EJJjwhirWuCBikmwY/NimfiGyecA+NE+1qgAF
-0wIyWFOd5zQhh3IutwzAIK8agulFfU81TxJQ8S2RzlvkrDZXYAg=
-=Zq8f
------END PGP SIGNATURE-----

alsa.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Sep  4 12:33:29 UTC 2023 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 1.2.10:
+  * MIDI 2.0 feature support
+  * build fixes for various platforms
+  * various documentation fixes
+  * misc topology fixes
+  * ucm fixes and cleanups
+  For details, see:
+    https://www.alsa-project.org/wiki/Changes_v1.2.9_v1.2.10#alsa-lib
+- Took upstream fix for possible build errors:
+  0001-control.h-Fix-ump-header-file-detection.patch
+
 -------------------------------------------------------------------
 Mon May  8 08:42:43 UTC 2023 - Takashi Iwai <tiwai@suse.com>
 

alsa.spec

@@ -32,7 +32,7 @@
 %endif
 
 Name:           alsa
-Version:        1.2.9
+Version:        1.2.10
 Release:        0
 Summary:        Advanced Linux Sound Architecture
 License:        LGPL-2.1-or-later
@@ -55,6 +55,8 @@ Source32:       all_notes_off.mid
 Source34:       alsa-init.sh
 # from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt
 Source35:       alsa.keyring
+# upstream fixes
+Patch1:         0001-control.h-Fix-ump-header-file-detection.patch
 # rest suse fixes
 Patch101:       alsa-lib-ignore-non-accessible-ALSA_CONFIG_PATH.patch
 BuildRequires:  doxygen
@@ -143,6 +145,7 @@ This package contains the library for ALSA topology support.
 
 %prep
 %setup -q -n alsa-lib-%{version}
+%patch1 -p1
 %patch101 -p1
 
 %build