[pulseaudio] 01/03: Reformat patches for use with gbp-pq

[Felipe Sateler]

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

fsateler pushed a commit to branch master
in repository pulseaudio.

commit 63affcc82fcde31308c85fd22c356f8198732730
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Nov 4 19:03:49 2016 -0300

    Reformat patches for use with gbp-pq
---
 .../0001-Fix_detection_of_online_CPUs.patch        | 31 ------------------
 .../Fix-detection-of-online-CPUs-in-pa_ncpus.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/debian/patches/0001-Fix_detection_of_online_CPUs.patch b/debian/patches/0001-Fix_detection_of_online_CPUs.patch
deleted file mode 100644
index 6a4d8bd..0000000
--- a/debian/patches/0001-Fix_detection_of_online_CPUs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix detection of online CPUs in pa_ncpus()
- PulseAudio uses sysconf(_NC_PROCESSORS_CONF) in pulsecore/
- core-util.c:pa_ncpus() to determine the number of available
- CPUs on the system.
- .
- However, since the operating system may disable individual CPUs,
- the number of available CPUs may be smaller than _NC_PROCESSORS_CONF
- and pa_ncpus() will therefore report an incorrect number of CPUs.
- This makes the once-test fail on such systems like some of the
- sparc64 buildds.
- .
- Patching pa_ncpus() to use _NC_PROCESSORS_CONF fixes this problem
- and also results in once-test passing on the sparc64 buildds.
- .
- This has been reported upstream as:
- https://bugs.freedesktop.org/show_bug.cgi?id=96809
- .
-
---- pulseaudio-9.0.orig/src/pulsecore/core-util.c
-+++ pulseaudio-9.0/src/pulsecore/core-util.c
-@@ -3179,8 +3179,8 @@ void pa_reduce(unsigned *num, unsigned *
- unsigned pa_ncpus(void) {
-     long ncpus;
- 
--#ifdef _SC_NPROCESSORS_CONF
--    ncpus = sysconf(_SC_NPROCESSORS_CONF);
-+#ifdef _SC_NPROCESSORS_ONLN
-+    ncpus = sysconf(_SC_NPROCESSORS_ONLN);
- #else
-     ncpus = 1;
- #endif
diff --git a/debian/patches/Fix-detection-of-online-CPUs-in-pa_ncpus.patch b/debian/patches/Fix-detection-of-online-CPUs-in-pa_ncpus.patch
new file mode 100644
index 0000000..fbf5b5b
--- /dev/null
+++ b/debian/patches/Fix-detection-of-online-CPUs-in-pa_ncpus.patch
@@ -0,0 +1,38 @@
+From: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
+Date: Mon, 4 Jul 2016 23:11:29 +0200
+Subject: Fix detection of online CPUs in pa_ncpus()
+
+PulseAudio uses sysconf(_NC_PROCESSORS_CONF) in pulsecore/
+core-util.c:pa_ncpus() to determine the number of available
+CPUs on the system.
+
+However, since the operating system may disable individual CPUs,
+the number of available CPUs may be smaller than _NC_PROCESSORS_CONF
+and pa_ncpus() will therefore report an incorrect number of CPUs.
+This makes the once-test fail on such systems like some of the
+sparc64 buildds.
+
+Patching pa_ncpus() to use _NC_PROCESSORS_CONF fixes this problem
+and also results in once-test passing on the sparc64 buildds.
+
+This has been reported upstream as:
+https://bugs.freedesktop.org/show_bug.cgi?id=96809
+---
+ src/pulsecore/core-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
+index b6eb85a..b0a0cc6 100644
+--- a/src/pulsecore/core-util.c
++++ b/src/pulsecore/core-util.c
+@@ -3179,8 +3179,8 @@ void pa_reduce(unsigned *num, unsigned *den) {
+ unsigned pa_ncpus(void) {
+     long ncpus;
+ 
+-#ifdef _SC_NPROCESSORS_CONF
+-    ncpus = sysconf(_SC_NPROCESSORS_CONF);
++#ifdef _SC_NPROCESSORS_ONLN
++    ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+ #else
+     ncpus = 1;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 7fc3c94..34bd6a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Fix_detection_of_online_CPUs.patch
+Fix-detection-of-online-CPUs-in-pa_ncpus.patch

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