diff options
Diffstat (limited to 'audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c')
| -rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c index fadbb049d0e2..dee1aa98903d 100644 --- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c +++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c @@ -1,9 +1,9 @@ ---- gnome-cd/gst-cdrom.c.orig Tue Dec 12 00:18:40 2006 -+++ gnome-cd/gst-cdrom.c Tue Dec 12 00:23:17 2006 -@@ -41,13 +41,17 @@ +--- gnome-cd/gst-cdrom.c.orig Mon Jan 22 09:01:38 2007 ++++ gnome-cd/gst-cdrom.c Mon Feb 12 15:59:18 2007 +@@ -44,13 +44,17 @@ #endif - #if defined(__FreeBSD__) + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY +# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL +struct ioc_vol vol_value; @@ -19,10 +19,10 @@ # define GST_CDROM_IOCTL_EJECT_REQUEST CDROMEJECT #endif -@@ -184,7 +188,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * - - fd = open (device, O_RDONLY | O_NONBLOCK); - if (fd >= 0) { +@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * + #ifdef __sun + res = TRUE; + #else - if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) { + if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) { res = TRUE; |