Accepting request 594639 from multimedia:libs

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

0001-aplay-Adjust-sample-rate-limits-to-support-newer-har.patch

@@ -1,35 +0,0 @@
-From d0802f32cafa8ba8ff4d48e3eb1f690b7adb0d3d Mon Sep 17 00:00:00 2001
-From: Jussi Laako <jussi@sonarnerd.net>
-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 <jussi@sonarnerd.net>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- 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

@@ -1,43 +0,0 @@
-From f1eba0b5deb6c3988d6dd7317ccc931c09792843 Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-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 <ikey@solus-project.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- 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
-

alsa-utils-1.1.5.tar.bz2

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

alsa-utils-1.1.6.tar.bz2

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

alsa-utils.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Apr  4 14:57:35 CEST 2018 - tiwai@suse.de
+
+- Avoid %license tag for old distros to fix builds
+
+-------------------------------------------------------------------
+Wed Apr  4 08:39:33 CEST 2018 - tiwai@suse.de
+
+- Updated to alsa-utils 1.1.6:
+  * Change FSF address (Franklin Street)
+  * aplay: Adjust sample rate limits to support newer hardware
+  * alsactl: Only start restore service when asoundrc file exists
+  * alsaloop: fix a typo in the comparison
+  * speaker-test: Refactor the tone-generator codes
+  * aplay: Fix wav file not being split on 32 bit platforms
+  * bat: alsa.c - move the thread cleanup pop before goto exit3
+- Remove obsoleted patches:
+  0001-aplay-Adjust-sample-rate-limits-to-support-newer-har.patch
+  0002-alsactl-Only-start-restore-service-when-asoundrc-fil.patch
+- Use %license file tag
+
 -------------------------------------------------------------------
 Mon Dec 18 17:33:17 CET 2017 - tiwai@suse.de
 

alsa-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package alsa-utils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
 #
 
 
-%define package_version	1.1.5
-#
 %if 0%{?suse_version} > 1130
 %define use_systemd	1
 %define use_varlib	1
@@ -35,16 +33,14 @@ BuildRequires:  systemd
 %define _udevdir /lib/udev
 %endif
 Name:           alsa-utils
-Version:        1.1.5
+Version:        1.1.6
 Release:        0
 Summary:        Advanced Linux Sound Architecture Utilities
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
 Url:            http://www.alsa-project.org/
-Source:         ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
+Source:         ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2
 Source1:        01beep.conf
-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
@@ -78,11 +74,9 @@ 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}
+%setup -q
 # fix stupid automake's automatic action
 sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
-%patch1 -p1
-%patch2 -p1
 
 %build
 export AUTOMAKE_JOBS="%{?_smp_mflags}"
@@ -115,7 +109,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/alsa
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc COPYING ChangeLog INSTALL README TODO
+%if 0%{?suse_version} >= 1200
+%license COPYING
+%else
+%doc COPYING
+%endif
+%doc ChangeLog INSTALL README TODO
 %doc seq/aconnect/README*
 %doc seq/aseqnet/README*
 %{_mandir}/man*/*
@@ -137,6 +136,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/alsa
 
 %files -n alsabat
 %defattr(-, root, root)
+%if 0%{?suse_version} >= 1200
+%license COPYING
+%else
+%doc COPYING
+%endif
 %{_bindir}/alsabat
 %{_mandir}/man*/alsabat.*