Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at 2015-11-12 19:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old) and /work/SRC/openSUSE:Factory/.alsa-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes 2015-10-03 20:29:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-utils.new/alsa-utils.changes 2015-11-12 19:37:59.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Nov 9 11:45:30 CET 2015 - [email protected] + +- Update to alsa-utils 1.1.0: + including all previous fixes, update of topology tool, addition + of BAT (Basic Audio Tool) +- Split bat subpackage containing BAT +- Fix build of bat with old gcc & glibc on SLE11 + 0001-bat-Avoid-local-signal.h-file.patch + 0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch +- Dropped patches: + 0001-amixer-Don-t-set-only-the-first-item-in-sset_enum.patch + 0002-amixer-expand-local-storage-for-item-name-according-.patch + 0003-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch + 0004-aplay-Fix-type-for-signal-flag.patch + 0005-aplay-Fix-uninterruptible-aplay.patch + 0006-alsactl-terminate-readlink-result-string.patch + 0007-speaker-test-Add-option-to-specify-signal-scale.patch + 0008-topology-Add-command-line-topology-tool-to-build-top.patch + 0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch + 0010-speaker-test-fix-option-ordering.patch + 0011-arecord-Remove-only-regular-files.patch + 0012-aplay-fix-VU-meter-for-S24_LE-etc-formats.patch + 0013-alsactl-Manage-both-save-and-restore-in-a-single-uni.patch + +------------------------------------------------------------------- Old: ---- 0001-amixer-Don-t-set-only-the-first-item-in-sset_enum.patch 0002-amixer-expand-local-storage-for-item-name-according-.patch 0003-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch 0004-aplay-Fix-type-for-signal-flag.patch 0005-aplay-Fix-uninterruptible-aplay.patch 0006-alsactl-terminate-readlink-result-string.patch 0007-speaker-test-Add-option-to-specify-signal-scale.patch 0008-topology-Add-command-line-topology-tool-to-build-top.patch 0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch 0010-speaker-test-fix-option-ordering.patch 0011-arecord-Remove-only-regular-files.patch 0012-aplay-fix-VU-meter-for-S24_LE-etc-formats.patch 0013-alsactl-Manage-both-save-and-restore-in-a-single-uni.patch alsa-utils-1.0.29.tar.bz2 New: ---- 0001-bat-Avoid-local-signal.h-file.patch 0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch alsa-utils-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.YXblvL/_old 2015-11-12 19:38:00.000000000 +0100 +++ /var/tmp/diff_new_pack.YXblvL/_new 2015-11-12 19:38:00.000000000 +0100 @@ -16,7 +16,7 @@ # -%define package_version 1.0.29 +%define package_version 1.1.0 # %if 0%{?suse_version} > 1130 %define use_systemd 1 @@ -35,7 +35,7 @@ %define _udevdir /lib/udev %endif Name: alsa-utils -Version: 1.0.29 +Version: 1.1.0 Release: 0 Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0+ @@ -44,24 +44,12 @@ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2 Source1: 01beep.conf # Patch: alsa-utils-git-fixes.diff -# upstream fix patches -Patch1: 0001-amixer-Don-t-set-only-the-first-item-in-sset_enum.patch -Patch2: 0002-amixer-expand-local-storage-for-item-name-according-.patch -Patch3: 0003-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch -Patch4: 0004-aplay-Fix-type-for-signal-flag.patch -Patch5: 0005-aplay-Fix-uninterruptible-aplay.patch -Patch6: 0006-alsactl-terminate-readlink-result-string.patch -Patch7: 0007-speaker-test-Add-option-to-specify-signal-scale.patch -Patch8: 0008-topology-Add-command-line-topology-tool-to-build-top.patch -Patch9: 0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch -Patch10: 0010-speaker-test-fix-option-ordering.patch -Patch11: 0011-arecord-Remove-only-regular-files.patch -Patch12: 0012-aplay-fix-VU-meter-for-S24_LE-etc-formats.patch -Patch13: 0013-alsactl-Manage-both-save-and-restore-in-a-single-uni.patch -# +Patch1: 0001-bat-Avoid-local-signal.h-file.patch +Patch2: 0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch Patch99: alsa-utils-gettext-version-removal.diff BuildRequires: alsa-devel BuildRequires: automake +BuildRequires: fftw3-devel BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig @@ -79,6 +67,17 @@ This package contains utility programs supporting ALSA, Advanced Linux Sound Architecture. +%package -n bat +Summary: Command-line sound tester for ALSA sound card driver +Group: Productivity/Multimedia/Sound/Utilities +Requires: alsa-utils = %{version} + +%description -n bat +BAT (Basic Audio Tester) is a simple command-line utility intended +to help automate audio driver and sound server testing with little human +interaction. BAT can be used to test audio quality, stress test features +and test audio before and after PM state changes. + %prep %setup -q -n %{name}-%{package_version} # fix stupid automake's automatic action @@ -87,17 +86,6 @@ # patch -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 # %if 0%{?suse_version} < 1020 %patch99 -p1 @@ -143,9 +131,11 @@ %doc COPYING ChangeLog INSTALL README TODO %doc seq/aconnect/README* %doc seq/aseqnet/README* -%doc %{_mandir}/man*/* -%doc %{_mandir}/fr +%{_mandir}/man*/* +%{_mandir}/fr %{_bindir}/* +%exclude %{_bindir}/bat +%exclude %{_mandir}/man*/bat.* %{_sbindir}/* %{_datadir}/sounds/alsa %{_datadir}/alsa @@ -159,4 +149,9 @@ %{_localstatedir}/lib/alsa %endif +%files -n bat +%defattr(-, root, root) +%{_bindir}/bat +%{_mandir}/man*/bat.* + %changelog ++++++ 0001-bat-Avoid-local-signal.h-file.patch ++++++ >From 3bf8e79c3bfee3ca14277aad3d9c406dfc053bbf Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 9 Nov 2015 14:04:11 +0100 Subject: [PATCH 1/2] bat: Avoid local signal.h file The local header file named as "signal.h" causes mysterious compile error when built with an old glibc. signal.h:27: error: conflicting types for 'sin_generator_init' ./signal.h:27: error: previous declaration of 'sin_generator_init' was here signal.h:28: error: conflicting types for 'sin_generator_next_sample' ./signal.h:28: error: previous declaration of 'sin_generator_next_sample' was here .... This turned out to be the conflict of signal.h; namely, pthread.h that is included before our local signal.h also includes "pthread.h". Since our local "signal.h" has a higher priority, it gets loaded instead of the expected pthread's one. Then we load it again, and it screws up. Although it's basically a bug of pthread, it's anyway not good to have a header file conflicting with the standard header file. So, let's name it more explicitly as specific to BAT, bat-signal.h, for avoiding such a conflict. Signed-off-by: Takashi Iwai <[email protected]> --- bat/Makefile.am | 2 +- bat/alsa.c | 2 +- bat/bat-signal.h | 30 ++++++++++++++++++++++++++++++ bat/signal.h | 30 ------------------------------ 4 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 bat/bat-signal.h delete mode 100644 bat/signal.h diff --git a/bat/Makefile.am b/bat/Makefile.am index 842ae6bb8fc7..f0dc5abbbe46 100644 --- a/bat/Makefile.am +++ b/bat/Makefile.am @@ -13,7 +13,7 @@ bat_SOURCES = \ noinst_HEADERS = \ common.h \ - signal.h \ + bat-signal.h \ alsa.h \ convert.h \ analyze.h diff --git a/bat/alsa.c b/bat/alsa.c index 582c60482975..d31a633cf857 100644 --- a/bat/alsa.c +++ b/bat/alsa.c @@ -27,7 +27,7 @@ #include "common.h" #include "alsa.h" -#include "signal.h" +#include "bat-signal.h" struct pcm_container { snd_pcm_t *handle; diff --git a/bat/bat-signal.h b/bat/bat-signal.h new file mode 100644 index 000000000000..a2955176e820 --- /dev/null +++ b/bat/bat-signal.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2015 Caleb Crome + * Copyright (C) 2013-2015 Intel Corporation + * + * 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. + * + */ + +/* + * Here's a generic sine wave generator that will work indefinitely + * for any frequency. + * + * Note: the state & phasor are stored as doubles (and updated as + * doubles) because after a million samples the magnitude drifts a + * bit. If we really need floats, it can be done with periodic + * renormalization of the state_real+state_imag magnitudes. + */ + +int sin_generator_init(struct sin_generator *, float, float, float); +float sin_generator_next_sample(struct sin_generator *); +void sin_generator_vfill(struct sin_generator *, float *, int); +int generate_sine_wave(struct bat *, int, void *); diff --git a/bat/signal.h b/bat/signal.h deleted file mode 100644 index a2955176e820..000000000000 --- a/bat/signal.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2015 Caleb Crome - * Copyright (C) 2013-2015 Intel Corporation - * - * 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. - * - */ - -/* - * Here's a generic sine wave generator that will work indefinitely - * for any frequency. - * - * Note: the state & phasor are stored as doubles (and updated as - * doubles) because after a million samples the magnitude drifts a - * bit. If we really need floats, it can be done with periodic - * renormalization of the state_real+state_imag magnitudes. - */ - -int sin_generator_init(struct sin_generator *, float, float, float); -float sin_generator_next_sample(struct sin_generator *); -void sin_generator_vfill(struct sin_generator *, float *, int); -int generate_sine_wave(struct bat *, int, void *); -- 2.6.2 ++++++ 0002-bat-Don-t-pass-incompatible-function-pointers-to-pth.patch ++++++ >From ed0cce1b6061aade0077982cb5d22fa68ddffd2f Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 9 Nov 2015 14:09:50 +0100 Subject: [PATCH 2/2] bat: Don't pass incompatible function pointers to pthread_cleanup_push() pthread_cleanup_push() takes a function pointer for void (void *). Although it may work in most cases, we shouldn't pass an incompatible function pointer there, as some old gcc complains: alsa.c:560: warning: initialization from incompatible pointer type alsa.c:562: warning: initialization from incompatible pointer type Signed-off-by: Takashi Iwai <[email protected]> --- bat/alsa.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bat/alsa.c b/bat/alsa.c index d31a633cf857..5eaa25b61456 100644 --- a/bat/alsa.c +++ b/bat/alsa.c @@ -505,6 +505,16 @@ static int read_from_pcm_loop(FILE *fp, int count, return 0; } +static void pcm_cleanup(void *p) +{ + snd_pcm_close(p); +} + +static void file_cleanup(void *p) +{ + fclose(p); +} + /** * Record */ @@ -557,9 +567,9 @@ void *record_alsa(struct bat *bat) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); - pthread_cleanup_push(snd_pcm_close, sndpcm.handle); + pthread_cleanup_push(pcm_cleanup, sndpcm.handle); pthread_cleanup_push(free, sndpcm.buffer); - pthread_cleanup_push(fclose, fp); + pthread_cleanup_push(file_cleanup, fp); err = write_wav_header(fp, &wav, bat); if (err != 0) { -- 2.6.2 ++++++ alsa-utils-1.0.29.tar.bz2 -> alsa-utils-1.1.0.tar.bz2 ++++++ ++++ 8400 lines of diff (skipped)
