Accepting request 143672 from home:tiwai:branches:multimedia:libs

- backport UAPI header fix, chmap extension and comiple warning fix
  0036-Merge-kernel-uapi-sound-asound.h-and-asequencer.h.patch
  0037-PCM-Add-more-chmap-definitions-for-UAC2.patch
  0038-PCM-shut-up-a-compile-unused-parameter-compile-warni.patch
  0039-Add-workaround-for-conflicting-snd_seq_event_t-defin.patch

OBS-URL: https://build.opensuse.org/request/show/143672
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=117

0037-PCM-Add-more-chmap-definitions-for-UAC2.patch

@@ -0,0 +1,102 @@
+From 67d692af480ed0656fb0fe7fdc6451374447dc7c Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 26 Nov 2012 18:10:26 +0100
+Subject: [PATCH 37/38] PCM: Add more chmap definitions for UAC2
+
+The new PCM chmap positions have been added in (to be) 3.8-rc1 kernel,
+and now updated alsa-lib, too.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ include/pcm.h          | 13 +++++++++++--
+ include/sound/asound.h | 12 +++++++++++-
+ src/pcm/pcm.c          | 12 ++++++++++++
+ 3 files changed, 34 insertions(+), 3 deletions(-)
+
+diff --git a/include/pcm.h b/include/pcm.h
+index 1ce91e7..2235678 100644
+--- a/include/pcm.h
++++ b/include/pcm.h
+@@ -475,7 +475,7 @@ int snd_pcm_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2);
+ int snd_pcm_unlink(snd_pcm_t *pcm);
+ 
+ /** channel mapping API version number */
+-#define SND_CHMAP_API_VERSION	((1 << 16) | (0 << 8) | 0)
++#define SND_CHMAP_API_VERSION	((1 << 16) | (0 << 8) | 1)
+ 
+ /** channel map list type */
+ enum snd_pcm_chmap_type {
+@@ -516,7 +516,16 @@ enum snd_pcm_chmap_position {
+ 	SND_CHMAP_TRL,		/** top rear left */
+ 	SND_CHMAP_TRR,		/** top rear right */
+ 	SND_CHMAP_TRC,		/** top rear center */
+-	SND_CHMAP_LAST = SND_CHMAP_TRC,	/** last entry */
++	SND_CHMAP_TFLC,		/* top front left center */
++	SND_CHMAP_TFRC,		/* top front right center */
++	SND_CHMAP_TSL,		/* top side left */
++	SND_CHMAP_TSR,		/* top side right */
++	SND_CHMAP_LLFE,		/* left LFE */
++	SND_CHMAP_RLFE,		/* right LFE */
++	SND_CHMAP_BC,		/* bottom center */
++	SND_CHMAP_BLC,		/* bottom left center */
++	SND_CHMAP_BRC,		/* bottom right center */
++	SND_CHMAP_LAST = SND_CHMAP_BRC,
+ };
+ 
+ /** bitmask for channel position */
+diff --git a/include/sound/asound.h b/include/sound/asound.h
+index 515b8fc..1774a5c 100644
+--- a/include/sound/asound.h
++++ b/include/sound/asound.h
+@@ -492,7 +492,17 @@ enum {
+ 	SNDRV_CHMAP_TRL,	/* top rear left */
+ 	SNDRV_CHMAP_TRR,	/* top rear right */
+ 	SNDRV_CHMAP_TRC,	/* top rear center */
+-	SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,
++	/* new definitions for UAC2 */
++	SNDRV_CHMAP_TFLC,	/* top front left center */
++	SNDRV_CHMAP_TFRC,	/* top front right center */
++	SNDRV_CHMAP_TSL,	/* top side left */
++	SNDRV_CHMAP_TSR,	/* top side right */
++	SNDRV_CHMAP_LLFE,	/* left LFE */
++	SNDRV_CHMAP_RLFE,	/* right LFE */
++	SNDRV_CHMAP_BC,		/* bottom center */
++	SNDRV_CHMAP_BLC,	/* bottom left center */
++	SNDRV_CHMAP_BRC,	/* bottom right center */
++	SNDRV_CHMAP_LAST = SNDRV_CHMAP_BRC,
+ };
+ 
+ #define SNDRV_CHMAP_POSITION_MASK	0xffff
+diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
+index e16b07f..d616705 100644
+--- a/src/pcm/pcm.c
++++ b/src/pcm/pcm.c
+@@ -7434,6 +7434,9 @@ static const char *chmap_names[SND_CHMAP_LAST + 1] = {
+ 	_NAME(FLH), _NAME(FCH), _NAME(FRH), _NAME(TC),
+ 	_NAME(TFL), _NAME(TFR), _NAME(TFC),
+ 	_NAME(TRL), _NAME(TRR), _NAME(TRC),
++	_NAME(TFLC), _NAME(TFRC), _NAME(TSL), _NAME(TSR),
++	_NAME(LLFE), _NAME(RLFE),
++	_NAME(BC), _NAME(BLC), _NAME(BRC),
+ };
+ #undef _NAME
+ #endif
+@@ -7480,6 +7483,15 @@ static const char *chmap_long_names[SND_CHMAP_LAST + 1] = {
+ 	[SND_CHMAP_TRL] = "Top Rear Left",
+ 	[SND_CHMAP_TRR] = "Top Rear Right",
+ 	[SND_CHMAP_TRC] = "Top Rear Center",
++	[SND_CHMAP_TFLC] = "Top Front Left Center",
++	[SND_CHMAP_TFRC] = "Top Front Right Center",
++	[SND_CHMAP_TSL] = "Top Side Left",
++	[SND_CHMAP_TSR] = "Top Side Right",
++	[SND_CHMAP_LLFE] = "Left LFE",
++	[SND_CHMAP_RLFE] = "Right LFE",
++	[SND_CHMAP_BC] = "Bottom Center",
++	[SND_CHMAP_BLC] = "Bottom Left Center",
++	[SND_CHMAP_BRC] = "Bottom Right Center",
+ };
+ 
+ /**
+-- 
+1.8.0.1
+

0038-PCM-shut-up-a-compile-unused-parameter-compile-warni.patch

@@ -0,0 +1,27 @@
+From f47816d6b78003b5161ffb67b3b5c1b62b8a2a00 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 26 Nov 2012 18:13:01 +0100
+Subject: [PATCH 38/38] PCM: shut up a compile "unused parameter" compile
+ warning in pcm_multi.c
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ src/pcm/pcm_multi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c
+index 2db82c0..f58852c 100644
+--- a/src/pcm/pcm_multi.c
++++ b/src/pcm/pcm_multi.c
+@@ -739,7 +739,7 @@ static int snd_pcm_multi_mmap(snd_pcm_t *pcm)
+ 	return 0;
+ }
+ 
+-static int snd_pcm_multi_may_wait_for_avail_min(snd_pcm_t *pcm, snd_pcm_uframes_t avail)
++static int snd_pcm_multi_may_wait_for_avail_min(snd_pcm_t *pcm, snd_pcm_uframes_t avail ATTRIBUTE_UNUSED)
+ {
+ 	snd_pcm_multi_t *multi = pcm->private_data;
+ 	snd_pcm_t *slave = multi->slaves[multi->master_slave].pcm;
+-- 
+1.8.0.1
+

0039-Add-workaround-for-conflicting-snd_seq_event_t-defin.patch

@@ -0,0 +1,25 @@
+From 22d6b6e643d81467bcd2b0d8934c6b84bed51787 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 30 Nov 2012 14:33:54 +0100
+Subject: [PATCH] Add workaround for conflicting snd_seq_event_t definitions
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ include/local.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/local.h b/include/local.h
+index b0a9368..268970a 100644
+--- a/include/local.h
++++ b/include/local.h
+@@ -144,6 +144,7 @@
+ #define snd_seq_tick_time_t	sndrv_seq_tick_time_t
+ #define snd_seq_real_time	sndrv_seq_real_time
+ #define snd_seq_timestamp	sndrv_seq_timestamp
++#define snd_seq_event_type_t	sndrv_seq_event_type_t
+ #define snd_seq_event		sndrv_seq_event
+ #define snd_seq_connect		sndrv_seq_connect
+ #define snd_seq_ev_note		sndrv_seq_ev_note
+-- 
+1.8.0.1
+

alsa.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Nov 29 18:29:42 CET 2012 - tiwai@suse.de
+
+- backport UAPI header fix, chmap extension and comiple warning fix
+  0036-Merge-kernel-uapi-sound-asound.h-and-asequencer.h.patch
+  0037-PCM-Add-more-chmap-definitions-for-UAC2.patch
+  0038-PCM-shut-up-a-compile-unused-parameter-compile-warni.patch
+  0039-Add-workaround-for-conflicting-snd_seq_event_t-defin.patch
+
 -------------------------------------------------------------------
 Tue Nov 13 16:39:26 CET 2012 - tiwai@suse.de
 

alsa.spec

@@ -87,6 +87,10 @@ Patch32:        0032-pcm-fix-64-bit-SNDRV_PCM_IOCTL_STATUS-ABI-breakage.patch
 Patch33:        0033-PCM-Fix-memory-leak-for-pcm-empty-and-asym-plugins.patch
 Patch34:        0034-Reduce-compilation-warnings.patch
 Patch35:        0035-PCM-Avoid-busy-loop-in-snd_pcm_write_areas-with-rate.patch
+Patch36:        0036-Merge-kernel-uapi-sound-asound.h-and-asequencer.h.patch
+Patch37:        0037-PCM-Add-more-chmap-definitions-for-UAC2.patch
+Patch38:        0038-PCM-shut-up-a-compile-unused-parameter-compile-warni.patch
+Patch39:        0039-Add-workaround-for-conflicting-snd_seq_event_t-defin.patch
 #
 Patch99:        alsa-lib-doxygen-avoid-crash-for-11.3.diff
 Url:            http://www.alsa-project.org/
@@ -172,6 +176,10 @@ Architecture.
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 %if %suse_version == 1130
 %patch99 -p1
 %endif