Hello community,
here is the log from the commit of package alsa for openSUSE:Factory checked in at 2014-08-14 14:57:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa (Old)
and /work/SRC/openSUSE:Factory/.alsa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa"
Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa/alsa.changes 2014-08-03 15:36:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alsa.new/alsa.changes 2014-08-14 14:57:46.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Aug 12 16:02:33 CEST 2014 - tiwai@suse.de
+
+- Backport upstream fixes for supporting the missing DSD formats:
+ 0016-pcm-Fix-DSD-formats-userland-usability.patch
+ 0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
+ 0018-pcm-Add-missing-signed-and-endianess-definitions-for.patch
+- Remove alsa-info.sh from alsa.rpm; it's moved into alsa-utils
+
+-------------------------------------------------------------------
Old:
----
alsa-info.sh
New:
----
0016-pcm-Fix-DSD-formats-userland-usability.patch
0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
0018-pcm-Add-missing-signed-and-endianess-definitions-for.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.x2Z1Dz/_old 2014-08-14 14:57:47.000000000 +0200
+++ /var/tmp/diff_new_pack.x2Z1Dz/_new 2014-08-14 14:57:47.000000000 +0200
@@ -44,7 +44,6 @@
Source30: all_notes_off
Source31: all_notes_off.bin
Source32: all_notes_off.mid
-Source33: alsa-info.sh
Source34: alsa-init.sh
Source40: 50-alsa.conf
Source41: install-snd-module
@@ -65,6 +64,9 @@
Patch13: 0013-pcm-route-Use-get32-for-multi-source-route-calculati.patch
Patch14: 0014-pcm-Drop-snd_pcm_linear_-get-put-32_index.patch
Patch15: 0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch
+Patch16: 0016-pcm-Fix-DSD-formats-userland-usability.patch
+Patch17: 0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
+Patch18: 0018-pcm-Add-missing-signed-and-endianess-definitions-for.patch
# rest suse patches
Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff
BuildRequires: doxygen
@@ -148,6 +150,9 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
%if 0%{?suse_version} == 1130
%patch99 -p1
%endif
@@ -248,8 +253,6 @@
mkdir -p %{buildroot}%{_docdir}/%{name}/alsa-lib
cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK %{buildroot}%{_docdir}/%{name}/alsa-lib
cp doc/asoundrc.txt %{buildroot}%{_docdir}/%{name}/alsa-lib
-# install alsa-info.sh to sbindir
-install -c -m 0755 %{SOURCE33} %{buildroot}%{_sbindir}
%post
%if 0%{?suse_version} > 1310
++++++ 0016-pcm-Fix-DSD-formats-userland-usability.patch ++++++
From 87df9f3b7a650418b9aef943ac246549c132672a Mon Sep 17 00:00:00 2001
From: Jurgen Kramer
Date: Sat, 9 Aug 2014 12:09:21 +0200
Subject: [PATCH] pcm: Fix DSD formats userland usability
Support for DSD sample formats has been added a while ago. This patch makes
those sample formats beter usable from userland (e.g. aplay).
[These implementation details have been forgotten in the previous DSD
support patch -- tiwai]
Signed-off-by: Takashi Iwai
---
include/sound/asound.h | 4 +++-
src/pcm/pcm_misc.c | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/sound/asound.h b/include/sound/asound.h
index c819df421434..519452466317 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -214,7 +214,9 @@ typedef int __bitwise snd_pcm_format_t;
#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */
#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */
-#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_G723_40_1B
+#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* 8 1-bit samples in 1 byte */
+#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* 16 1-bit samples in 2 bytes */
+#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U16_LE
#ifdef SNDRV_LITTLE_ENDIAN
#define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c
index d52160cec653..44bb89cb0d44 100644
--- a/src/pcm/pcm_misc.c
+++ b/src/pcm/pcm_misc.c
@@ -195,11 +195,13 @@ int snd_pcm_format_width(snd_pcm_format_t format)
switch (format) {
case SNDRV_PCM_FORMAT_S8:
case SNDRV_PCM_FORMAT_U8:
+ case SNDRV_PCM_FORMAT_DSD_U8:
return 8;
case SNDRV_PCM_FORMAT_S16_LE:
case SNDRV_PCM_FORMAT_S16_BE:
case SNDRV_PCM_FORMAT_U16_LE:
case SNDRV_PCM_FORMAT_U16_BE:
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
return 16;
case SNDRV_PCM_FORMAT_S18_3LE:
case SNDRV_PCM_FORMAT_S18_3BE:
@@ -253,11 +255,13 @@ int snd_pcm_format_physical_width(snd_pcm_format_t format)
switch (format) {
case SNDRV_PCM_FORMAT_S8:
case SNDRV_PCM_FORMAT_U8:
+ case SNDRV_PCM_FORMAT_DSD_U8:
return 8;
case SNDRV_PCM_FORMAT_S16_LE:
case SNDRV_PCM_FORMAT_S16_BE:
case SNDRV_PCM_FORMAT_U16_LE:
case SNDRV_PCM_FORMAT_U16_BE:
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
return 16;
case SNDRV_PCM_FORMAT_S18_3LE:
case SNDRV_PCM_FORMAT_S18_3BE:
--
2.0.4
++++++ 0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch ++++++
From 717ae3dd90c37f3a5ea9809370bdf56e2590a1c4 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Mon, 11 Aug 2014 11:51:29 +0200
Subject: [PATCH] Sync include/sound/asound.h with 3.17-rc1 kernel
From e8e54811339b13d6df648bb48b35157d9fba352c Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Mon, 11 Aug 2014 11:55:03 +0200
Subject: [PATCH] pcm: Add missing signed and endianess definitions for DSD
Signed-off-by: Takashi Iwai
---
include/sound/asound.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 519452466317..32168f7ffce3 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -93,9 +93,12 @@ enum {
SNDRV_HWDEP_IFACE_SB_RC, /* SB Extigy/Audigy2NX remote control */
SNDRV_HWDEP_IFACE_HDA, /* HD-audio */
SNDRV_HWDEP_IFACE_USB_STREAM, /* direct access to usb stream */
+ SNDRV_HWDEP_IFACE_FW_DICE, /* TC DICE FireWire device */
+ SNDRV_HWDEP_IFACE_FW_FIREWORKS, /* Echo Audio Fireworks based device */
+ SNDRV_HWDEP_IFACE_FW_BEBOB, /* BridgeCo BeBoB based device */
/* Don't forget to change the following: */
- SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USB_STREAM
+ SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_BEBOB
};
struct snd_hwdep_info {
@@ -214,8 +217,8 @@ typedef int __bitwise snd_pcm_format_t;
#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */
#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */
-#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* 8 1-bit samples in 1 byte */
-#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* 16 1-bit samples in 2 bytes */
+#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
+#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U16_LE
#ifdef SNDRV_LITTLE_ENDIAN
@@ -461,7 +464,7 @@ struct snd_xfern {
enum {
SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /* gettimeofday equivalent */
SNDRV_PCM_TSTAMP_TYPE_MONOTONIC, /* posix_clock_monotonic equivalent */
- SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */
+ SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */
SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,
};
@@ -820,6 +823,8 @@ typedef int __bitwise snd_ctl_elem_iface_t;
#define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */
#define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001) /* Off, without power */
+#define SNDRV_CTL_ELEM_ID_NAME_MAXLEN 44
+
struct snd_ctl_elem_id {
unsigned int numid; /* numeric identifier, zero = invalid */
snd_ctl_elem_iface_t iface; /* interface identifier */
--
2.0.4
++++++ 0018-pcm-Add-missing-signed-and-endianess-definitions-for.patch ++++++
formats
Signed-off-by: Takashi Iwai
---
src/pcm/pcm_misc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c
index 44bb89cb0d44..24d52f910cb6 100644
--- a/src/pcm/pcm_misc.c
+++ b/src/pcm/pcm_misc.c
@@ -62,6 +62,8 @@ int snd_pcm_format_signed(snd_pcm_format_t format)
case SNDRV_PCM_FORMAT_U20_3BE:
case SNDRV_PCM_FORMAT_U18_3LE:
case SNDRV_PCM_FORMAT_U18_3BE:
+ case SNDRV_PCM_FORMAT_DSD_U8:
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
return 0;
default:
return -EINVAL;
@@ -150,6 +152,8 @@ int snd_pcm_format_little_endian(snd_pcm_format_t format)
case SNDRV_PCM_FORMAT_U24_3BE:
case SNDRV_PCM_FORMAT_U20_3BE:
case SNDRV_PCM_FORMAT_U18_3BE:
+ case SNDRV_PCM_FORMAT_DSD_U8:
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
return 0;
default:
return -EINVAL;
--
2.0.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org