cleanup; patch if oss busy

6 files changed, 76 insertions, 2 deletions

diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1
deleted file mode 100644
index daf84ecd6c8c..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 753d7b6f4c1c997bd9a60bffcd716af6 gst-plugins-0.4.1.tar.gz 1848403
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r1
deleted file mode 100644
index d31363476a96..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2d499cf117408b5a4adc7a0d71eb095 gst-plugins-0.4.2.tar.gz 1937052
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r2
index d31363476a96..d31363476a96 100644
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2
+++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r2
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.5.0 b/media-libs/gst-plugins/files/digest-gst-plugins-0.5.0-r1
index f57ba4497379..f57ba4497379 100644
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.5.0
+++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.5.0-r1
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.4.2-never-return-on-oss-busy.patch b/media-libs/gst-plugins/files/gst-plugins-0.4.2-never-return-on-oss-busy.patch
new file mode 100644
index 000000000000..caca3019bb54
--- /dev/null
+++ b/media-libs/gst-plugins/files/gst-plugins-0.4.2-never-return-on-oss-busy.patch
@@ -0,0 +1,34 @@
+--- gst-plugins-0.4.2/sys/oss/gstosssink.c.orig	2002-12-27 18:37:40.000000000 +0200
++++ gst-plugins-0.4.2/sys/oss/gstosssink.c	2002-12-27 18:38:56.000000000 +0200
+@@ -886,11 +886,23 @@
+   GST_INFO (GST_CAT_PLUGIN_INFO, "osssink: attempting to open sound device");
+ 
+   /* first try to open the sound card */
++  /* FIXME: This code is dubious, why do we need to open and close this ?
++   *        For linux at least this causes the second open to never return
++   *        if the device was already in use .. */
+   sink->fd = open (sink->device, O_WRONLY | O_NONBLOCK);
+   if (errno == EBUSY) {
+     g_warning ("osssink: unable to open the sound device (in use ?)\n");
+     return FALSE;
+   }
++#ifdef __linux__
++  else if (sink->fd >= 0) {
++    /* remove the non-blocking flag */
++    if(fcntl (sink->fd, F_SETFL, 0) < 0) {
++      g_warning ("osssink: unable to make filedescriptor blocking\n");
++      return FALSE;
++    }
++  }
++#else
+ 
+   /* re-open the sound device in blocking mode */
+   close (sink->fd);
+@@ -900,6 +912,7 @@
+     g_warning ("osssink: unable to open the sound device (errno=%d)\n", errno); 
+     return FALSE;
+   }
++#endif
+ 	
+   /* we have it, set the default parameters and go have fun */
+   /* set card state */
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.5.0-never-return-on-oss-busy.patch b/media-libs/gst-plugins/files/gst-plugins-0.5.0-never-return-on-oss-busy.patch
new file mode 100644
index 000000000000..9ec6a5545651
--- /dev/null
+++ b/media-libs/gst-plugins/files/gst-plugins-0.5.0-never-return-on-oss-busy.patch
@@ -0,0 +1,42 @@
+--- gst-plugins-0.5.0/sys/oss/gstosscommon.c.orig	2002-12-27 08:58:32.000000000 +0200
++++ gst-plugins-0.5.0/sys/oss/gstosscommon.c	2002-12-27 09:01:44.000000000 +0200
+@@ -279,9 +279,23 @@
+   GST_INFO (GST_CAT_PLUGIN_INFO, "common: attempting to open sound device");
+ 
+   /* first try to open the sound card */
+-  /* FIXME: this code is dubious, why do we need to open and close this ?*/
++  /* FIXME: This code is dubious, why do we need to open and close this ?
++   *        For linux at least this causes the second open to never return
++   *        if the device was already in use .. */
++#ifndef __linux__
+   if (mode == GST_OSSCOMMON_WRITE) {
++#endif
+     common->fd = open (common->device, O_WRONLY | O_NONBLOCK);
++#ifdef __linux__
++	if (common->fd >= 0) {
++	  /* remove the non-blocking flag */
++	  if(fcntl (common->fd, F_SETFL, 0) < 0) {
++		*error = g_strdup_printf ("osscommon: Can't make filedescriptor blocking for %s",
++				   common->device);
++		return FALSE;
++	  }
++	}
++#else
+     if (errno == EBUSY) {
+       g_warning ("osscommon: unable to open the sound device (in use ?)\n");
+     }
+@@ -295,9 +309,14 @@
+   else {
+     common->fd = open (common->device, O_RDONLY);
+   }
++#endif
+ 
+   if (common->fd < 0) {
+     switch (errno) {
++	  case EBUSY:
++	*error = g_strdup_printf ("osscommon: Unable to open %s (in use ?)",
++			   common->device);
++	break;
+       case EISDIR:
+ 	*error = g_strdup_printf ("osscommon: Device %s is a directory",
+ 			   common->device);