Accepting request 246484 from multimedia:libs
1 OBS-URL: https://build.opensuse.org/request/show/246484 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=154
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
7c4273f43e
@ -0,0 +1,38 @@
|
||||
From dfc3bf97bf45bd78d498d20fcf930541350f836d Mon Sep 17 00:00:00 2001
|
||||
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
|
||||
Date: Mon, 18 Aug 2014 18:45:17 +0900
|
||||
Subject: [PATCH] Sync enum snd_hwdep_iface_t with include/asound/asound.h
|
||||
|
||||
Some members in this enumerated type has not updated for 9 years, although
|
||||
kernel-drivers added them during this period. This commit adds them following
|
||||
to a commit 87df9f3 'sync include/asound/asound.h with 3.17-rc1 kernel'.
|
||||
|
||||
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
include/hwdep.h | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/hwdep.h b/include/hwdep.h
|
||||
index ab12822cf799..6496fa2d7d87 100644
|
||||
--- a/include/hwdep.h
|
||||
+++ b/include/hwdep.h
|
||||
@@ -68,8 +68,13 @@ typedef enum _snd_hwdep_iface {
|
||||
SND_HWDEP_IFACE_USX2Y_PCM, /**< Tascam US122, US224 & US428 raw USB PCM */
|
||||
SND_HWDEP_IFACE_PCXHR, /**< Digigram PCXHR */
|
||||
SND_HWDEP_IFACE_SB_RC, /**< SB Extigy/Audigy2NX remote control */
|
||||
-
|
||||
- SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_SB_RC /**< last known hwdep interface */
|
||||
+ SND_HWDEP_IFACE_HDA, /**< HD-audio */
|
||||
+ SND_HWDEP_IFACE_USB_STREAM, /**< direct access to usb stream */
|
||||
+ SND_HWDEP_IFACE_FW_DICE, /**< TC DICE FireWire device */
|
||||
+ SND_HWDEP_IFACE_FW_FIREWORKS, /**< Echo Audio Fireworks based device */
|
||||
+ SND_HWDEP_IFACE_FW_BEBOB, /**< BridgeCo BeBoB based device */
|
||||
+
|
||||
+ SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_FW_BEBOB /**< last known hwdep interface */
|
||||
} snd_hwdep_iface_t;
|
||||
|
||||
/** open for reading */
|
||||
--
|
||||
2.1.0
|
||||
|
||||
48
0020-pcm-2nd-round-of-pcm_misc-DSD-fixes.patch
Normal file
48
0020-pcm-2nd-round-of-pcm_misc-DSD-fixes.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From b9f58dcc6f91fde42e6dd2bb831d6063855512a7 Mon Sep 17 00:00:00 2001
|
||||
From: Jurgen Kramer <gtmkramer@xs4all.nl>
|
||||
Date: Fri, 22 Aug 2014 10:15:10 +0200
|
||||
Subject: [PATCH] pcm: 2nd round of pcm_misc DSD fixes
|
||||
|
||||
Functions 'snd_pcm_format_silence_64' and 'snd_pcm_format_size' also need to be
|
||||
able to handle the DSD smaple format.
|
||||
|
||||
Changes from v1:
|
||||
- Correct silence pattern for DSD
|
||||
|
||||
Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
src/pcm/pcm_misc.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c
|
||||
index 24d52f910cb6..46fc7719978e 100644
|
||||
--- a/src/pcm/pcm_misc.c
|
||||
+++ b/src/pcm/pcm_misc.c
|
||||
@@ -317,11 +317,13 @@ ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples)
|
||||
switch (format) {
|
||||
case SNDRV_PCM_FORMAT_S8:
|
||||
case SNDRV_PCM_FORMAT_U8:
|
||||
+ case SNDRV_PCM_FORMAT_DSD_U8:
|
||||
return samples;
|
||||
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 samples * 2;
|
||||
case SNDRV_PCM_FORMAT_S18_3LE:
|
||||
case SNDRV_PCM_FORMAT_S18_3BE:
|
||||
@@ -390,6 +392,9 @@ u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
|
||||
return 0;
|
||||
case SNDRV_PCM_FORMAT_U8:
|
||||
return 0x8080808080808080ULL;
|
||||
+ case SNDRV_PCM_FORMAT_DSD_U8:
|
||||
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
|
||||
+ return 0x6969696969696969ULL;
|
||||
#ifdef SNDRV_LITTLE_ENDIAN
|
||||
case SNDRV_PCM_FORMAT_U16_LE:
|
||||
return 0x8000800080008000ULL;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
42
0021-doc-fix-cross-compiling-example.patch
Normal file
42
0021-doc-fix-cross-compiling-example.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From 5f1960e3d8d56aa63afe2c37c6a3f4aa03571627 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Voytik <voytikd@gmail.com>
|
||||
Date: Fri, 22 Aug 2014 14:17:10 +0400
|
||||
Subject: [PATCH] doc: fix cross-compiling example
|
||||
|
||||
Simplest way to configure cross-compilation with configure
|
||||
script is to pass '--host' option.
|
||||
Passing just '--target' doesn't work.
|
||||
|
||||
Signed-off-by: Dmitry Voytik <voytikd@gmail.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
INSTALL | 9 +++------
|
||||
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/INSTALL b/INSTALL
|
||||
index 91a8648e1462..47086e3cd7cc 100644
|
||||
--- a/INSTALL
|
||||
+++ b/INSTALL
|
||||
@@ -78,16 +78,13 @@ When you would like to cross-compile ALSA library (e.g. compile on
|
||||
i686 host but for arm architecture) you will need to call ./configure
|
||||
script with additional parameters:
|
||||
|
||||
-CC=arm-linux-gcc ./configure --target=arm-linux
|
||||
+CC=arm-linux-gcc ./configure --host=arm-linux
|
||||
|
||||
-In this example host where the library is build is guessed (should be
|
||||
-given with --host=platform) and target for which is the library build is
|
||||
-Linux on ARM architecture. You should omit setting 'CC' variable and
|
||||
-cross-compiler will be guessed too.
|
||||
+You can omit setting 'CC' variable and cross-compiler will be guessed too.
|
||||
|
||||
So simplest version would be:
|
||||
|
||||
-./configure --target=arm-linux
|
||||
+./configure --host=arm-linux
|
||||
|
||||
For platform names in the form cpu-vendor-os (or aliases for this)
|
||||
you should look in 'config.guess' script. Target and all paths
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 26 12:44:29 CEST 2014 - tiwai@suse.de
|
||||
|
||||
- Yet more DSD fix, hwdep iface sync with the recent kernel, and a
|
||||
minor documentation fix from upstream:
|
||||
0019-Sync-enum-snd_hwdep_iface_t-with-include-asound-asou.patch
|
||||
0020-pcm-2nd-round-of-pcm_misc-DSD-fixes.patch
|
||||
0021-doc-fix-cross-compiling-example.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 12 16:02:33 CEST 2014 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -67,6 +67,9 @@ 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
|
||||
Patch19: 0019-Sync-enum-snd_hwdep_iface_t-with-include-asound-asou.patch
|
||||
Patch20: 0020-pcm-2nd-round-of-pcm_misc-DSD-fixes.patch
|
||||
Patch21: 0021-doc-fix-cross-compiling-example.patch
|
||||
# rest suse patches
|
||||
Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff
|
||||
BuildRequires: doxygen
|
||||
@ -153,6 +156,9 @@ Architecture.
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%if 0%{?suse_version} == 1130
|
||||
%patch99 -p1
|
||||
%endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user