[SCM] pulseaudio packaging branch, master, updated. debian/4.0-5-2-gafadf03

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  afadf03e9fe6e3a5963f2f4f51c1f6c0f248f3e5 (commit)
       via  ed059548c06576d30ff24ec1e257fee439f7ade8 (commit)
      from  ba9cd76ec9219370cf73fd9fee15185d3145c8e7 (commit)


- Shortlog ------------------------------------------------------------
afadf03 Target unstable
ed05954 debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch

Summary of changes:
 debian/changelog                                   |    8 ++++
 ...ARM-NEON-check-in-configure.ac-more-stric.patch |   48 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 57 insertions(+)
-----------------------------------------------------------------------
Details of changes:

commit afadf03e9fe6e3a5963f2f4f51c1f6c0f248f3e5
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jul 21 11:36:53 2013 +0200

    Target unstable

diff --git a/debian/changelog b/debian/changelog
index 2ac3042..058c06e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-pulseaudio (4.0-6) UNRELEASED; urgency=low
+pulseaudio (4.0-6) unstable; urgency=low
 
   * debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch
     + Added. Be more strict about the neon compiler flag ordering, fixes FBTS
       on ARM (Closes: #717444) (From upstream git)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 21 Jul 2013 11:32:36 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 21 Jul 2013 11:36:41 +0200
 
 pulseaudio (4.0-5) unstable; urgency=low
 

commit ed059548c06576d30ff24ec1e257fee439f7ade8
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jul 21 11:35:51 2013 +0200

    debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch
    
    * debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch
      + Added. Be more strict about the neon compiler flag ordering
        (Closes: #717444) (From upstream git)

diff --git a/debian/changelog b/debian/changelog
index 2520037..2ac3042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pulseaudio (4.0-6) UNRELEASED; urgency=low
+
+  * debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch
+    + Added. Be more strict about the neon compiler flag ordering, fixes FBTS
+      on ARM (Closes: #717444) (From upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 21 Jul 2013 11:32:36 +0200
+
 pulseaudio (4.0-5) unstable; urgency=low
 
   * Add lintian overrides for rpaths in the modules to private pulseaudio
diff --git a/debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch b/debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch
new file mode 100644
index 0000000..7b3c68a
--- /dev/null
+++ b/debian/patches/build-make-ARM-NEON-check-in-configure.ac-more-stric.patch
@@ -0,0 +1,48 @@
+From 0af05213be59e54934c79d7be77b5d2dfb6fe6e7 Mon Sep 17 00:00:00 2001
+From: Peter Meerwald <p.meerwald at bct-electronic.com>
+Date: Thu, 28 Mar 2013 14:46:48 +0100
+Subject: [PATCH] build: make ARM NEON check in configure.ac more strict
+
+the check for NEON so far only checked if -mfpu=neon is understood by the compiler,
+however, this is not enough:
+
+(i) #include <arm_neon.h> should be checked
+(ii) -mfpu=neon must be passed before CFLAGS because eventually the per-library CFLAGS
+for NEON code in src/Makefile.am are passed to the compiler before the global CFLAGS
+
+in case the build environment passes CFLAGS to configure and we try to set conflicting
+CFLAGS option, the former take precedence; CFLAGS cannot be overridden
+
+this does not fix
+http://lists.freedesktop.org/archives/pulseaudio-discuss/2012-December/015570.html
+but at least makes the build fail in configure (and not while compiling stuff)
+and gives better diagnostics
+
+Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -318,9 +318,9 @@
+     AS_HELP_STRING([--enable-neon-opt], [Enable NEON optimisations on ARM CPUs that support it]))
+ 
+ AS_IF([test "x$enable_neon_opt" != "xno"],
+-    [save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -mfpu=neon"
++    [save_CFLAGS="$CFLAGS"; CFLAGS="-mfpu=neon $CFLAGS"
+      AC_COMPILE_IFELSE(
+-        AC_LANG_PROGRAM([], []),
++        AC_LANG_PROGRAM([[#include <arm_neon.h>]], []),
+         [
+          HAVE_NEON=1
+          NEON_CFLAGS="-mfpu=neon"
+@@ -334,7 +334,7 @@
+     [HAVE_NEON=0])
+ 
+ AS_IF([test "x$enable_neon_opt" = "xyes" && test "x$HAVE_NEON" = "x0"],
+-      [AC_MSG_ERROR([*** Compiler does not support -mfpu=neon])])
++      [AC_MSG_ERROR([*** Compiler does not support -mfpu=neon or CFLAGS override -mfpu])])
+ 
+ AC_SUBST(HAVE_NEON)
+ AC_SUBST(NEON_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 86cb37e..e4cbb58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
 kfreebsd_no_lock_and_threads_synchro.patch
+build-make-ARM-NEON-check-in-configure.ac-more-stric.patch

-- 
pulseaudio packaging