[pulseaudio] 04/06: Add patch to disable srbchannel tests when eventfd is not available

[Luke Yelavich]

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

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

commit db520d8b1fbe23ca982c0ce5d1b05bc69eb8fb26
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Dec 3 23:56:49 2014 -0300

    Add patch to disable srbchannel tests when eventfd is not available
    
    Conflicts:
    	debian/changelog
    	debian/patches/series
---
 debian/changelog                                   |  1 +
 .../disable-srbchannel-test-non-linux.patch        | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 717aafa..fe3d059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ pulseaudio (1:5.99.1-0ubuntu1~vivid2) UNRELEASED; urgency=medium
   * Bash completion script has moved, add mv_conffile snippet
   * Exclude libpulsecommon from dh_makeshlibs
   * Bump standards version (no changes)
+  * Add patch to disable srbchannel tests when eventfd is not available
 
  -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
 
diff --git a/debian/patches/disable-srbchannel-test-non-linux.patch b/debian/patches/disable-srbchannel-test-non-linux.patch
new file mode 100644
index 0000000..f64b2a3
--- /dev/null
+++ b/debian/patches/disable-srbchannel-test-non-linux.patch
@@ -0,0 +1,49 @@
+From: David Henningsson <david.henningsson at canonical.com>
+To: pulseaudio-discuss at lists.freedesktop.org
+Cc: fsateler at debian.org,
+	David Henningsson <david.henningsson at canonical.com>
+Subject: [PATCH] build-sys: Don't build srbchannel-test on targets without srbchannel
+Date: Tue,  2 Dec 2014 09:31:11 +0100
+Message-Id: <1417509071-9050-1-git-send-email-david.henningsson at canonical.com>
+X-Mailer: git-send-email 1.9.1
+
+Reported-by: Felipe Sateler <fsateler at debian.org>
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+
+So, I prefer having skipping the srbchannel test instead of having a succeding one
+in case there is no srbchannel functionality. Felipe, does this patch your issue?
+
+ configure.ac    | 1 +
+ src/Makefile.am | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -449,6 +449,7 @@ AC_CHECK_HEADERS_ONCE([execinfo.h])
+ AC_CHECK_HEADERS_ONCE([langinfo.h])
+ AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h])
+ 
++AM_CONDITIONAL(HAVE_SYS_EVENTFD_H, test "x$ac_cv_header_sys_eventfd_h" = "xyes")
+ 
+ #### Typdefs, structures, etc. ####
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -288,11 +288,15 @@ TESTS_daemon = \
+ 
+ if !OS_IS_WIN32
+ TESTS_default += \
+-		srbchannel-test \
+ 		sigbus-test \
+ 		usergroup-test
+ endif
+ 
++if HAVE_SYS_EVENTFD_H
++TESTS_default += \
++		srbchannel-test
++endif
++
+ if !OS_IS_DARWIN
+ TESTS_default += \
+ 		once-test
diff --git a/debian/patches/series b/debian/patches/series
index 20f93ea..e991671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # Debian patches
 gnu-kfreebsd.patch
+disable-srbchannel-test-non-linux.patch
 
 # Ubuntu/Debian specific config/fixes
 0005-dont-load-cork-music-on-phone.patch

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