diff options
Diffstat (limited to 'audio/cd-discid/patches/patch-aa')
| -rw-r--r-- | audio/cd-discid/patches/patch-aa | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/audio/cd-discid/patches/patch-aa b/audio/cd-discid/patches/patch-aa index 04e00f5ccb0..a5a08e9c2fe 100644 --- a/audio/cd-discid/patches/patch-aa +++ b/audio/cd-discid/patches/patch-aa @@ -1,20 +1,29 @@ -$NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $ +$NetBSD: patch-aa,v 1.3 2013/01/22 10:42:06 jperkin Exp $ - Add support for DragonFly -- Fix output on OSX +- Fix output on OSX, and use raw disk device. ---- cd-discid.c.orig 2003-12-15 23:55:00.000000000 +0000 -+++ cd-discid.c 2013-01-21 22:20:21.000000000 +0000 -@@ -37,7 +37,7 @@ - * to compile on Solaris */ - #define cdte_track_address cdte_addr.lba +--- cd-discid.c.orig 2013-01-22 10:30:56.000000000 +0000 ++++ cd-discid.c 2013-01-22 10:34:05.000000000 +0000 +@@ -50,7 +50,7 @@ + /* __FreeBSD_kernel__ is needed for properly compiling on Debian GNU/kFreeBSD + Look at http://glibc-bsd.alioth.debian.org/porting/PORTING for more info */ --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <sys/cdio.h> #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */ -@@ -194,7 +194,7 @@ +@@ -100,7 +100,7 @@ + #define cdth_trk1 lastTrackNumberInLastSessionLSB + #define cdrom_tocentry CDTrackInfo + #define cdte_track_address trackStartAddress +-#define DEVICE_NAME "/dev/disk1" ++#define DEVICE_NAME "/dev/rdisk1" + + #else + # error "Your OS isn't supported yet." +@@ -221,7 +221,7 @@ * TocEntry[last-1].lastRecordedAddress + 1, so we compute the start * of leadout from the start+length of the last track instead */ @@ -23,7 +32,7 @@ $NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $ #else /* FreeBSD, Linux, Solaris */ for (i=0; i < last; i++) { /* tracks start with 1, but I must start with 0 on OpenBSD */ -@@ -214,12 +214,12 @@ +@@ -241,12 +241,12 @@ } #endif |