From 960cb37fcd5ec1bc2fb0da4cb4dec6781c8f0b4344dc083e8e52562006fbdf2e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 1 Jun 2022 06:18:30 +0000 Subject: [PATCH] Accepting request 980230 from home:tiwai:branches:multimedia:libs - Update to alsa-utils 1.2.7: Enhancement and fixes of alsactl, speaker-test cleanup, alsatplg enhancements, arecord ghost data fix, etc. For details see: https://www.alsa-project.org/wiki/Changes_v1.2.6.3_v1.2.7#alsa-utils - Drop obsoleted patches: 0001-alsamixer-Fix-regression-in-color-setup.patch 0002-alsamixer-Revert-has_mouse-check.patch OBS-URL: https://build.opensuse.org/request/show/980230 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=201 --- ...amixer-Fix-regression-in-color-setup.patch | 105 ------------------ 0002-alsamixer-Revert-has_mouse-check.patch | 33 ------ alsa-utils-1.2.6.tar.bz2 | 3 - alsa-utils-1.2.6.tar.bz2.sig | 16 --- alsa-utils-1.2.7.tar.bz2 | 3 + alsa-utils-1.2.7.tar.bz2.sig | 16 +++ alsa-utils.changes | 12 ++ alsa-utils.spec | 23 ++-- 8 files changed, 47 insertions(+), 164 deletions(-) delete mode 100644 0001-alsamixer-Fix-regression-in-color-setup.patch delete mode 100644 0002-alsamixer-Revert-has_mouse-check.patch delete mode 100644 alsa-utils-1.2.6.tar.bz2 delete mode 100644 alsa-utils-1.2.6.tar.bz2.sig create mode 100644 alsa-utils-1.2.7.tar.bz2 create mode 100644 alsa-utils-1.2.7.tar.bz2.sig diff --git a/0001-alsamixer-Fix-regression-in-color-setup.patch b/0001-alsamixer-Fix-regression-in-color-setup.patch deleted file mode 100644 index e7714e4..0000000 --- a/0001-alsamixer-Fix-regression-in-color-setup.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 40202a522aa86599bffaabf8097bf9bf1cef4f61 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Thu, 20 Jan 2022 08:49:17 +0100 -Subject: [PATCH] alsamixer: Fix regression in color setup - -The recent change to add the background config broke the color setup -via the config file due. Fix the regression by restoring the -initialization order back again, and changing the logic for the -default background color to be re-initializing color pairs instead. - -Link: https://github.com/alsa-project/alsa-utils/issues/137 -Signed-off-by: Takashi Iwai ---- - alsamixer/cli.c | 8 ++++---- - alsamixer/colors.c | 13 ++++++++++++- - alsamixer/colors.h | 2 +- - alsamixer/configparser.c | 2 +- - 4 files changed, 18 insertions(+), 7 deletions(-) - -diff --git a/alsamixer/cli.c b/alsamixer/cli.c -index 63c4949bab96..f153f280cd9f 100644 ---- a/alsamixer/cli.c -+++ b/alsamixer/cli.c -@@ -152,15 +152,15 @@ int main(int argc, char *argv[]) - - parse_options(argc, argv); - -+ create_mixer_object(&selem_regopt); -+ -+ initialize_curses(use_color, use_mouse); -+ - if (config_file == CONFIG_DEFAULT) - parse_default_config_file(); - else if (config_file) - parse_config_file(config_file); - -- create_mixer_object(&selem_regopt); -- -- initialize_curses(use_color, use_mouse); -- - create_mixer_widget(); - - mainloop(); -diff --git a/alsamixer/colors.c b/alsamixer/colors.c -index f76dc26ef380..cca5233e82cd 100644 ---- a/alsamixer/colors.c -+++ b/alsamixer/colors.c -@@ -23,7 +23,7 @@ - #include "colors.h" - - struct attributes attrs; --short background_color = -1; -+static short background_color = -1; - - int get_color_pair(short fg, short bg) - { -@@ -45,6 +45,17 @@ int get_color_pair(short fg, short bg) - return 0; - } - -+void reinit_colors(short bg) -+{ -+ if (bg == background_color) -+ return; -+ init_pair(1, COLOR_CYAN, bg); -+ init_pair(2, COLOR_YELLOW, bg); -+ init_pair(4, COLOR_RED, bg); -+ init_pair(5, COLOR_WHITE, bg); -+ background_color = bg; -+} -+ - void init_colors(int use_color) - { - if (!!has_colors() == !!use_color) { -diff --git a/alsamixer/colors.h b/alsamixer/colors.h -index 1c7bff8e7d32..ac404e9ccc16 100644 ---- a/alsamixer/colors.h -+++ b/alsamixer/colors.h -@@ -34,9 +34,9 @@ struct attributes { - }; - - extern struct attributes attrs; --extern short background_color; - - void init_colors(int use_color); -+void reinit_colors(short bg); - int get_color_pair(short fg, short bg); - - #endif -diff --git a/alsamixer/configparser.c b/alsamixer/configparser.c -index 4396d4ff302e..b2b55f4754bc 100644 ---- a/alsamixer/configparser.c -+++ b/alsamixer/configparser.c -@@ -451,7 +451,7 @@ static int cfg_set(char **argv, unsigned int argc) - error_cause = argv[1]; - return ERROR_CONFIG; - } -- background_color = bg_color; -+ reinit_colors(bg_color); - } - else { - error_message = _("unknown option"); --- -2.31.1 - diff --git a/0002-alsamixer-Revert-has_mouse-check.patch b/0002-alsamixer-Revert-has_mouse-check.patch deleted file mode 100644 index 4bec28c..0000000 --- a/0002-alsamixer-Revert-has_mouse-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c511b49bf697e05df4b0987d0fd81e3329f64ce6 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 28 Jan 2022 17:46:45 +0100 -Subject: [PATCH] alsamixer: Revert has_mouse() check - -has_mouse() function of ncurses doesn't seem working reliably. -Revert the previous change for addressing the regressions. - -Fixes: 31820c5f239f ("alsamixer: Check the availability of mouse") -BugLink: https://github.com/alsa-project/alsa-utils/issues/139 -Signed-off-by: Takashi Iwai ---- - alsamixer/mainloop.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c -index cdbe28e390fd..bf3f70defbaa 100644 ---- a/alsamixer/mainloop.c -+++ b/alsamixer/mainloop.c -@@ -50,8 +50,9 @@ void initialize_curses(bool use_color, bool use_mouse) - #endif - window_size_changed(); /* update screen_lines/cols */ - init_colors(use_color); -- if (use_mouse && has_mouse()) -+ if (use_mouse) - mousemask(ALL_MOUSE_EVENTS, NULL); -+ - snd_lib_error_set_handler(black_hole_error_handler); - } - --- -2.31.1 - diff --git a/alsa-utils-1.2.6.tar.bz2 b/alsa-utils-1.2.6.tar.bz2 deleted file mode 100644 index b6fa23b..0000000 --- a/alsa-utils-1.2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d -size 1334063 diff --git a/alsa-utils-1.2.6.tar.bz2.sig b/alsa-utils-1.2.6.tar.bz2.sig deleted file mode 100644 index 001f2cc..0000000 --- a/alsa-utils-1.2.6.tar.bz2.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmGt/bsACgkQg4BZbabl -nJEFiw/8CdVWCNaMUzIVkArx/7uVHajTbMaG80MtNA9x3VCE94xlAaA8dftlSrxg -GEO+tDQFyNdY3ro2hVqRxfaKChvp7/b6XrRqTiqAlGR4m8YUu3QzaLArU2jxPyvH -FqeaWHepFbjTKJRNqzWHwwUwn08+ATfkDMF0H+z85/BfhwsxTyDwsWI2OlzoDrsu -X26TIJ9n+8mmw53raib8ON3zBBP6svJLebFu67vAHKabWmlBg4l06xZHkIjZhbAL -PoqKef3/CwDCsdeR2CBTS4xPK/y7ap9N9LaWkkkrvJyXu50Y53YcRcb0RSoEtt58 -L1HgPbWLuycMF3q/XnfUVHMxne9ykgRpj9AtutnOkpL+PUwy5SpbL2LOZbY6k9iN -gMQt1dmSHyNpJdUhL0/HHK//WjwhXHfXvE5ukTkaLqcLo13GVik3LbqC+NtrL2eS -oPq6bnvDnqBdah8Y+W8Rf3/hY1dIbjQmN/4/Sdf1SR0/inCXZsUjXq+2Cks5zp92 -bw3dnKnAJIOtDRXG3orrFrgQODSRoVAe5vvtkBn9kFYJnnCodHUHKo/cWIg8ngqt -VyH1I2zRVMj8OOe/qXN5c4OeXGqPkHO94WdBAjU5WD4n9rAzjIUXAzY8ZBN+LEpH -M6Jsc1C2DT/79lDPhsP2EI1z/7qaxJtrEZxAz7PLfqGKshmAuYM= -=JnkN ------END PGP SIGNATURE----- diff --git a/alsa-utils-1.2.7.tar.bz2 b/alsa-utils-1.2.7.tar.bz2 new file mode 100644 index 0000000..e3409f1 --- /dev/null +++ b/alsa-utils-1.2.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e906bf2404ff04c448eaa3d226d283a62b9a283f12e4fd8457fb24bac274e678 +size 1562595 diff --git a/alsa-utils-1.2.7.tar.bz2.sig b/alsa-utils-1.2.7.tar.bz2.sig new file mode 100644 index 0000000..2b808d4 --- /dev/null +++ b/alsa-utils-1.2.7.tar.bz2.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmKWQcsACgkQg4BZbabl +nJHJjQ//XJ6HY3e01ih+yURTO/yRwaikTW4Ta3cIzqs4VM4uXRfRnXwUzIbDqLHJ +QBe7HohLiySKZbbZ4LcdeeIFIWiZaIap6X0okwQa1/YyTjEAbmbybEYfZNk+5PrS +Ny2IJ6KJK72MICq2LPDlwXXdTxMKU4bt12yoNTOuF08/NFz3SPeibk+ItKAG2Y3M +q6zQA/HBUAsUayJMqtVpsT2EU90+E9ZzIGqUjrOsTARv6frHvAfGoj1GqfJ3udsI +FeVi02TRKy7GIWeOH4h1/q6kRXdWJPa+ZtZm1BARmsR5RkW1lPQ6oevnY7IARHis +wXlMiUvZ5agxWltCrZn/OGGHJps8dWyjFDmnI3eF9KOHG00Hz0/717ADrmsZAerG +/sKziF2CpEqNCIgBJB7GyFNaVtO2llgHQ8aoZ899mMwq3qOHsQjLWH4W6dtGFrwg +gMVQa8RBio1in8vX8w3h9irQ+7fd/WKEglPyn6opIkcdSp3IeOAeVtde3Tehfw/c +cfuB1Td/TWUv+R4THrTlZw5kH3xGCNYnlpC9KJsflEkNpsUhYcp3qalHr27jj+pY +mxvUSKLJLFGt6DRqoq3olFfLMIMr4RdKO00advW3EgGd9v2P0aTQ5fz1lWw5GXRO +MA5lhy6AifdkFgv3ORz9G+gsC0G0HHwkO5OTISPbi0rvVoqKGiA= +=FWyM +-----END PGP SIGNATURE----- diff --git a/alsa-utils.changes b/alsa-utils.changes index 264d908..436080e 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jun 1 05:54:52 UTC 2022 - Takashi Iwai + +- Update to alsa-utils 1.2.7: + Enhancement and fixes of alsactl, speaker-test cleanup, + alsatplg enhancements, arecord ghost data fix, etc. + For details see: + https://www.alsa-project.org/wiki/Changes_v1.2.6.3_v1.2.7#alsa-utils +- Drop obsoleted patches: + 0001-alsamixer-Fix-regression-in-color-setup.patch + 0002-alsamixer-Revert-has_mouse-check.patch + ------------------------------------------------------------------- Fri Jan 28 17:53:00 CET 2022 - tiwai@suse.de diff --git a/alsa-utils.spec b/alsa-utils.spec index a4aa023..936234d 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -16,10 +16,16 @@ # -%define do_autoreconf 1 +%define do_autoreconf 0 %define _udevdir %(pkg-config --variable=udevdir udev) +%ifarch %ix86 x86_64 %arm aarch64 ppc64le riscv64 +%define enable_topology 1 +%else +%define enable_topology 0 +%endif + Name: alsa-utils -Version: 1.2.6 +Version: 1.2.7 Release: 0 Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0-or-later @@ -30,12 +36,10 @@ Source1: https://www.alsa-project.org/files/pub/utils/alsa-utils-%{versio Source2: 01beep.conf Source3: sound-extra.service Source5: load-sound-modules.sh -Patch1: 0001-alsamixer-Fix-regression-in-color-setup.patch -Patch2: 0002-alsamixer-Revert-has_mouse-check.patch Patch100: alsa-info-no-update-for-distro-script.patch Patch101: alsa-utils-configure-version-revert.patch BuildRequires: alsa-devel -%ifarch %ix86 x86_64 %arm aarch64 ppc64le riscv64 +%if %enable_topology BuildRequires: alsa-topology-devel %endif BuildRequires: fftw3-devel @@ -52,6 +56,7 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) %if 0%{?do_autoreconf} BuildRequires: automake +BuildRequires: libtool %endif Requires: alsa # for alsa-info.sh @@ -75,8 +80,6 @@ and test audio before and after PM state changes. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %patch100 -p1 %if 0%{?do_autoreconf} %patch101 -p1 @@ -100,6 +103,9 @@ make %{?_smp_mflags} %make_install mkdir -p %{buildroot}%{_datadir}/alsa/init/preinit mkdir -p %{buildroot}%{_datadir}/alsa/init/postinit +%if %enable_topology +rm -f %{_libdir}/alsa-topology/*.la +%endif for i in %{_sourcedir}/[0-9]*.conf; do install -c -m 0644 $i %{buildroot}%{_datadir}/alsa/init/postinit done @@ -146,6 +152,9 @@ exit 0 %{_sbindir}/* %exclude %{_bindir}/alsabat %exclude %{_sbindir}/alsabat-test.sh +%if %enable_topology +%{_libdir}/alsa-topology +%endif %exclude %{_mandir}/man*/alsabat.* %{_datadir}/sounds/alsa %{_datadir}/alsa