[pulseaudio] 01/02: Sync with wily archive

[David Henningsson]

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

diwic-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 3876227f06c5279ae4f53e1d87dd22cb6d060eee
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Sep 2 09:58:10 2015 +0200

    Sync with wily archive
---
 debian/changelog                                   | 25 +++++++++++++++++++
 .../0312-lfe-filter-test-Use-S16NE-format.patch    | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 --
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6e7e38..8d7b15d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+pulseaudio (1:6.0-0ubuntu10~gcc5.3) wily; urgency=medium
+
+  * debian/rules: don't disable bluez5
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Thu, 13 Aug 2015 17:34:42 +0200
+
+pulseaudio (1:6.0-0ubuntu10~gcc5.2) wily; urgency=medium
+
+  * No-change rebuild against libjack-jackd2-0v5
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Tue, 11 Aug 2015 07:01:56 +0000
+
+pulseaudio (1:6.0-0ubuntu10~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Wed, 15 Jul 2015 15:57:11 +0000
+
+pulseaudio (1:6.0-0ubuntu9) wily; urgency=medium
+
+  * 0312-lfe-filter-test-Use-S16NE-format.patch:
+    Fix build failure on powerpc
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 28 May 2015 11:02:48 +0200
+
 pulseaudio (1:6.0-0ubuntu8) wily; urgency=medium
 
   * 0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch:
diff --git a/debian/patches/0312-lfe-filter-test-Use-S16NE-format.patch b/debian/patches/0312-lfe-filter-test-Use-S16NE-format.patch
new file mode 100644
index 0000000..e22badb
--- /dev/null
+++ b/debian/patches/0312-lfe-filter-test-Use-S16NE-format.patch
@@ -0,0 +1,29 @@
+From c72c1df911ac6e5f6601aeb39a5e92a84c9d33c7 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Tue, 26 May 2015 08:47:46 +0200
+Subject: [PATCH] lfe-filter-test: Use S16NE format
+
+...otherwise this code will fail on big-endian architectures.
+
+Cc: Hui Wang <hui.wang at canonical.com>
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+ src/tests/lfe-filter-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/lfe-filter-test.c b/src/tests/lfe-filter-test.c
+index ea8108c..389a2b9 100644
+--- a/src/tests/lfe-filter-test.c
++++ b/src/tests/lfe-filter-test.c
+@@ -133,7 +133,7 @@ START_TEST (lfe_filter_test) {
+ 
+     a.channels = 1;
+     a.rate = 44100;
+-    a.format = PA_SAMPLE_S16LE;
++    a.format = PA_SAMPLE_S16NE;
+ 
+     lft.ss = &a;
+     pa_assert_se(lft.pool = pa_mempool_new(false, 0));
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 373b53c..29b8cdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@
 0309-resampler-Allow-disabling-the-LFE-filter-by-setting-.patch
 0310-resampler-Rename-lfe_filter_required-to-lfe_remixed.patch
 0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch
+0312-lfe-filter-test-Use-S16NE-format.patch
diff --git a/debian/rules b/debian/rules
index 831e9ac..763b9bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,8 +53,6 @@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \
   --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
   --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \
   --with-zsh-completion-dir=\$${datadir}/zsh/vendor-completions \
-  --disable-bluez5 \
-
 
 ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez

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