[pulseaudio] 03/04: Apply patches from upstream to fix test failures

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch enable-tests
in repository pulseaudio.

commit 187f7d542d499a92bb0740043c0ea069a1ad06ab
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Aug 5 10:31:31 2014 -0400

    Apply patches from upstream to fix test failures
---
 ...fix-mixing-of-s24-samples-stored-as-s32re.patch | 25 ++++++++++++++++++++++
 ...fix-pa_get_binary_name-on-debian-kfreebsd.patch | 18 ++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 45 insertions(+)

diff --git a/debian/patches/fix-mixing-of-s24-samples-stored-as-s32re.patch b/debian/patches/fix-mixing-of-s24-samples-stored-as-s32re.patch
new file mode 100644
index 0000000..31799ca
--- /dev/null
+++ b/debian/patches/fix-mixing-of-s24-samples-stored-as-s32re.patch
@@ -0,0 +1,25 @@
+Author: Peter Meerwald <pmeerw at pmeerw.net>
+Description: mix: Fix mixing of S24 samples stored as S32RE
+ pa_mix_s24_32re_c() should advance m->ptr by sizeof(int32_t)
+--- a/src/pulsecore/mix.c
++++ b/src/pulsecore/mix.c
+@@ -445,7 +445,7 @@ static void pa_mix_s24_32re_c(pa_mix_inf
+                 v = (v * cv) >> 16;
+                 sum += v;
+             }
+-            m->ptr = (uint8_t*) m->ptr + 3;
++            m->ptr = (uint8_t*) m->ptr + sizeof(int32_t);
+         }
+ 
+         sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
+--- a/src/tests/mix-test.c
++++ b/src/tests/mix-test.c
+@@ -126,7 +126,7 @@ static const uint32_t s24_32le_result[3]
+ static const uint32_t s24_32be_result[3][10] = {
+ { 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
+ { 0x00000000, 0x65e60000, 0xf1e50000, 0x73000000, 0x0ee60000, 0xb8e50000, 0xe6000000, 0xd7000000, 0xcc1c0000, 0xb31d0000 },
+-{ 0x00000000, 0xe5010200, 0x00036400, 0x0470e500, 0xf3000000, 0xe5010500, 0x0006ad00, 0x07f7e400, 0xe6010000, 0x00000800 },
++{ 0x00000000, 0x64e60100, 0x70e50100, 0xf3000000, 0xade50100, 0xf7e40100, 0xe6010000, 0xc7010000, 0xcc3c0000, 0xb33e0000 },
+ };
+ 
+ static void compare_block(const pa_sample_spec *ss, const pa_memchunk *chunk, int iter) {
diff --git a/debian/patches/fix-pa_get_binary_name-on-debian-kfreebsd.patch b/debian/patches/fix-pa_get_binary_name-on-debian-kfreebsd.patch
new file mode 100644
index 0000000..2213c2e
--- /dev/null
+++ b/debian/patches/fix-pa_get_binary_name-on-debian-kfreebsd.patch
@@ -0,0 +1,18 @@
+Author: Peter Meerwald pmeerw at pmeerw.net
+Description: util: Fix pa_get_binary_name() on	Debian/kFreeBSD
+ Debian GNU/kFreeBSD uses a FreeBSD kernel and GLIBC,
+ it #defines __FreeBSD_kernel__, but not __FreeBSD__ nor __linux__
+ Debian GNU/kFreeBSD does have a /proc/self/exe
+ .
+ FreeBSD #defines __FreeBSD__ and __FreeBSD_kernel__
+--- a/src/pulse/util.c
++++ b/src/pulse/util.c
+@@ -181,7 +181,7 @@ char *pa_get_binary_name(char *s, size_t
+     }
+ #endif
+ 
+-#ifdef __linux__
++#ifdef __linux__ || defined(__FreeBSD_kernel__)
+     {
+         char *rp;
+         /* This works on Linux only */
diff --git a/debian/patches/series b/debian/patches/series
index c7bbfa1..04c8b33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ only-autostart-kde-version.patch
 rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
 zsh-completion-Fix-completion-for-default-sink-sourc.patch
 gnu-kfreebsd.patch
+fix-pa_get_binary_name-on-debian-kfreebsd.patch
+fix-mixing-of-s24-samples-stored-as-s32re.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git