← Back to branch summary

~ubuntu-branches/ubuntu/quantal/pulseaudio/quantal-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0620-alsa-mixer-Show-HDMI-ports-for-older-Nvidia-cards.patch

  • Committer: Package Import Robot
  • Author(s): David Henningsson
  • Date: 2012-03-30 09:47:17 UTC
  • Revision ID: package-import@ubuntu.com-20120330094717-6t074swtzw7hzt15
Tags: 1:1.1-0ubuntu14
https://launchpad.net/bugs/961286
* 012*.patch: Cherry-pick bugfix patches from upstream git
* 0620-alsa-mixer-Show-HDMI-ports-for-older-Nvidia-cards.patch (LP: #961286)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0620-alsa-mixer-Show-HDMI-ports-for-older-Nvidia-cards.patch
 
1
From 2577cc81b3559b78ffeb5ee4a858e2c832c015b2 Mon Sep 17 00:00:00 2001
 
2
From: David Henningsson <david.henningsson@canonical.com>
 
3
Date: Mon, 26 Mar 2012 10:31:47 +0200
 
4
Subject: [PATCH 04/20] alsa-mixer: Show HDMI ports for older Nvidia cards
 
5
 
 
6
Some older cards do not have jack detection. This patch makes the
 
7
port still show up.
 
8
An implementation detail: the "required = ignore" line has in itself
 
9
no effect, but we have to write *something* there, or else the entire
 
10
jack detection section will be ignored by the parser.
 
11
 
 
12
BugLink: https://bugs.launchpad.net/bugs/961286
 
13
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
 
14
---
 
15
 src/modules/alsa/mixer/paths/hdmi-output-0.conf |    2 +-
 
16
 src/modules/alsa/mixer/paths/hdmi-output-1.conf |    2 +-
 
17
 src/modules/alsa/mixer/paths/hdmi-output-2.conf |    2 +-
 
18
 src/modules/alsa/mixer/paths/hdmi-output-3.conf |    2 +-
 
19
 4 files changed, 4 insertions(+), 4 deletions(-)
 
20
 
 
21
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
 
22
index 46ee4fd..a86cdbd 100644
 
23
--- a/src/modules/alsa/mixer/paths/hdmi-output-0.conf
 
24
+++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
 
25
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort
 
26
 priority = 59
 
27
 
 
28
 [Jack HDMI/DP,pcm=3]
 
29
-required-any = any
 
30
+required = ignore
 
31
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
 
32
index da8fcb4..d579e4b 100644
 
33
--- a/src/modules/alsa/mixer/paths/hdmi-output-1.conf
 
34
+++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
 
35
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort 2
 
36
 priority = 58
 
37
 
 
38
 [Jack HDMI/DP,pcm=7]
 
39
-required-any = any
 
40
+required = ignore
 
41
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
 
42
index 5fcddc6..fee57d7 100644
 
43
--- a/src/modules/alsa/mixer/paths/hdmi-output-2.conf
 
44
+++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
 
45
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort 3
 
46
 priority = 57
 
47
 
 
48
 [Jack HDMI/DP,pcm=8]
 
49
-required-any = any
 
50
+required = ignore
 
51
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
 
52
index 8200787..4e6d149 100644
 
53
--- a/src/modules/alsa/mixer/paths/hdmi-output-3.conf
 
54
+++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
 
55
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort 4
 
56
 priority = 56
 
57
 
 
58
 [Jack HDMI/DP,pcm=9]
 
59
-required-any = any
 
60
+required = ignore
 
61
-- 
 
62
1.7.9.1
 
63