951c257ea3
releases in that it focuses more on stability and functionality than on new features. Not that it doesn't have its share of new and exciting items. See http://www.gnome.org/start/2.18/ for all the goodies in this release. GNOME 2.18 for FreeBSD would not have been possible without the hard work of the FreeBSD GNOME Team and our intrepid band of testers including J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi, Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen, Phillip Neumann, Franz Klammer, and Neal Delmonico.
30 lines
1.2 KiB
C
30 lines
1.2 KiB
C
--- 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__) || defined(__FreeBSD_kernel__)
|
|
-# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY
|
|
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL
|
|
+struct ioc_vol vol_value;
|
|
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR &vol_value
|
|
# define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT
|
|
#elif defined(__NetBSD__) || defined(__OpenBSD__)
|
|
# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL
|
|
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0
|
|
# define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT
|
|
#else
|
|
# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDROM_GET_CAPABILITY
|
|
+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0
|
|
# define GST_CDROM_IOCTL_EJECT_REQUEST CDROMEJECT
|
|
#endif
|
|
|
|
@@ -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;
|
|
} else {
|
|
GST_DEBUG ("ioctl() failed: %s", g_strerror (errno));
|