Accepting request 176754 from multimedia:libs

- Backport upstream fixes:
  0002-alsactl-init-ca0106-file-was-omitted.patch 
  0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch 
- Add missing ca0106 alsactl init file
- Revert the udev file drop in the previous commit (forwarded request 176753 from tiwai)

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

0001-Require-alsa-lib-1.0.27.patch

@@ -0,0 +1,30 @@
+From 2f2576518c8336f5d64f1111f2a1a0abeda54a1f Mon Sep 17 00:00:00 2001
+From: Jordi Mallach <jordi@debian.org>
+Date: Fri, 17 May 2013 14:30:46 +0200
+Subject: [PATCH] Require alsa-lib 1.0.27.
+
+Both aplay and speaker-test use the new snd_pcm_abort() function, which was
+introduced in alsa-lib 1.0.27.
+
+Signed-off-by: Jordi Mallach <jordi@debian.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 39f2d0d..0e43327 100644
+--- a/configure.in
++++ b/configure.in
+@@ -32,7 +32,7 @@ AC_PROG_MKDIR_P
+ AC_PROG_LN_S
+ AC_PROG_SED
+ PKG_PROG_PKG_CONFIG
+-AM_PATH_ALSA(1.0.24)
++AM_PATH_ALSA(1.0.27)
+ if test "x$enable_alsatest" = "xyes"; then
+ AC_CHECK_FUNC([snd_ctl_elem_add_enumerated],
+ 	      , [AC_ERROR([No user enum control support in alsa-lib])])
+-- 
+1.8.2.3
+

0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch

@@ -1,25 +0,0 @@
-From 3616b1fe3ca603832b2f88abeb722cba2f0dde7e Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 15 Apr 2013 11:20:41 +0200
-Subject: [PATCH] alsactl: Fix a typo in systemd alsa-restore.service
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- alsactl/alsa-restore.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
-index ab3c30d..245a439 100644
---- a/alsactl/alsa-restore.service.in
-+++ b/alsactl/alsa-restore.service.in
-@@ -12,6 +12,6 @@ Before=shutdown.target
- Conflicts=shutdown.target
- 
- [Service]
--Type=oneshop
-+Type=oneshot
- ExecStart=-@sbindir@/alsactl restore
- StandardOutput=syslog
--- 
-1.8.2.1
-

0002-alsactl-Fix-the-string-size-for-the-lock-file-contents.patch

@@ -1,28 +0,0 @@
-From 95788fea25c1a59985828d4b91af0772d077600b Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 15 Apr 2013 14:44:13 +0200
-Subject: [PATCH 1/1] alsactl: Fix the string size for the lock file contents
-
-The string length is 10 characters + LF + '\0' = 12 characters.
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- alsactl/lock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/alsactl/lock.c b/alsactl/lock.c
-index d34d013..fce208b 100644
---- a/alsactl/lock.c
-+++ b/alsactl/lock.c
-@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
- 	int fd = -1, err = 0;
- 	struct flock lck;
- 	struct stat st;
--	char lcktxt[11];
-+	char lcktxt[12];
- 	char *nfile;
- 
- 	if (!do_lock)
--- 
-1.7.11.4
-

0002-alsactl-init-ca0106-file-was-omitted.patch

@@ -0,0 +1,36 @@
+From 121df3694970d7eded56432c9baa24b8ccd122b1 Mon Sep 17 00:00:00 2001
+From: "Gabriel M. Beddingfield" <gabrbedd@gmail.com>
+Date: Sun, 26 May 2013 15:54:44 -0700
+Subject: [PATCH] alsactl init: ca0106 file was omitted
+
+The file alsactl/init/00main includes the line:
+
+CARDINFO{driver}=="CA0106", INCLUDE="ca0106", GOTO="init_end"
+
+However, the file alsactl/init/ca0106 is not making it into the
+release tarballs (nor to user installations).
+
+This patch adds the ca0106 file to the build.
+
+Signed-off-by: Gabriel M. Beddingfield <gabrbedd@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ alsactl/init/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alsactl/init/Makefile.am b/alsactl/init/Makefile.am
+index 9e2b83d..64dac41 100644
+--- a/alsactl/init/Makefile.am
++++ b/alsactl/init/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ init_files = \
+ 	00main default help info test \
+-	hda
++	hda ca0106
+ EXTRA_DIST = $(init_files)
+ alsainitdir = $(datadir)/alsa/init
+ alsainit_DATA = $(init_files)
+-- 
+1.8.2.3
+

0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch

@@ -0,0 +1,28 @@
+From c0f70a0b8e340d6ee903ff226886bb6f969d46a1 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 27 May 2013 09:26:39 +0200
+Subject: [PATCH] alsactl: return back the udevrules_DATA rule for
+ 90-alsa-restore.rules
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ alsactl/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
+index c0df981..bac84eb 100644
+--- a/alsactl/Makefile.am
++++ b/alsactl/Makefile.am
+@@ -11,6 +11,9 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c
+ alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\"
+ noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
+ 
++udevrules_DATA = \
++	90-alsa-restore.rules
++
+ if HAVE_SYSTEMD
+ 
+ systemdsystemunit_DATA = \
+-- 
+1.8.2.3
+

0003-arecord-add-a-missing-break-to-the-capture-loop.patch

@@ -1,27 +0,0 @@
-From b4f34ac26037c10ac51c4bb29203500165848977 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 17 Apr 2013 08:34:34 +0200
-Subject: [PATCH] arecord: add a missing break to the capture loop
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- aplay/aplay.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index 5bdc39c..000d25b 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
- 			fd = -1;
- 		}
- 
-+		if (in_aborting)
-+			break;
-+
- 		/* repeat the loop when format is raw without timelimit or
- 		 * requested counts of data are recorded
- 		 */
--- 
-1.8.2.1
-

alsa-utils-1.0.27.1.tar.bz2

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

alsa-utils-1.0.27.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef
-size 1142833

alsa-utils.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon May 27 09:42:39 CEST 2013 - tiwai@suse.de
+
+- Backport upstream fixes:
+  0002-alsactl-init-ca0106-file-was-omitted.patch 
+  0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch 
+- Add missing ca0106 alsactl init file
+- Revert the udev file drop in the previous commit
+
+-------------------------------------------------------------------
+Thu May 23 15:44:23 CEST 2013 - tiwai@suse.de
+
+- Bump to version 1.0.27.1, including previous fixes
+- Removed requirement of libudev-devel, as the superfluous rules
+  file is dropped in 1.0.27.1.
+- Backport upstream fix:
+  0001-Release-v1.0.27.1.patch
+
 -------------------------------------------------------------------
 Thu Apr 18 18:39:38 CEST 2013 - tiwai@suse.de
 

alsa-utils.spec

@@ -44,7 +44,7 @@ BuildRequires:  libudev-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
 BuildRequires:  xmlto
-%define package_version	1.0.27
+%define package_version	1.0.27.1
 Provides:       alsa-conf
 Requires:       alsa
 Requires:       dialog
@@ -52,15 +52,17 @@ Requires:       pciutils
 Summary:        Advanced Linux Sound Architecture Utilities
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Players
-Version:        1.0.27
+Version:        1.0.27.1
 Release:        0
 Source:         ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
 Source1:        01beep.conf
+# missing in 1.0.27.1 tarball
+Source99:       ca0106
 # Patch:          alsa-utils-git-fixes.diff
 # upstream fix patches
-Patch1:         0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch
+Patch1:         0001-Require-alsa-lib-1.0.27.patch
-Patch2:         0002-alsactl-Fix-the-string-size-for-the-lock-file-contents.patch
+Patch2:         0002-alsactl-init-ca0106-file-was-omitted.patch 
-Patch3:         0003-arecord-add-a-missing-break-to-the-capture-loop.patch
+Patch3:         0003-alsactl-return-back-the-udevrules_DATA-rule-for-90-a.patch 
 #
 Patch99:        alsa-utils-gettext-version-removal.diff
 Url:            http://www.alsa-project.org/
@@ -79,6 +81,7 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+cp %{S:99} alsactl/init
 #
 %if %suse_version < 1020
 %patch99 -p1

ca0106

@@ -0,0 +1,31 @@
+# Configuration for CA0106 driver
+
+CTL{reset}="mixer"
+CTL{name}="Master Playback Volume", CTL{value}="-20dB"
+CTL{name}="Master Playback Switch", CTL{value}="on"
+CTL{name}="Analog Front Playback Volume", CTL{value}="0dB"
+CTL{name}="Analog Front Playback Switch", CTL{value}="on"
+CTL{name}="Analog Rear Playback Volume", CTL{value}="0dB"
+CTL{name}="Analog Rear Playback Switch", CTL{value}="on"
+CTL{name}="Analog Center/LFE Playback Volume", CTL{value}="0dB"
+CTL{name}="Analog Center/LFE Playback Switch", CTL{value}="on"
+CTL{name}="Analog Side Playback Volume", CTL{value}="0dB"
+CTL{name}="Analog Side Playback Switch", CTL{value}="on"
+CTL{name}="IEC958 Front Playback Volume", CTL{value}="0dB"
+CTL{name}="IEC958 Rear Playback Volume", CTL{value}="0dB"
+CTL{name}="IEC958 Center/LFE Playback Volume", CTL{value}="0dB"
+# capture
+CTL{name}="Analog Source Capture Enum", CTL{value}="Mic"
+CTL{name}="Mic Capture Volume", CTL{value}="6dB"
+CTL{name}="Shared Mic/Line in Capture Switch", CTL{value}="Mic in"
+
+# some variants have also AC97 mixer
+
+CTL{reset}="mixer"
+CTL{name}="AC97 Line Capture Volume",PROGRAM!="__ctl_search",GOTO="ac97_end"
+CTL{name}="Analog Source Capture Enum", CTL{value}="AC97 in"
+CTL{name}="AC97 Mic Capture Switch", "on"
+CTL{name}="AC97 Mic Capture Value", "6dB"
+LABEL="ac97_end"
+
+RESULT="true", EXIT="return"