diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-02-25 19:13:44 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-02-25 15:29:29 -0300 |
commit | 6adee1c65669fab5a4d8804750b4885bb63fcd1a (patch) | |
tree | cbcbd66aa9d0d471b9ad70bd907c2e9d9b141831 /recipes-multimedia/pulseaudio | |
parent | 9aeea362f05353e1b7a9b7da4f64bbc43d0dc7ba (diff) | |
download | meta-freescale-6adee1c65669fab5a4d8804750b4885bb63fcd1a.tar.gz |
pulseaudio: mx7: refresh patch against pulseaudio 14.2
Prevents
| Applying patch pulseaudio-remove-the-control-for-speaker-headphone-widge.patch
| patching file src/modules/alsa/mixer/paths/analog-output-headphones.conf
| Hunk #1 succeeded at 88 (offset 7 lines).
| Hunk #2 succeeded at 119 (offset 14 lines).
| patching file src/modules/alsa/mixer/paths/analog-output-speaker.conf
| Hunk #1 succeeded at 91 with fuzz 2 (offset 18 lines).
| Hunk #2 succeeded at 115 (offset 22 lines).
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-multimedia/pulseaudio')
-rw-r--r-- | recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch b/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch index 019f9ba4..57c28741 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch +++ b/recipes-multimedia/pulseaudio/pulseaudio/imx/pulseaudio-remove-the-control-for-speaker-headphone-widge.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 015e048d3662b9f82e9aa5cd04d7c9de4eadb68d Mon Sep 17 00:00:00 2001 | 1 | From 33022867d76c91fe4e60699c1b7ebbc8feb4ee93 Mon Sep 17 00:00:00 2001 |
2 | From: Shengjiu Wang <shengjiu.wang@freescale.com> | 2 | From: Shengjiu Wang <shengjiu.wang@freescale.com> |
3 | Date: Mon, 30 Mar 2015 10:26:14 +0800 | 3 | Date: Mon, 30 Mar 2015 10:26:14 +0800 |
4 | Subject: [PATCH] pulseaudio: remove the control for speaker/headphone widget | 4 | Subject: [PATCH] pulseaudio: remove the control for speaker/headphone widget |
@@ -12,15 +12,15 @@ Upstream-Status: Inappropriate [i.MX specific] | |||
12 | 12 | ||
13 | Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> | 13 | Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> |
14 | --- | 14 | --- |
15 | .../alsa/mixer/paths/analog-output-headphones.conf | 8 ++++---- | 15 | .../alsa/mixer/paths/analog-output-headphones.conf | 8 ++++---- |
16 | .../alsa/mixer/paths/analog-output-speaker.conf | 8 ++++---- | 16 | src/modules/alsa/mixer/paths/analog-output-speaker.conf | 8 ++++---- |
17 | 2 files changed, 8 insertions(+), 8 deletions(-) | 17 | 2 files changed, 8 insertions(+), 8 deletions(-) |
18 | 18 | ||
19 | diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf | 19 | diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf |
20 | index b6ee70b..a617976 100644 | 20 | index 88907f0..7598d2f 100644 |
21 | --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf | 21 | --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf |
22 | +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf | 22 | +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf |
23 | @@ -81,8 +81,8 @@ override-map.2 = all-left,all-right | 23 | @@ -88,8 +88,8 @@ override-map.2 = all-left,all-right |
24 | 24 | ||
25 | [Element Headphone] | 25 | [Element Headphone] |
26 | required-any = any | 26 | required-any = any |
@@ -31,7 +31,7 @@ index b6ee70b..a617976 100644 | |||
31 | override-map.1 = all | 31 | override-map.1 = all |
32 | override-map.2 = all-left,all-right | 32 | override-map.2 = all-left,all-right |
33 | 33 | ||
34 | @@ -105,8 +105,8 @@ switch = mute | 34 | @@ -119,8 +119,8 @@ switch = mute |
35 | volume = zero | 35 | volume = zero |
36 | 36 | ||
37 | [Element Speaker] | 37 | [Element Speaker] |
@@ -43,10 +43,10 @@ index b6ee70b..a617976 100644 | |||
43 | [Element Desktop Speaker] | 43 | [Element Desktop Speaker] |
44 | switch = off | 44 | switch = off |
45 | diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf | 45 | diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf |
46 | index 39193dd..34bbb85 100644 | 46 | index fcf2f5c..6f6f898 100644 |
47 | --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf | 47 | --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf |
48 | +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf | 48 | +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf |
49 | @@ -73,8 +73,8 @@ volume = off | 49 | @@ -91,8 +91,8 @@ volume = off |
50 | ; This profile path is intended to control the speaker, let's mute headphones | 50 | ; This profile path is intended to control the speaker, let's mute headphones |
51 | ; else there will be a spike when plugging in headphones | 51 | ; else there will be a spike when plugging in headphones |
52 | [Element Headphone] | 52 | [Element Headphone] |
@@ -55,9 +55,9 @@ index 39193dd..34bbb85 100644 | |||
55 | +switch = on | 55 | +switch = on |
56 | +volume = ignore | 56 | +volume = ignore |
57 | 57 | ||
58 | [Element Headphone2] | 58 | [Element Headphone,1] |
59 | switch = off | 59 | switch = off |
60 | @@ -93,8 +93,8 @@ override-map.2 = all-left,all-right | 60 | @@ -115,8 +115,8 @@ override-map.2 = all-left,all-right |
61 | 61 | ||
62 | [Element Speaker] | 62 | [Element Speaker] |
63 | required-any = any | 63 | required-any = any |
@@ -69,5 +69,5 @@ index 39193dd..34bbb85 100644 | |||
69 | override-map.2 = all-left,all-right | 69 | override-map.2 = all-left,all-right |
70 | 70 | ||
71 | -- | 71 | -- |
72 | 1.7.9.5 | 72 | 2.20.1 |
73 | 73 | ||