The branch, master has been updated
via ad4844b7942b75c7d7638e32129fdb921ea043c4 (commit)
from 5f55c0b088c56ba57d3982ef28726d375e00a247 (commit)
- Shortlog ------------------------------------------------------------
ad4844b debian/patches/remove-analog-mono.patch:
Summary of changes:
debian/changelog | 10 ++-
debian/patches/remove-analog-mono.patch | 124 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 133 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit ad4844b7942b75c7d7638e32129fdb921ea043c4
Author: Sjoerd Simons <[email protected]>
Date: Sat Jul 21 17:27:55 2012 +0200
debian/patches/remove-analog-mono.patch:
* debian/patches/remove-analog-mono.patch:
- Added. Remove analog-output-lfe-on-mono mixer path, although in
principle
Ac '97 hardware has a seperate mono LFE pin nothing seems to use it. To
make matters worse it does confused pulseaudios port selection slightly
which causes audio in virtualbox not to work out of the box
(Closes: #673847)
diff --git a/debian/changelog b/debian/changelog
index 6c5c2b4..56f3dd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,14 @@ pulseaudio (2.1-1) UNRELEASED; urgency=low
* New upstream stable release
* debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
- Added. Fix build
-
- -- Sjoerd Simons <[email protected]> Sat, 21 Jul 2012 17:11:01 +0200
+ * debian/patches/remove-analog-mono.patch:
+ - Added. Remove analog-output-lfe-on-mono mixer path, although in principle
+ Ac '97 hardware has a seperate mono LFE pin nothing seems to use it. To
+ make matters worse it does confused pulseaudios port selection slightly
+ which causes audio in virtualbox not to work out of the box
+ (Closes: #673847)
+
+ -- Sjoerd Simons <[email protected]> Sat, 21 Jul 2012 17:23:28 +0200
pulseaudio (2.0-3) unstable; urgency=low
diff --git a/debian/patches/remove-analog-mono.patch
b/debian/patches/remove-analog-mono.patch
new file mode 100644
index 0000000..46e833c
--- /dev/null
+++ b/debian/patches/remove-analog-mono.patch
@@ -0,0 +1,124 @@
+Index: pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/default.conf
+===================================================================
+--- pulseaudio-2.0.orig/src/modules/alsa/mixer/profile-sets/default.conf
2012-05-13 15:26:37.000000000 +0200
++++ pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/default.conf
2012-07-11 10:36:40.594590601 +0200
+@@ -101,42 +101,42 @@
+ [Mapping analog-mono]
+ device-strings = hw:%f
+ channel-map = mono
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
+ priority = 1
+
+ [Mapping analog-stereo]
+ device-strings = front:%f hw:%f
+ channel-map = left,right
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
+ priority = 10
+
+ [Mapping analog-surround-40]
+ device-strings = surround40:%f
+ channel-map = front-left,front-right,rear-left,rear-right
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 7
+ direction = output
+
+ [Mapping analog-surround-41]
+ device-strings = surround41:%f
+ channel-map = front-left,front-right,rear-left,rear-right,lfe
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 8
+ direction = output
+
+ [Mapping analog-surround-50]
+ device-strings = surround50:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 7
+ direction = output
+
+ [Mapping analog-surround-51]
+ device-strings = surround51:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 8
+ direction = output
+
+@@ -144,7 +144,7 @@
+ device-strings = surround71:%f
+ channel-map =
front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+ description = Analog Surround 7.1
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 7
+ direction = output
+
+Index: pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
+===================================================================
+--- pulseaudio-2.0.orig/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
2012-05-13 15:26:37.000000000 +0200
++++ pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
2012-07-11 10:34:12.474169115 +0200
+@@ -27,42 +27,42 @@
+ [Mapping analog-mono]
+ device-strings = hw:%f
+ channel-map = mono
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
+ priority = 1
+
+ [Mapping analog-stereo]
+ device-strings = front:%f hw:%f
+ channel-map = left,right
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-headphones
analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic
analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic
analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner
analog-input-fm analog-input-mic-line
+ priority = 10
+
+ [Mapping analog-surround-40]
+ device-strings = surround40:%f
+ channel-map = front-left,front-right,rear-left,rear-right
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 7
+ direction = output
+
+ [Mapping analog-surround-41]
+ device-strings = surround41:%f
+ channel-map = front-left,front-right,rear-left,rear-right,lfe
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 8
+ direction = output
+
+ [Mapping analog-surround-50]
+ device-strings = surround50:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 7
+ direction = output
+
+ [Mapping analog-surround-51]
+ device-strings = surround51:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 8
+ direction = output
+
+@@ -70,7 +70,7 @@
+ device-strings = surround71:%f
+ channel-map =
front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+ description = Analog Surround 7.1
+-paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker
analog-output-desktop-speaker
+ priority = 7
+ direction = output
+
diff --git a/debian/patches/series b/debian/patches/series
index fe2fe05..3e8b479 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001_man_page_typos.patch
webrtc-utils-needs-to-be-installed-before-module-ech.patch
+remove-analog-mono.patch
--
pulseaudio packaging
_______________________________________________
pkg-pulseaudio-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
