From 72986ad497f43271c3324dad2bd8c22c043a2973 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Sep 2018 13:20:25 +0200 Subject: [PATCH 1/8] add udev rules for PAZ00 --- alsa-git.patch | 231 ++++++++++++++++++++++++++++++++++++++++++++++++ alsa-utils.spec | 15 +++- 2 files changed, 243 insertions(+), 3 deletions(-) create mode 100644 alsa-git.patch diff --git a/alsa-git.patch b/alsa-git.patch new file mode 100644 index 0000000..e89c6b2 --- /dev/null +++ b/alsa-git.patch @@ -0,0 +1,231 @@ +From da4d5bd53a1a57d1b39318b83d3280fbcd78e9f6 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 15 May 2018 22:17:01 +0200 +Subject: [PATCH 1/6] aplay: Fix invalid file size check for non-regular files + +aplay tries to check the file size via fstat() at parsing the format +headers and avoids parsing when the size is shorter than the given +size. This works fine for regular files, but when a special file like +pipe is passed, it fails, eventually leading to the fallback mode +wrongly. + +A proper fix is to do this sanity check only for a regular file. + +Reported-by: Jay Foster +Signed-off-by: Takashi Iwai +--- + aplay/aplay.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/aplay/aplay.c b/aplay/aplay.c +index bbd7fff..63ec9ef 100644 +--- a/aplay/aplay.c ++++ b/aplay/aplay.c +@@ -2821,7 +2821,8 @@ static int read_header(int *loaded, int header_size) + + /* don't be adventurous, get out if file size is smaller than + * requested header size */ +- if (buf.st_size < header_size) ++ if ((buf.st_mode & S_IFMT) == S_IFREG && ++ buf.st_size < header_size) + return -1; + + if (*loaded < header_size) { +-- +2.13.6 + + +From 0e2703cef90a2c53d49a49d5e9233aeb6db8960b Mon Sep 17 00:00:00 2001 +From: Julian Scheel +Date: Wed, 23 May 2018 15:42:20 +0200 +Subject: [PATCH 2/6] speaker-test: Support S24_3LE sample format + +Implement support signed 24 bit samples, packed in 3 bytes. + +Signed-off-by: Julian Scheel +Signed-off-by: Takashi Iwai +--- + speaker-test/speaker-test.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c +index 65ab523..4804bcf 100644 +--- a/speaker-test/speaker-test.c ++++ b/speaker-test/speaker-test.c +@@ -283,6 +283,8 @@ static const int supported_formats[] = { + SND_PCM_FORMAT_S16_LE, + SND_PCM_FORMAT_S16_BE, + SND_PCM_FORMAT_FLOAT_LE, ++ SND_PCM_FORMAT_S24_3LE, ++ SND_PCM_FORMAT_S24_3BE, + SND_PCM_FORMAT_S32_LE, + SND_PCM_FORMAT_S32_BE, + -1 +@@ -325,6 +327,18 @@ static void do_generate(uint8_t *frames, int channel, int count, + case SND_PCM_FORMAT_FLOAT_LE: + *samp_f++ = res.f; + break; ++ case SND_PCM_FORMAT_S24_3LE: ++ res.i >>= 8; ++ *samp8++ = LE_INT(res.i); ++ *samp8++ = LE_INT(res.i) >> 8; ++ *samp8++ = LE_INT(res.i) >> 16; ++ break; ++ case SND_PCM_FORMAT_S24_3BE: ++ res.i >>= 8; ++ *samp8++ = BE_INT(res.i); ++ *samp8++ = BE_INT(res.i) >> 8; ++ *samp8++ = BE_INT(res.i) >> 16; ++ break; + case SND_PCM_FORMAT_S32_LE: + *samp32++ = LE_INT(res.i); + break; +-- +2.13.6 + + +From 98ff61743188101920cbf0b1b2e3cd6d015e3c83 Mon Sep 17 00:00:00 2001 +From: Julian Scheel +Date: Wed, 23 May 2018 15:42:21 +0200 +Subject: [PATCH 3/6] speaker-test: Remove unused variable + +Signed-off-by: Julian Scheel +Signed-off-by: Takashi Iwai +--- + speaker-test/speaker-test.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c +index 4804bcf..0cdecb3 100644 +--- a/speaker-test/speaker-test.c ++++ b/speaker-test/speaker-test.c +@@ -300,7 +300,6 @@ static void do_generate(uint8_t *frames, int channel, int count, + { + value_t res; + int chn; +- int32_t ires; + int8_t *samp8 = (int8_t*) frames; + int16_t *samp16 = (int16_t*) frames; + int32_t *samp32 = (int32_t*) frames; +-- +2.13.6 + + +From a3d81b6beab1ad33ea02f7d3c19f894490a661b9 Mon Sep 17 00:00:00 2001 +From: Julian Scheel +Date: Thu, 7 Jun 2018 11:10:55 +0200 +Subject: [PATCH 4/6] speaker-test: Allow sampling rates up to 768000 + +There are audio devices around that support up to 768kHz playback, allow +testing them by increasing the maximum supported sampling rate. + +Signed-off-by: Julian Scheel +Signed-off-by: Takashi Iwai +--- + speaker-test/speaker-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c +index 0cdecb3..773af0a 100644 +--- a/speaker-test/speaker-test.c ++++ b/speaker-test/speaker-test.c +@@ -1034,7 +1034,7 @@ int main(int argc, char *argv[]) { + case 'r': + rate = atoi(optarg); + rate = rate < 4000 ? 4000 : rate; +- rate = rate > 384000 ? 384000 : rate; ++ rate = rate > 768000 ? 768000 : rate; + break; + case 'c': + channels = atoi(optarg); +-- +2.13.6 + + +From f6b59282f7c3bddc6aa4aca93e8e19163955675b Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Sun, 5 Aug 2018 13:59:35 +1000 +Subject: [PATCH 5/6] alsabat: Allow custom sample format for round trip + latency test + +Setting the format to BAT_PCM_FORMAT_S16_LE in the round trip latency +test initialization is redundant as it is already set by default to +BAT_PCM_FORMAT_S16_LE unless a sample format is specified on the command +line. + +Signed-off-by: Jonathan Liu +Signed-off-by: Takashi Iwai +--- + bat/latencytest.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/bat/latencytest.c b/bat/latencytest.c +index fae191c..ec3abe2 100644 +--- a/bat/latencytest.c ++++ b/bat/latencytest.c +@@ -178,7 +178,6 @@ void roundtrip_latency_init(struct bat *bat) + bat->latency.is_playing = false; + bat->latency.error = 0; + bat->latency.xrun_error = false; +- bat->format = BAT_PCM_FORMAT_S16_LE; + bat->frames = LATENCY_TEST_TIME_LIMIT * bat->rate; + bat->periods_played = 0; + } +-- +2.13.6 + + +From 25bea6baf7097dc0a701b27587be88b0b54a529c Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 7 Sep 2018 10:53:19 +0200 +Subject: [PATCH 6/6] alsaucm: add alsa-ucm udev rules for PAZ00 (Toshiba + AC100/Dynabook AZ). + +Signed-off-by: Jaroslav Kysela +--- + .gitignore | 1 + + alsaucm/89-alsa-ucm.rules.in | 8 ++++++++ + alsaucm/Makefile.am | 15 ++++++++++++++- + 3 files changed, 23 insertions(+), 1 deletion(-) + create mode 100644 alsaucm/89-alsa-ucm.rules.in + +diff --git a/alsaucm/89-alsa-ucm.rules.in b/alsaucm/89-alsa-ucm.rules.in +new file mode 100644 +index 0000000..52a7616 +--- /dev/null ++++ b/alsaucm/89-alsa-ucm.rules.in +@@ -0,0 +1,8 @@ ++SUBSYSTEM!="sound", GOTO="ucm_end" ++ACTION!="change", GOTO="ucm_end" ++KERNEL!="card*", GOTO="ucm_end" ++ ++ATTRS{id}=="PAZ00", RUN+="@bindir@/alsaucm -c PAZ00 set _verb HiFi" ++ATTRS{id}=="PAZ00", RUN+="@bindir@/alsaucm -c PAZ00 set _verb Record" ++ ++LABEL="ucm_end" +diff --git a/alsaucm/Makefile.am b/alsaucm/Makefile.am +index ee0391e..651f678 100644 +--- a/alsaucm/Makefile.am ++++ b/alsaucm/Makefile.am +@@ -15,4 +15,17 @@ alsaucm_LDADD = -lasound + %.1: %.rst + rst2man $< > $@ + +-EXTRA_DIST = alsaucm.rst ++udevrules_DATA = \ ++ 89-alsa-ucm.rules ++ ++edit = \ ++ $(SED) -r -e 's,@bindir\@,$(bindir),g' \ ++ -e 's,@mydatadir\@,$(mydatadir),g' \ ++ < $< > $@ || rm $@ ++ ++89-alsa-ucm.rules: 89-alsa-ucm.rules.in ++ $(edit) ++ ++EXTRA_DIST = alsaucm.rst 89-alsa-ucm.rules.in ++ ++CLEANFILES = 89-alsa-ucm.rules +-- +2.13.6 + diff --git a/alsa-utils.spec b/alsa-utils.spec index 7a998a2..be1ab59 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,11 +5,12 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 3%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 +Patch1: alsa-git.patch Source4: alsaunmute Source5: alsaunmute.1 Source10: alsa.rules @@ -18,11 +19,12 @@ Source20: alsa-restore.service Source22: alsa-state.service BuildRequires: gcc -BuildRequires: alsa-lib-devel >= %{baseversion} +#BuildRequires: alsa-lib-devel >= %{baseversion} BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: gettext-devel BuildRequires: xmlto +BuildRequires: python2-docutils BuildRequires: systemd Requires(post): systemd Requires(preun): systemd @@ -45,6 +47,7 @@ Architecture (ALSA) framework and Fast Fourier Transform library. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ @@ -60,13 +63,15 @@ make install DESTDIR=%{buildroot} # Install ALSA udev rules mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d install -p -m 644 %{SOURCE10} %{buildroot}/%{_prefix}/lib/udev/rules.d/90-alsa-restore.rules +sed -e 's,@bindir@,%{_bindir},g' alsaucm/89-alsa-ucm.rules.in > alsaucm/89-alsa-ucm.rules +install -p -m 644 alsaucm/89-alsa-ucm.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/89-alsa-ucm.rules mkdir -p %{buildroot}/%{_unitdir} install -p -m 644 %{SOURCE20} %{buildroot}/%{_unitdir}/alsa-restore.service install -p -m 644 %{SOURCE22} %{buildroot}/%{_unitdir}/alsa-state.service # Install support utilities mkdir -p -m755 %{buildroot}/%{_bindir} -install -p -m 755 alsaunmute %{buildroot}/%{_bindir} +install -p -m 755 %{SOURCE4} %{buildroot}/%{_bindir} mkdir -p -m755 %{buildroot}/%{_mandir}/man1 install -p -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man1/alsaunmute.1 @@ -115,6 +120,7 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_mandir}/man1/alsaloop.1.gz %{_mandir}/man1/alsamixer.1.gz %{_mandir}/man1/alsaunmute.1.gz +%{_mandir}/man1/alsaucm.1.gz %{_mandir}/man1/amidi.1.gz %{_mandir}/man1/amixer.1.gz %{_mandir}/man1/aplay.1.gz @@ -160,6 +166,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Fri Sep 07 2018 Jaroslav Kysela - 1.1.6-5 +- Added udev rules for PAZ00 + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c96faef9a262aa1996e8492585d6b46bf1da56d9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Sep 2018 13:28:14 +0200 Subject: [PATCH 2/8] Fix buildrequires --- alsa-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index be1ab59..65daae8 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -19,7 +19,7 @@ Source20: alsa-restore.service Source22: alsa-state.service BuildRequires: gcc -#BuildRequires: alsa-lib-devel >= %{baseversion} +BuildRequires: alsa-lib-devel >= %{baseversion} BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: gettext-devel From 80d2b2d3753a8ed283bca090dddf47f2e007f39b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Sep 2018 13:47:21 +0200 Subject: [PATCH 3/8] changed buildrequires to python3-docutils --- alsa-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 65daae8..0483016 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -24,7 +24,7 @@ BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: gettext-devel BuildRequires: xmlto -BuildRequires: python2-docutils +BuildRequires: python3-docutils BuildRequires: systemd Requires(post): systemd Requires(preun): systemd From 399a5bbd50cc6b461a9f559f7497533c1834e8d6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 11:04:24 +0200 Subject: [PATCH 4/8] updated to 1.1.7 --- alsa-git.patch | 230 ------------------------------------------------ alsa-utils.spec | 43 +++++++-- sources | 2 +- 3 files changed, 39 insertions(+), 236 deletions(-) diff --git a/alsa-git.patch b/alsa-git.patch index e89c6b2..8b13789 100644 --- a/alsa-git.patch +++ b/alsa-git.patch @@ -1,231 +1 @@ -From da4d5bd53a1a57d1b39318b83d3280fbcd78e9f6 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 15 May 2018 22:17:01 +0200 -Subject: [PATCH 1/6] aplay: Fix invalid file size check for non-regular files - -aplay tries to check the file size via fstat() at parsing the format -headers and avoids parsing when the size is shorter than the given -size. This works fine for regular files, but when a special file like -pipe is passed, it fails, eventually leading to the fallback mode -wrongly. - -A proper fix is to do this sanity check only for a regular file. - -Reported-by: Jay Foster -Signed-off-by: Takashi Iwai ---- - aplay/aplay.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index bbd7fff..63ec9ef 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -2821,7 +2821,8 @@ static int read_header(int *loaded, int header_size) - - /* don't be adventurous, get out if file size is smaller than - * requested header size */ -- if (buf.st_size < header_size) -+ if ((buf.st_mode & S_IFMT) == S_IFREG && -+ buf.st_size < header_size) - return -1; - - if (*loaded < header_size) { --- -2.13.6 - - -From 0e2703cef90a2c53d49a49d5e9233aeb6db8960b Mon Sep 17 00:00:00 2001 -From: Julian Scheel -Date: Wed, 23 May 2018 15:42:20 +0200 -Subject: [PATCH 2/6] speaker-test: Support S24_3LE sample format - -Implement support signed 24 bit samples, packed in 3 bytes. - -Signed-off-by: Julian Scheel -Signed-off-by: Takashi Iwai ---- - speaker-test/speaker-test.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c -index 65ab523..4804bcf 100644 ---- a/speaker-test/speaker-test.c -+++ b/speaker-test/speaker-test.c -@@ -283,6 +283,8 @@ static const int supported_formats[] = { - SND_PCM_FORMAT_S16_LE, - SND_PCM_FORMAT_S16_BE, - SND_PCM_FORMAT_FLOAT_LE, -+ SND_PCM_FORMAT_S24_3LE, -+ SND_PCM_FORMAT_S24_3BE, - SND_PCM_FORMAT_S32_LE, - SND_PCM_FORMAT_S32_BE, - -1 -@@ -325,6 +327,18 @@ static void do_generate(uint8_t *frames, int channel, int count, - case SND_PCM_FORMAT_FLOAT_LE: - *samp_f++ = res.f; - break; -+ case SND_PCM_FORMAT_S24_3LE: -+ res.i >>= 8; -+ *samp8++ = LE_INT(res.i); -+ *samp8++ = LE_INT(res.i) >> 8; -+ *samp8++ = LE_INT(res.i) >> 16; -+ break; -+ case SND_PCM_FORMAT_S24_3BE: -+ res.i >>= 8; -+ *samp8++ = BE_INT(res.i); -+ *samp8++ = BE_INT(res.i) >> 8; -+ *samp8++ = BE_INT(res.i) >> 16; -+ break; - case SND_PCM_FORMAT_S32_LE: - *samp32++ = LE_INT(res.i); - break; --- -2.13.6 - - -From 98ff61743188101920cbf0b1b2e3cd6d015e3c83 Mon Sep 17 00:00:00 2001 -From: Julian Scheel -Date: Wed, 23 May 2018 15:42:21 +0200 -Subject: [PATCH 3/6] speaker-test: Remove unused variable - -Signed-off-by: Julian Scheel -Signed-off-by: Takashi Iwai ---- - speaker-test/speaker-test.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c -index 4804bcf..0cdecb3 100644 ---- a/speaker-test/speaker-test.c -+++ b/speaker-test/speaker-test.c -@@ -300,7 +300,6 @@ static void do_generate(uint8_t *frames, int channel, int count, - { - value_t res; - int chn; -- int32_t ires; - int8_t *samp8 = (int8_t*) frames; - int16_t *samp16 = (int16_t*) frames; - int32_t *samp32 = (int32_t*) frames; --- -2.13.6 - - -From a3d81b6beab1ad33ea02f7d3c19f894490a661b9 Mon Sep 17 00:00:00 2001 -From: Julian Scheel -Date: Thu, 7 Jun 2018 11:10:55 +0200 -Subject: [PATCH 4/6] speaker-test: Allow sampling rates up to 768000 - -There are audio devices around that support up to 768kHz playback, allow -testing them by increasing the maximum supported sampling rate. - -Signed-off-by: Julian Scheel -Signed-off-by: Takashi Iwai ---- - speaker-test/speaker-test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c -index 0cdecb3..773af0a 100644 ---- a/speaker-test/speaker-test.c -+++ b/speaker-test/speaker-test.c -@@ -1034,7 +1034,7 @@ int main(int argc, char *argv[]) { - case 'r': - rate = atoi(optarg); - rate = rate < 4000 ? 4000 : rate; -- rate = rate > 384000 ? 384000 : rate; -+ rate = rate > 768000 ? 768000 : rate; - break; - case 'c': - channels = atoi(optarg); --- -2.13.6 - - -From f6b59282f7c3bddc6aa4aca93e8e19163955675b Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Sun, 5 Aug 2018 13:59:35 +1000 -Subject: [PATCH 5/6] alsabat: Allow custom sample format for round trip - latency test - -Setting the format to BAT_PCM_FORMAT_S16_LE in the round trip latency -test initialization is redundant as it is already set by default to -BAT_PCM_FORMAT_S16_LE unless a sample format is specified on the command -line. - -Signed-off-by: Jonathan Liu -Signed-off-by: Takashi Iwai ---- - bat/latencytest.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/bat/latencytest.c b/bat/latencytest.c -index fae191c..ec3abe2 100644 ---- a/bat/latencytest.c -+++ b/bat/latencytest.c -@@ -178,7 +178,6 @@ void roundtrip_latency_init(struct bat *bat) - bat->latency.is_playing = false; - bat->latency.error = 0; - bat->latency.xrun_error = false; -- bat->format = BAT_PCM_FORMAT_S16_LE; - bat->frames = LATENCY_TEST_TIME_LIMIT * bat->rate; - bat->periods_played = 0; - } --- -2.13.6 - - -From 25bea6baf7097dc0a701b27587be88b0b54a529c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Fri, 7 Sep 2018 10:53:19 +0200 -Subject: [PATCH 6/6] alsaucm: add alsa-ucm udev rules for PAZ00 (Toshiba - AC100/Dynabook AZ). - -Signed-off-by: Jaroslav Kysela ---- - .gitignore | 1 + - alsaucm/89-alsa-ucm.rules.in | 8 ++++++++ - alsaucm/Makefile.am | 15 ++++++++++++++- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 alsaucm/89-alsa-ucm.rules.in - -diff --git a/alsaucm/89-alsa-ucm.rules.in b/alsaucm/89-alsa-ucm.rules.in -new file mode 100644 -index 0000000..52a7616 ---- /dev/null -+++ b/alsaucm/89-alsa-ucm.rules.in -@@ -0,0 +1,8 @@ -+SUBSYSTEM!="sound", GOTO="ucm_end" -+ACTION!="change", GOTO="ucm_end" -+KERNEL!="card*", GOTO="ucm_end" -+ -+ATTRS{id}=="PAZ00", RUN+="@bindir@/alsaucm -c PAZ00 set _verb HiFi" -+ATTRS{id}=="PAZ00", RUN+="@bindir@/alsaucm -c PAZ00 set _verb Record" -+ -+LABEL="ucm_end" -diff --git a/alsaucm/Makefile.am b/alsaucm/Makefile.am -index ee0391e..651f678 100644 ---- a/alsaucm/Makefile.am -+++ b/alsaucm/Makefile.am -@@ -15,4 +15,17 @@ alsaucm_LDADD = -lasound - %.1: %.rst - rst2man $< > $@ - --EXTRA_DIST = alsaucm.rst -+udevrules_DATA = \ -+ 89-alsa-ucm.rules -+ -+edit = \ -+ $(SED) -r -e 's,@bindir\@,$(bindir),g' \ -+ -e 's,@mydatadir\@,$(mydatadir),g' \ -+ < $< > $@ || rm $@ -+ -+89-alsa-ucm.rules: 89-alsa-ucm.rules.in -+ $(edit) -+ -+EXTRA_DIST = alsaucm.rst 89-alsa-ucm.rules.in -+ -+CLEANFILES = 89-alsa-ucm.rules --- -2.13.6 diff --git a/alsa-utils.spec b/alsa-utils.spec index 0483016..02caca2 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.1.6 +%define baseversion 1.1.7 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 5%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -36,6 +36,24 @@ Requires: alsa-lib%{?_isa} >= %{baseversion} This package contains command line utilities for the Advanced Linux Sound Architecture (ALSA). +%package -n alsa-ucm-utils +Summary: Advanced Linux Sound Architecture (ALSA) - Use Case Manager +Group: Applications/Multimedia +Requires: alsa-ucm%{?_isa} >= %{baseversion} + +%description -n alsa-ucm-utils +This package contains Use Case Manager tools for Advanced Linux Sound +Architecture (ALSA) framework. + +%package -n alsa-topology-utils +Summary: Advanced Linux Sound Architecture (ALSA) - Topology +Group: Applications/Multimedia +Requires: alsa-topology%{?_isa} >= %{baseversion} + +%description -n alsa-topology-utils +This package contains topology tools for Advanced Linux Sound +Architecture (ALSA) framework. + %package alsabat Summary: Advanced Linux Sound Architecture (ALSA) - Basic Audio Tester Group: Applications/Multimedia @@ -47,7 +65,7 @@ Architecture (ALSA) framework and Fast Fourier Transform library. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 +#%patch1 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ @@ -93,13 +111,13 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %doc COPYING ChangeLog README TODO %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* +%exclude %{_prefix}/lib/udev/rules.d/*alsa-ucm* %{_unitdir}/* %{_unitdir}/sound.target.wants/* %{_prefix}/lib/alsa/init/* %{_bindir}/aconnect %{_bindir}/alsaloop %{_bindir}/alsamixer -%{_bindir}/alsaucm %{_bindir}/alsaunmute %{_bindir}/amidi %{_bindir}/amixer @@ -113,6 +131,7 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_bindir}/speaker-test %{_bindir}/alsatplg %{_sbindir}/* +%exclude %{_sbindir}/alsabat-test.sh %{_datadir}/alsa/ %{_datadir}/sounds/* %{_mandir}/man7/* @@ -120,7 +139,6 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_mandir}/man1/alsaloop.1.gz %{_mandir}/man1/alsamixer.1.gz %{_mandir}/man1/alsaunmute.1.gz -%{_mandir}/man1/alsaucm.1.gz %{_mandir}/man1/amidi.1.gz %{_mandir}/man1/amixer.1.gz %{_mandir}/man1/aplay.1.gz @@ -139,8 +157,18 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %dir %{_prefix}/lib/alsa/init/ %dir /var/lib/alsa/ +%files -n alsa-ucm-utils +%{_prefix}/lib/udev/rules.d/*alsa-ucm* +%{_bindir}/alsaucm +%{_mandir}/man1/alsaucm.1.gz + +%files -n alsa-topology-utils +%{_bindir}/alsatplg +%{_mandir}/man1/alsatplg.1.gz + %files alsabat %{_bindir}/alsabat +%{_sbindir}/alsabat-test.sh %{_mandir}/man1/alsabat.1.gz %pre @@ -166,6 +194,11 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +- Moved use case manager utility to alsa-ucm-utils +- Moved topology utility to alsa-topology-utils +- Updated to 1.1.7 + * Fri Sep 07 2018 Jaroslav Kysela - 1.1.6-5 - Added udev rules for PAZ00 diff --git a/sources b/sources index c882341..21732e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.1.6.tar.bz2) = 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58 +SHA512 (alsa-utils-1.1.7.tar.bz2) = 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65 From b1cd814f81de46895b5027058d6b3e9147643465 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 18:39:20 +0200 Subject: [PATCH 5/8] remove wrong %{_isa} macro usage for ucm-utils and topology-utils --- alsa-utils.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 02caca2..7678593 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,7 +5,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -39,7 +39,7 @@ Architecture (ALSA). %package -n alsa-ucm-utils Summary: Advanced Linux Sound Architecture (ALSA) - Use Case Manager Group: Applications/Multimedia -Requires: alsa-ucm%{?_isa} >= %{baseversion} +Requires: alsa-ucm >= %{baseversion} %description -n alsa-ucm-utils This package contains Use Case Manager tools for Advanced Linux Sound @@ -48,7 +48,7 @@ Architecture (ALSA) framework. %package -n alsa-topology-utils Summary: Advanced Linux Sound Architecture (ALSA) - Topology Group: Applications/Multimedia -Requires: alsa-topology%{?_isa} >= %{baseversion} +Requires: alsa-topology >= %{baseversion} %description -n alsa-topology-utils This package contains topology tools for Advanced Linux Sound @@ -194,7 +194,7 @@ fi %systemd_postun_with_restart alsa-state.service %changelog -* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-2 - Moved use case manager utility to alsa-ucm-utils - Moved topology utility to alsa-topology-utils - Updated to 1.1.7 From 7e7809d957219d9cbc963e4e330e5e47fd44cc67 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 7 Jan 2019 15:36:17 +0100 Subject: [PATCH 6/8] updated to 1.1.8 --- alsa-utils.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 7678593..721123f 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.1.7 +%define baseversion 1.1.8 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -108,7 +108,7 @@ install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa mkdir -p -m 755 %{buildroot}/var/lib/alsa %files -f %{name}.lang -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README.md TODO %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* %exclude %{_prefix}/lib/udev/rules.d/*alsa-ucm* @@ -127,6 +127,7 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_bindir}/arecordmidi %{_bindir}/aseqdump %{_bindir}/aseqnet +%{_bindir}/axfer %{_bindir}/iecset %{_bindir}/speaker-test %{_bindir}/alsatplg @@ -147,6 +148,9 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_mandir}/man1/arecordmidi.1.gz %{_mandir}/man1/aseqdump.1.gz %{_mandir}/man1/aseqnet.1.gz +%{_mandir}/man1/axfer.1.gz +%{_mandir}/man1/axfer-list.1.gz +%{_mandir}/man1/axfer-transfer.1.gz %{_mandir}/man1/iecset.1.gz %{_mandir}/man1/speaker-test.1.gz %{_mandir}/man1/aconnect.1.gz diff --git a/sources b/sources index 21732e8..166876a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.1.7.tar.bz2) = 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65 +SHA512 (alsa-utils-1.1.8.tar.bz2) = f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9 From 18cc307ac7ab72e2bd4d267d2d855ad1bbaa0047 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 7 Jan 2019 15:58:19 +0100 Subject: [PATCH 7/8] add the changelog for 1.1.8 --- alsa-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 721123f..8b13be1 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -5,7 +5,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -198,6 +198,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-2 +- Updated to 1.1.8 + * Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-2 - Moved use case manager utility to alsa-ucm-utils - Moved topology utility to alsa-topology-utils From 13c372357bb7d4bfd310e42916b432efdba0f4a4 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 10 May 2019 10:05:38 +0200 Subject: [PATCH 8/8] updated to 1.1.9 --- alsa-utils.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 8b13be1..8c17472 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.1.8 +%define baseversion 1.1.9 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -198,6 +198,9 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Fri May 10 2019 Jaroslav Kysela - 1.1.9-1 +- Updated to 1.1.9 + * Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-2 - Updated to 1.1.8 diff --git a/sources b/sources index 166876a..6d693eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.1.8.tar.bz2) = f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9 +SHA512 (alsa-utils-1.1.9.tar.bz2) = 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970