[SCM] ecasound/master: ESTRPIPE is not defined on kfreebsd, get around FTBFS on those architectures (Closes: #627192).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b87856addfe49c00c95ff48212b9cd2b65551996
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 18 17:38:11 2011 +0200

    ESTRPIPE is not defined on kfreebsd, get around FTBFS on those architectures (Closes: #627192).

diff --git a/debian/patches/0006-handle_estrpipe.patch b/debian/patches/0006-handle_estrpipe.patch
new file mode 100644
index 0000000..6e1ca25
--- /dev/null
+++ b/debian/patches/0006-handle_estrpipe.patch
@@ -0,0 +1,57 @@
+Description: ESTRPIPE is not defined in kfreebsd, try to get around FTBFS.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ libecasound/plugins/audioio_alsa.cpp |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- ecasound.orig/libecasound/plugins/audioio_alsa.cpp
++++ ecasound/libecasound/plugins/audioio_alsa.cpp
+@@ -423,7 +423,11 @@ long int AUDIO_IO_ALSA_PCM::read_samples
+     if (realsamples < 0) {
+       /* Note! ALSA versions <=0.9.1 sometimes return -EIO in xrun-state;
+        *       EPIPE=xrun, ESTRPIPE=xrun) */
++#ifdef ESTRPIPE
+       if (realsamples == -EPIPE || realsamples == -ESTRPIPE || realsamples == -EIO) {
++#else
++      if (realsamples == -EPIPE || realsamples == -EIO) {
++#endif
+ 	if (ignore_xruns() == true) {
+ 	  handle_xrun_capture();
+ 	  realsamples = snd_pcm_readi(audio_fd_repp, target_buffer,
+@@ -453,7 +457,11 @@ long int AUDIO_IO_ALSA_PCM::read_samples
+     if (realsamples < 0) {
+       /* Note! ALSA versions <=0.9.1 sometimes return -EIO in xrun-state;
+        *       EPIPE=xrun, ESTRPIPE=xrun) */
++#ifdef ESTRPIPE
+       if (realsamples == -EPIPE || realsamples == -ESTRPIPE || realsamples == -EIO) {
++#else
++      if (realsamples == -EPIPE || realsamples == -EIO) {
++#endif
+ 	if (ignore_xruns() == true) {
+ 	  handle_xrun_capture();
+ 	  realsamples = snd_pcm_readn(audio_fd_repp, reinterpret_cast<void**>(target_buffer), buffersize());
+@@ -529,7 +537,11 @@ void AUDIO_IO_ALSA_PCM::write_samples(vo
+       /* Note! ALSA versions <=0.9.1 sometimes return -EIO in xrun-state;
+        *       EPIPE=xrun, ESTRPIPE=xrun) */
+       DBC_CHECK(count != -EINTR);
++#ifdef ESTRPIPE
+       if (count == -EPIPE || count == -EIO || count == -ESTRPIPE) {
++#else
++      if (count == -EPIPE || count == -EIO) {
++#endif
+ 	if (ignore_xruns() == true) {
+ 	  handle_xrun_playback();
+ 	  if (snd_pcm_writei(audio_fd_repp, target_buffer, samples) < 0) 
+@@ -564,7 +576,11 @@ void AUDIO_IO_ALSA_PCM::write_samples(vo
+       /* Note! ALSA versions <=0.9.1 sometimes return -EIO in xrun-state;
+        *       EPIPE=xrun, ESTRPIPE=xrun) */
+       DBC_CHECK(count != -EINTR);
++#ifdef ESTRPIPE
+       if (count == -EPIPE || count == -EIO || count == -ESTRPIPE) {
++#else
++      if (count == -EPIPE || count == -EIO) {
++#endif
+ 	if (ignore_xruns() == true) {
+ 	  handle_xrun_playback();
+ 	  snd_pcm_writen(audio_fd_repp,
diff --git a/debian/patches/series b/debian/patches/series
index 9f387e8..d351eab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0003-build-shared-libecasound.patch
 0004-build-shared-libecasoundc.patch
 0005-build-shared-libkvutils.patch
+0006-handle_estrpipe.patch

-- 
ecasound packaging