From 0afc8907bb0d7742940551ae7228711a48c0cccf Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 12 Mar 2005 06:03:38 +0000 Subject: Don't pass O_NONBLOCK to open() when opening the CD-ROM device. And if that open fails, print a warning with the failure. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3924 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/gnome-media/files/patch-gnome-cd_cdrom.c | 17 +++++++++++++++++ audio/gnomemedia2/files/patch-gnome-cd_cdrom.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 audio/gnome-media/files/patch-gnome-cd_cdrom.c create mode 100644 audio/gnomemedia2/files/patch-gnome-cd_cdrom.c (limited to 'audio') diff --git a/audio/gnome-media/files/patch-gnome-cd_cdrom.c b/audio/gnome-media/files/patch-gnome-cd_cdrom.c new file mode 100644 index 000000000..65322e75f --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_cdrom.c @@ -0,0 +1,17 @@ +--- gnome-cd/cdrom.c.orig Sat Mar 12 01:00:51 2005 ++++ gnome-cd/cdrom.c Sat Mar 12 01:02:57 2005 +@@ -358,9 +358,14 @@ cdrom_open_dev (GnomeCDRom *cdrom, + { + if (cdrom->priv->open_count++ == 0) { + cdrom->fd = open ( ++#if defined(__FreeBSD__) ++ cdrom->priv->device, O_RDONLY); ++#else + cdrom->priv->device, O_RDONLY | O_NONBLOCK); ++#endif + + if (cdrom->fd < 0) { ++ g_warning ("XXX: Failed to open %s: %s", cdrom->priv->device, strerror(errno)); + if (errno == EACCES && error != NULL) { + *error = g_error_new ( + GNOME_CDROM_ERROR, diff --git a/audio/gnomemedia2/files/patch-gnome-cd_cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_cdrom.c new file mode 100644 index 000000000..65322e75f --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_cdrom.c @@ -0,0 +1,17 @@ +--- gnome-cd/cdrom.c.orig Sat Mar 12 01:00:51 2005 ++++ gnome-cd/cdrom.c Sat Mar 12 01:02:57 2005 +@@ -358,9 +358,14 @@ cdrom_open_dev (GnomeCDRom *cdrom, + { + if (cdrom->priv->open_count++ == 0) { + cdrom->fd = open ( ++#if defined(__FreeBSD__) ++ cdrom->priv->device, O_RDONLY); ++#else + cdrom->priv->device, O_RDONLY | O_NONBLOCK); ++#endif + + if (cdrom->fd < 0) { ++ g_warning ("XXX: Failed to open %s: %s", cdrom->priv->device, strerror(errno)); + if (errno == EACCES && error != NULL) { + *error = g_error_new ( + GNOME_CDROM_ERROR, -- cgit v1.2.3