diff options
Diffstat (limited to 'audio/cdparanoia/patches/patch-ch')
| -rw-r--r-- | audio/cdparanoia/patches/patch-ch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/audio/cdparanoia/patches/patch-ch b/audio/cdparanoia/patches/patch-ch index 8285daa0c7c..1f4ceb0c7c8 100644 --- a/audio/cdparanoia/patches/patch-ch +++ b/audio/cdparanoia/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $ +$NetBSD: patch-ch,v 1.6 2009/08/29 04:54:52 hasso Exp $ ---- interface/cdda_interface.h.orig 2008-09-11 12:43:52.000000000 +0200 -+++ interface/cdda_interface.h -@@ -18,9 +18,23 @@ +--- interface/cdda_interface.h.orig 2008-09-11 13:43:52 +0300 ++++ interface/cdda_interface.h 2009-08-28 11:50:44 +0300 +@@ -18,9 +18,24 @@ #endif #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4) @@ -15,6 +15,7 @@ $NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $ #include <signal.h> +#if defined(__FreeBSD__) || defined(__DragonFly__) ++#define CAM_NO_SCSI_INQUIRY +#include <stdio.h> +#include <camlib.h> +#endif @@ -26,7 +27,7 @@ $NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $ #define MAXTRK 100 typedef struct TOC { /* structure of table of contents */ -@@ -35,6 +49,7 @@ typedef struct TOC { /* structure of tab +@@ -35,6 +50,7 @@ typedef struct TOC { /* structure of tab #define TEST_INTERFACE 2 #define SGIO_SCSI 3 #define SGIO_SCSI_BUGGY1 4 @@ -34,11 +35,11 @@ $NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $ #define CDDA_MESSAGE_FORGETIT 0 #define CDDA_MESSAGE_PRINTIT 1 -@@ -49,13 +64,27 @@ typedef struct cdrom_drive{ +@@ -49,13 +65,27 @@ typedef struct cdrom_drive{ int opened; /* This struct may just represent a candidate for opening */ char *cdda_device_name; -+#if !defined(__FreeBSD__) && !defined(__DragonFly__) ++#if !defined(__FreeBSD__) char *ioctl_device_name; int cdda_fd; @@ -64,7 +65,7 @@ $NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $ int interface; int bigendianp; int nsectors; -@@ -84,7 +113,7 @@ typedef struct cdrom_drive{ +@@ -84,7 +114,7 @@ typedef struct cdrom_drive{ int is_atapi; int is_mmc; |