diff options
| author | Alexander Nedotsukov <bland@FreeBSD.org> | 2006-04-03 06:48:04 +0000 |
|---|---|---|
| committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2006-04-03 06:48:04 +0000 |
| commit | 335ea90ffbe4d326b6b730a64fbb45c3a0e1526d (patch) | |
| tree | 9d9597eff620679b44aa3250cf8cff8d8a5f104c /multimedia/freevo/files/patch-src-plugins-rom_drives.py | |
| parent | Add p5-Date-Japanese-Holiday 0.05, perl module for Calculate Japanese (diff) | |
- Workaround Python ioctl() wrapper deficiency different way so Freevo
do not attempts to read media every other second.
- Move pkg-message into files/pkg-message.in [1]
PR: 95226 [1]
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=158709
Diffstat (limited to 'multimedia/freevo/files/patch-src-plugins-rom_drives.py')
| -rw-r--r-- | multimedia/freevo/files/patch-src-plugins-rom_drives.py | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/multimedia/freevo/files/patch-src-plugins-rom_drives.py b/multimedia/freevo/files/patch-src-plugins-rom_drives.py index 9a8dae6bbf7c..2ac0b75496e8 100644 --- a/multimedia/freevo/files/patch-src-plugins-rom_drives.py +++ b/multimedia/freevo/files/patch-src-plugins-rom_drives.py @@ -1,23 +1,11 @@ ---- src/plugins/rom_drives.py.orig Sun Jan 23 20:40:19 2005 -+++ src/plugins/rom_drives.py Tue Sep 20 20:26:48 2005 -@@ -415,9 +415,19 @@ - data = array.array('c', '\000'*4096) - (address, length) = data.buffer_info() - buf = pack('BBHP', CD_MSF_FORMAT, 0, length, address) -- s = ioctl(fd, CDIOREADTOCENTRYS, buf) -+ #s = ioctl(fd, CDIOREADTOCENTRYS, buf) -+ -+ # Above s = ioctl(... doesn't seem to work. -+ # Instead let's try and read from the disc, if it -+ # succeeds then there must be a disc in the drive. -+ # Nasty but it seems to work... -+ fd2 = open(media.devicename, 'rb') -+ fd2.seek(32768) -+ fd2.read(1) -+ fd2.close() - s = CDS_DISC_OK - except: -+ fd2.close() - s = CDS_NO_DISC - else: - s = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) +--- src/plugins/rom_drives.py.orig Sun Oct 16 18:18:49 2005 ++++ src/plugins/rom_drives.py Sun Feb 26 17:59:30 2006 +@@ -70,7 +70,7 @@ + # FreeBSD ioctls - there is no CDROM.py... + CDIOCEJECT = 0x20006318 + CDIOCCLOSE = 0x2000631c +- CDIOREADTOCENTRYS = 0xc0086305 ++ CDIOREADTOCENTRYS = -1073192187 + CD_LBA_FORMAT = 1 + CD_MSF_FORMAT = 2 + CDS_NO_DISC = 1 |