← Back to branch summary

~ubuntu-branches/ubuntu/lucid/alsa-lib/lucid

« back to all changes in this revision

Viewing changes to debian/patches/Fix-SB-Xfi.conf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-11-04 19:04:11 UTC
  • mfrom: (1.1.12 upstream) (2.2.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104190411-igse8f4bzca8dq5x
Tags: 1.0.21a-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/rules:
    + Don't bail when removing include/alsa
  - debian/control: Add Vcs-Bzr URI
  - Add configuration files for bluetooth/bluez-alsa and pulseaudio
  - debian/libasound2.install: Ship smixer plugins for native and bi-arch
    packages
  - drop libcxxtools-dev build dependency, its in universe
  - debian/patches/Fix-fpe-snd_pcm_mmap_begin.patch: Handle attempts to
    divide by zero

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Fix-SB-Xfi.conf.patch
1
 
From e5ca075cde887a50d7a3c42b5c71d9cfc90a46fc Mon Sep 17 00:00:00 2001
2
 
From: Takashi Iwai <tiwai@suse.de>
3
 
Date: Tue, 9 Jun 2009 04:49:57 +0200
4
 
Subject: [PATCH] Fix SB-Xfi.conf
5
 
 
6
 
Added missing hint.device for rear, clfe, etc definitions.
7
 
Removed invalid iec958 capture definition.
8
 
 
9
 
Signed-off-by: Takashi Iwai <tiwai@suse.de>
10
 
---
11
 
 src/conf/cards/SB-XFi.conf |    8 +++-----
12
 
 1 files changed, 3 insertions(+), 5 deletions(-)
13
 
 
14
 
diff --git a/src/conf/cards/SB-XFi.conf b/src/conf/cards/SB-XFi.conf
15
 
index f819731..38d0027 100644
16
 
--- a/src/conf/cards/SB-XFi.conf
17
 
+++ b/src/conf/cards/SB-XFi.conf
18
 
@@ -24,6 +24,7 @@ SB-XFi.pcm.rear.0 {
19
 
        type hw
20
 
        card $CARD
21
 
        device 1
22
 
+       hint.device 1
23
 
 }      
24
 
 
25
 
 <confdir:pcm/center_lfe.conf>
26
 
@@ -36,6 +37,7 @@ SB-XFi.pcm.center_lfe.0 {
27
 
        type hw
28
 
        card $CARD
29
 
        device 2
30
 
+       hint.device 2
31
 
 }      
32
 
 
33
 
 <confdir:pcm/side.conf>
34
 
@@ -48,6 +50,7 @@ SB-XFi.pcm.side.0 {
35
 
        type hw
36
 
        card $CARD
37
 
        device 3
38
 
+       hint.device 3
39
 
 }      
40
 
 
41
 
 <confdir:pcm/surround40.conf>
42
 
@@ -101,10 +104,5 @@ SB-XFi.pcm.iec958.0 {
43
 
                        ]
44
 
                }
45
 
        }
46
 
-       capture.pcm {
47
 
-               type hw
48
 
-               card $CARD
49
 
-               device 4
50
 
-       }
51
 
        hint.device 4
52
 
 }
53
 
1.6.3.3
54