From 4372089ff91c3a884f6845d07f2ac8a7f2e64429 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 12 Mar 2005 05:11:04 +0000 Subject: Don't try to send CDIOCCAPABILITY to an atapicam device. It doesn't work. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3922 df743ca5-7f9a-e211-a948-0013205c9059 --- .../files/patch-gnome-cd_gst-cdparanoia-cdrom.c | 25 ++++++++++++++++++++++ .../files/patch-gnome-cd_gst-cdparanoia-cdrom.c | 25 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c create mode 100644 audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c (limited to 'audio') diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c new file mode 100644 index 000000000..d2d5df9ad --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -0,0 +1,25 @@ +--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:10:19 2005 +@@ -1443,15 +1443,19 @@ + return FALSE; + } + ++#if defined(__FreeBSD__) ++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM ++ * device. */ ++ return TRUE; ++#endif ++ + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return FALSE; + } + + /* Fire a harmless ioctl at the device. */ +-#if defined(__FreeBSD__) +- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if (ioctl (fd, CDIOCGETVOL, 0) < 0) { + #else + if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c new file mode 100644 index 000000000..d2d5df9ad --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -0,0 +1,25 @@ +--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:10:19 2005 +@@ -1443,15 +1443,19 @@ + return FALSE; + } + ++#if defined(__FreeBSD__) ++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM ++ * device. */ ++ return TRUE; ++#endif ++ + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return FALSE; + } + + /* Fire a harmless ioctl at the device. */ +-#if defined(__FreeBSD__) +- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if (ioctl (fd, CDIOCGETVOL, 0) < 0) { + #else + if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { -- cgit v1.2.3