summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-12 13:11:04 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-12 13:11:04 +0800
commit4372089ff91c3a884f6845d07f2ac8a7f2e64429 (patch)
treea10941effd1b04ba11816b5796f1bc1ef7439376
parent1c00e65d2eef416697c86d876b38b1c315627398 (diff)
downloadmarcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.tar
marcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.tar.gz
marcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.tar.bz2
marcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.tar.lz
marcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.tar.xz
marcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.tar.zst
marcuscom-ports-4372089ff91c3a884f6845d07f2ac8a7f2e64429.zip
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
-rw-r--r--audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c25
-rw-r--r--audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c25
2 files changed, 50 insertions, 0 deletions
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) {