[pulseaudio] 01/02: Fix gnu-kfreebsd.patch typo (missing !)

[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 4fafcca0c9fec929f0d7eae2c44475c65ec27147
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Aug 4 20:01:50 2014 -0400

    Fix gnu-kfreebsd.patch typo (missing !)
---
 debian/changelog                  |  6 ++++++
 debian/patches/gnu-kfreebsd.patch | 24 +++++-------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6807bf7..cedb39a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (5.0-6) UNRELEASED; urgency=medium
+
+  * Fix gnu-kfreebsd.patch typo (missing !)
+
+ -- Felipe Sateler <fsateler at debian.org>  Mon, 04 Aug 2014 19:45:28 -0400
+
 pulseaudio (5.0-5) unstable; urgency=medium
 
   * Fix #defines for Debian GNU/kFreeBSD. Closes: #756914
diff --git a/debian/patches/gnu-kfreebsd.patch b/debian/patches/gnu-kfreebsd.patch
index 07f7265..37c2cee 100644
--- a/debian/patches/gnu-kfreebsd.patch
+++ b/debian/patches/gnu-kfreebsd.patch
@@ -10,8 +10,6 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
     Use the alternative when the functionality tested is for kernel
     features, and keep the __FreeBSD__ one when using freebsd libc headers.
 
-diff --git a/src/daemon/caps.c b/src/daemon/caps.c
-index 669d6e2..5477401 100644
 --- a/src/daemon/caps.c
 +++ b/src/daemon/caps.c
 @@ -86,7 +86,7 @@ void pa_drop_caps(void) {
@@ -23,11 +21,9 @@ index 669d6e2..5477401 100644
      /* FreeBSD doesn't have this functionality, even though sys/capability.h is
       * available. See https://bugs.freedesktop.org/show_bug.cgi?id=73967 */
  #else
-diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
-index 419783d..bcc0bb3 100644
 --- a/src/pulsecore/atomic.h
 +++ b/src/pulsecore/atomic.h
-@@ -180,7 +180,7 @@ static inline bool pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void*
+@@ -180,7 +180,7 @@ static inline bool pa_atomic_ptr_cmpxchg
      return r == old_p;
  }
  
@@ -36,8 +32,6 @@ index 419783d..bcc0bb3 100644
  
  #include <sys/cdefs.h>
  #include <sys/types.h>
-diff --git a/src/pulsecore/sconv_sse.c b/src/pulsecore/sconv_sse.c
-index 10943ba..ff8ad94 100644
 --- a/src/pulsecore/sconv_sse.c
 +++ b/src/pulsecore/sconv_sse.c
 @@ -33,7 +33,7 @@
@@ -49,17 +43,15 @@ index 10943ba..ff8ad94 100644
  
  static const PA_DECLARE_ALIGNED (16, float, scale[4]) = { 0x8000, 0x8000, 0x8000, 0x8000 };
  
-@@ -163,7 +163,7 @@ static void pa_sconv_s16le_from_f32ne_sse2(unsigned n, const float *a, int16_t *
+@@ -163,7 +163,7 @@ static void pa_sconv_s16le_from_f32ne_ss
  #endif /* defined (__i386__) || defined (__amd64__) */
  
  void pa_convert_func_init_sse(pa_cpu_x86_flag_t flags) {
 -#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
++#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__)
  
      if (flags & PA_CPU_X86_SSE2) {
          pa_log_info("Initialising SSE2 optimized conversions.");
-diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
-index 279af8a..411e62c 100644
 --- a/src/pulsecore/svolume_mmx.c
 +++ b/src/pulsecore/svolume_mmx.c
 @@ -34,7 +34,7 @@
@@ -71,7 +63,7 @@ index 279af8a..411e62c 100644
  /* in s: 2 int16_t samples
   * in v: 2 int32_t volumes, fixed point 16:16
   * out s: contains scaled and clamped int16_t samples.
-@@ -240,15 +240,15 @@ static void pa_volume_s16re_mmx(int16_t *samples, const int32_t *volumes, unsign
+@@ -240,15 +240,15 @@ static void pa_volume_s16re_mmx(int16_t
      );
  }
  
@@ -90,8 +82,6 @@ index 279af8a..411e62c 100644
 -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
 +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
  }
-diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
-index eafa92c..abd8fa5 100644
 --- a/src/pulsecore/svolume_sse.c
 +++ b/src/pulsecore/svolume_sse.c
 @@ -34,7 +34,7 @@
@@ -103,7 +93,7 @@ index eafa92c..abd8fa5 100644
  
  #define VOLUME_32x16(s,v)                  /* .. |   vh  |   vl  | */                   \
        " pxor %%xmm4, %%xmm4          \n\t" /* .. |    0  |    0  | */                   \
-@@ -251,15 +251,15 @@ static void pa_volume_s16re_sse2(int16_t *samples, const int32_t *volumes, unsig
+@@ -251,15 +251,15 @@ static void pa_volume_s16re_sse2(int16_t
      );
  }
  
@@ -122,8 +112,6 @@ index eafa92c..abd8fa5 100644
 -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
 +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
  }
-diff --git a/src/tests/once-test.c b/src/tests/once-test.c
-index 8b0009a..5744eca 100644
 --- a/src/tests/once-test.c
 +++ b/src/tests/once-test.c
 @@ -24,8 +24,10 @@
@@ -147,8 +135,6 @@ index 8b0009a..5744eca 100644
      cpuset_t mask;
  #else
      cpu_set_t mask;
-diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c
-index ed567c1..8096ada 100644
 --- a/src/tests/rtstutter.c
 +++ b/src/tests/rtstutter.c
 @@ -31,8 +31,10 @@

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