sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 01:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- "Drive read speed selection now works correctly."

Browse source 
PR:		ports/63785
Submitted by:	Igor Pokrovsky <tiamat@comset.net>
Approved by:	maintainer
This commit is contained in:
Pav Lucistnik 2004-03-06 15:06:59 +00:00
parent b88044f7c0
commit f6e1c6e7b1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=103113
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/xmms-cdread/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= xmms-cdread PORTNAME= xmms-cdread
PORTVERSION= 0.14a PORTVERSION= 0.14a
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= ftp://ftp.stack.nl/pub/users/willem/ MASTER_SITES= ftp://ftp.stack.nl/pub/users/willem/

30
audio/xmms-cdread/files/patch-cdrombsd.h
View file

@ -1,14 +1,12 @@
--- cdrombsd.h.orig Sat Aug 18 15:09:10 2001 --- cdrombsd.h.orig Sat Aug 18 14:09:10 2001
+++ cdrombsd.h Thu Nov 20 19:24:05 2003 +++ cdrombsd.h Thu Mar 4 09:55:32 2004
@@ -5,15 +5,19 @@ @@ -5,15 +5,17 @@
#ifndef CDROMBSD_H #ifndef CDROMBSD_H
#define CDROMBSD_H #define CDROMBSD_H
#include <sys/param.h> #include <sys/param.h>
+#if __FreeBSD_version >= 501106
+#include <sys/cdrio.h> +#include <sys/cdrio.h>
+#ifndef CD_FRAMESIZE_RAW +#ifndef CD_FRAMESIZE_RAW
+#define CD_FRAMESIZE_RAW 2352 +#define CD_FRAMESIZE_RAW 2352
+#endif
+#endif +#endif
/*\ /*\
|*| FreeBSD (?) specific code |*| FreeBSD (?) specific code
@ -25,7 +23,25 @@
/*\ /*\
@@ -84,6 +88,16 @@ @@ -26,16 +28,14 @@
int fd;
fd = open(device, O_RDONLY|O_NONBLOCK);
if (fd < 0) return -1;
-#ifdef CDROM_SELECT_SPEED
if (!(*flags & FLAG_FAIL_SPD) &&
- (ioctl(fd, CDROM_SELECT_SPEED, cd_cfg.cdrom_speed) < 0)) {
+ (ioctl(fd, CDRIOCREADSPEED, &cd_cfg.cdrom_speed) < 0)) {
if (errno == ENOTTY) {
close(fd);
return -1;
}
*flags |= FLAG_FAIL_SPD;
}
-#endif
return fd;
}
@@ -84,6 +84,16 @@
|*| from device cdfd, at position lba |*| from device cdfd, at position lba
|*| Return number of successfully read frames, -1 on error. |*| Return number of successfully read frames, -1 on error.
\*/ \*/
@ -42,7 +58,7 @@
static int static int
cdrom_read_audio(int cdfd, int lba, char *buf, int btw) cdrom_read_audio(int cdfd, int lba, char *buf, int btw)
{ {
@@ -101,6 +115,7 @@ @@ -101,6 +111,7 @@
} while (--rtr >= 0); } while (--rtr >= 0);
return -1; return -1;
} }