Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at 2017-12-23 12:18:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old) and /work/SRC/openSUSE:Factory/.alsa-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-utils" Sat Dec 23 12:18:39 2017 rev:110 rq:558245 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes 2017-11-16 13:59:07.125746851 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-utils.new/alsa-utils.changes 2017-12-23 12:18:42.681850678 +0100 @@ -1,0 +2,13 @@ +Mon Dec 18 17:33:17 CET 2017 - [email protected] + +- Get rid of superfluous patch for ancient distros: + alsa-utils-gettext-version-removal.diff +- Remove superfluous file override, which is already included in + the 1.1.5 tarball: + alsaucm.rst +- Backport upstream fixes: + 0001-aplay-Adjust-sample-rate-limits-to-support-newer-har.patch + 0002-alsactl-Only-start-restore-service-when-asoundrc-fil.patch +- Cleanup specfile to rip off the too old kludges + +------------------------------------------------------------------- Old: ---- alsa-utils-gettext-version-removal.diff alsaucm.rst New: ---- 0001-aplay-Adjust-sample-rate-limits-to-support-newer-har.patch 0002-alsactl-Only-start-restore-service-when-asoundrc-fil.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.c28jtm/_old 2017-12-23 12:18:43.421814597 +0100 +++ /var/tmp/diff_new_pack.c28jtm/_new 2017-12-23 12:18:43.425814402 +0100 @@ -43,9 +43,8 @@ Url: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2 Source1: 01beep.conf -Source2: alsaucm.rst -# Patch: alsa-utils-git-fixes.diff -Patch99: alsa-utils-gettext-version-removal.diff +Patch1: 0001-aplay-Adjust-sample-rate-limits-to-support-newer-har.patch +Patch2: 0002-alsactl-Only-start-restore-service-when-asoundrc-fil.patch BuildRequires: alsa-devel BuildRequires: automake BuildRequires: fftw3-devel @@ -82,20 +81,11 @@ %setup -q -n %{name}-%{package_version} # fix stupid automake's automatic action sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am -# rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-* -# patch -p1 -# -%if 0%{?suse_version} < 1020 -%patch99 -p1 -%endif -# copy the missing file -cp %{S:2} alsaucm/ +%patch1 -p1 +%patch2 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" -%if 0%{?suse_version} < 1020 -# gettextize -f -%endif autoreconf -fi opts="" %if %{use_systemd} @@ -104,9 +94,6 @@ %if ! %{use_varlib} opts="$opts --with-asound-state-dir=/etc" %endif -%if 0%{?suse_version} < 1030 -opts="$opts --disable-xmlto" -%endif opts="$opts --with-udev-rules-dir=%{_udevdir}/rules.d" %configure --with-curses=ncursesw $opts make %{?_smp_mflags} ++++++ 0001-aplay-Adjust-sample-rate-limits-to-support-newer-har.patch ++++++ >From d0802f32cafa8ba8ff4d48e3eb1f690b7adb0d3d Mon Sep 17 00:00:00 2001 From: Jussi Laako <[email protected]> Date: Thu, 7 Dec 2017 13:57:14 +0200 Subject: [PATCH] aplay: Adjust sample rate limits to support newer hardware There are number of devices that support up to 384 kHz sampling rate and some devices up to 768 kHz sampling rate. This patch increases sanity check limit to 768k in order to support testing of such hardware. Signed-off-by: Jussi Laako <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- aplay/aplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index dbae17caf3a4..6b740c281f8e 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -635,10 +635,10 @@ int main(int argc, char *argv[]) error(_("invalid rate argument '%s'"), optarg); return 1; } - if (tmp < 300) + if (tmp < 1000) tmp *= 1000; rhwparams.rate = tmp; - if (tmp < 2000 || tmp > 192000) { + if (tmp < 2000 || tmp > 768000) { error(_("bad speed value %i"), tmp); return 1; } -- 2.15.1 ++++++ 0002-alsactl-Only-start-restore-service-when-asoundrc-fil.patch ++++++ >From f1eba0b5deb6c3988d6dd7317ccc931c09792843 Mon Sep 17 00:00:00 2001 From: Ikey Doherty <[email protected]> Date: Tue, 12 Dec 2017 13:32:34 +0000 Subject: [PATCH] alsactl: Only start restore service when asoundrc file exists This solves the chicken and egg problem on fresh installations whereby the alsa state file does not yet exist, and alsa-restore unit attempted to launch without first having a state file. Signed-off-by: Ikey Doherty <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- alsactl/Makefile.am | 1 + alsactl/alsa-restore.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index 90fab9d13ccc..aaaf74ee1e18 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -41,6 +41,7 @@ edit = \ $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@mydatadir\@,$(mydatadir),g' \ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ + -e 's,@asoundrcfile\@,$(ASOUND_STATE_DIR)/asound.state,g' \ < $< > $@ || rm $@ alsa-state.service: alsa-state.service.in diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 80fd5fd48203..a84c2e842444 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -7,6 +7,7 @@ Description=Save/Restore Sound Card State ConditionPathExists=!@daemonswitch@ ConditionPathExistsGlob=/dev/snd/control* +ConditionPathExists=@asoundrcfile@ [Service] Type=oneshot -- 2.15.1
