From 8e049eb13a423c436d3f79b929da8b77cd711ee966b167db31c48c8b146bb955 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 8 Jan 2015 14:40:48 +0000
Subject: [PATCH] Accepting request 280329 from
 home:tiwai:branches:multimedia:libs

- Fix broken volume setup with orc 0.4.23 (bsc#912260):
  pulseaudio-orc-0.4.23-volume-fix.patch

OBS-URL: https://build.opensuse.org/request/show/280329
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=151
---
 pulseaudio-orc-0.4.23-volume-fix.patch | 28 ++++++++++++++++++++++++++
 pulseaudio.changes                     |  6 ++++++
 pulseaudio.spec                        |  3 +++
 3 files changed, 37 insertions(+)
 create mode 100644 pulseaudio-orc-0.4.23-volume-fix.patch

diff --git a/pulseaudio-orc-0.4.23-volume-fix.patch b/pulseaudio-orc-0.4.23-volume-fix.patch
new file mode 100644
index 0000000..f4a577c
--- /dev/null
+++ b/pulseaudio-orc-0.4.23-volume-fix.patch
@@ -0,0 +1,28 @@
+bsc#912260
+
+Original patch
+  http://lists.freedesktop.org/archives/pulseaudio-discuss/2015-January/022905.html
+
+---
+ src/pulsecore/svolume.orc |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/src/pulsecore/svolume.orc
++++ b/src/pulsecore/svolume.orc
+@@ -45,13 +45,15 @@
+ 
+ .function pa_volume_s16ne_orc_1ch
+ .dest 2 samples int16_t
+-.param 4 v int32_t
++.param 4 vols int32_t
++.temp 4 v
+ .temp 2 vh
+ .temp 4 s
+ .temp 4 mh
+ .temp 4 ml
+ .temp 4 signc
+ 
++loadpl v, vols
+ convuwl s, samples
+ x2 cmpgtsw signc, 0, s
+ x2 andw signc, signc, v
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 897c4be..ddab397 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  8 14:17:45 CET 2015 - tiwai@suse.de
+
+- Fix broken volume setup with orc 0.4.23 (bsc#912260):
+  pulseaudio-orc-0.4.23-volume-fix.patch
+
 -------------------------------------------------------------------
 Thu Jan  1 21:13:30 UTC 2015 - meissner@suse.com
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 0f70cb5..7eea8ec 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -42,6 +42,8 @@ Source99:       baselibs.conf
 Patch0:         disabled-start.diff
 Patch1:         suppress-socket-error-msg.diff
 Patch2:         pulseaudio-wrong-memset.patch
+# PATCH-FIX-SUSE bnc#912260 regression fix for orc-0.4.23
+Patch3:         pulseaudio-orc-0.4.23-volume-fix.patch
 BuildRequires:  alsa-devel >= 1.0.19
 # require only minimal bluez, if we are on bluez 5 we will determine in %build phase
 BuildRequires:  bluez-devel >= 4.99
@@ -313,6 +315,7 @@ Optional dependency offering zsh completion for various PulseAudio utilities
 %patch0
 %patch1 -p1
 %patch2
+%patch3 -p1
 
 %build
 echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in