[SCM] ecasound/master: Drop handle_estrpipe patch (merged upstream)

[ghedo-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2028c3bd5b72c7eeb6547d18403e7e3915476758
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Tue May 24 16:03:01 2011 +0200

    Drop handle_estrpipe patch (merged upstream)

diff --git a/debian/patches/0006-handle_estrpipe.patch b/debian/patches/0006-handle_estrpipe.patch
deleted file mode 100644
index 6e1ca25..0000000
--- a/debian/patches/0006-handle_estrpipe.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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 5322a6f..5f85119 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-fix-manpages-errors.patch
 0004-build-shared-libecasoundc.patch
 0005-build-shared-libkvutils.patch
-0006-handle_estrpipe.patch
 1001-disable_python_tests.patch

-- 
ecasound packaging