Re: pkg/20549

[Sergey Svishchev <svs%ropnet.ru@localhost>]

The following reply was made to PR pkg/20549; it has been noted by GNATS.

From: Sergey Svishchev <svs%ropnet.ru@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/20549
Date: Sun, 19 Oct 2008 16:32:12 +0400

 Problems 1 and 2 are obsolete now, but 3rd is still valid -- there's a bug 
filed in MPlayer
 bugzilla (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=751) and here's the 
patch:
 
 --- stream/vcd_read_fbsd.h.orig        2007-10-07 19:49:26.000000000 +0000
 +++ stream/vcd_read_fbsd.h
 @@ -37,9 +37,8 @@ typedef struct mp_vcd_priv_st {
     vcd_tocentry entry;
   #ifdef VCD_NETBSD
     struct cd_toc_entry entry_data;
 -#else
 -  cdsector_t buf;
   #endif
 +  cdsector_t buf;
   } mp_vcd_priv_t;
   
   static inline void
 @@ -208,8 +207,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
     sc.cmd[9] = 1 << 4; // user data only
     sc.cmd[10] = 0;     // no subchannel
     sc.cmdlen = 12;
 -  sc.databuf = (caddr_t) mem;
 -  sc.datalen = 2328;
 +  sc.databuf = (caddr_t) vcd->buf.data;
 +  sc.datalen = VCD_SECTOR_DATA + 4;   // MMC-3 spec says there are 4 extra 
bytes
     sc.senselen = sizeof(sc.sense);
     sc.flags = SCCMD_READ;
     sc.timeout = 10000;
 @@ -226,9 +225,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
   #else
     if 
(pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
        != VCD_SECTOR_SIZE) return 0;  // EOF?
 +#endif
   
     memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
 -#endif
     vcd_inc_msf(vcd);
     return VCD_SECTOR_DATA;
   }
 
 -- 
 Sergey Svishchev