Add patch from drochner that fixes ripping on NetBSD-current/amd64.

Bump PKGREVISION.

3 files changed, 27 insertions, 21 deletions

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index d30b0582d84..8e2255cfb0c 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2009/08/14 15:51:05 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2009/09/10 19:14:46 wiz Exp $
 #
 
 DISTNAME=	cdparanoia-III-10.2
 PKGNAME=	cdparanoia-3.0.10.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/cdparanoia/
 EXTRACT_SUFX=	.src.tgz
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index 8e575314473..19737819342 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2009/08/29 23:04:55 wiz Exp $
+$NetBSD: distinfo,v 1.27 2009/09/10 19:14:46 wiz Exp $
 
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
@@ -15,7 +15,7 @@ SHA1 (patch-cc) = a2f78daf62ecae73ab3cc264f39b367dfa249129
 SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
 SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
 SHA1 (patch-cf) = 8d204272dace7bb1d3238e44f6ff152ab38f0930
-SHA1 (patch-cg) = cf33938b7d86e50ac291c1694524c4d534a34d7f
+SHA1 (patch-cg) = fd92ca2b999c4d25ddbe5abe5f384c5c83019624
 SHA1 (patch-ch) = 37c8e5e675ed8db8ae7768918bea28d509a0563c
 SHA1 (patch-ci) = 158b90844ca6a116f92ad88636928f154e06dd79
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
diff --git a/audio/cdparanoia/patches/patch-cg b/audio/cdparanoia/patches/patch-cg
index 3fcca5d311e..8e3a573dbf8 100644
--- a/audio/cdparanoia/patches/patch-cg
+++ b/audio/cdparanoia/patches/patch-cg
@@ -1,20 +1,26 @@
-$NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
+$NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
---- interface/scsi_interface.c.orig	2008-09-11 23:33:30 +0300
-+++ interface/scsi_interface.c	2009-08-28 12:14:21 +0300
-@@ -12,6 +12,11 @@
+--- interface/scsi_interface.c.orig	2008-09-11 20:33:30.000000000 +0000
++++ interface/scsi_interface.c	2009-09-10 12:02:02.000000000 +0000
+@@ -12,7 +12,16 @@
  #include "common_interface.h"
  #include "utils.h"
  #include <time.h>
+-static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
++#include <sys/ioctl.h>
 +
 +#ifdef __NetBSD__
 +#define SG_MAX_SENSE SENSEBUFLEN
++#define IOCTL_CMD unsigned long
++#else
++#define IOCTL_CMD int
 +#endif
 +
- static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
++static int timed_ioctl(cdrom_drive *d, int fd, IOCTL_CMD command, void *arg){
    struct timespec tv1;
    struct timespec tv2;
-@@ -36,6 +41,7 @@ static void tweak_SG_buffer(cdrom_drive 
+   int ret1=clock_gettime(d->private->clock,&tv1);
+@@ -36,6 +45,7 @@
    int table, reserved, cur, err;
    char buffer[256];
  
@@ -22,7 +28,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
    /* SG_SET_RESERVED_SIZE doesn't actually allocate or reserve anything.
     * what it _does_ do is give you an error if you ask for a value
     * larger than q->max_sectors (the length of the device's bio request
-@@ -54,6 +60,10 @@ static void tweak_SG_buffer(cdrom_drive 
+@@ -54,6 +64,10 @@
       implement working sg lists with SG_IO devices, so who knows... */
    if (ioctl(d->cdda_fd, SG_GET_SG_TABLESIZE, &table) < 0)
      table=1;
@@ -33,7 +39,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  
    sprintf(buffer,"\tDMA scatter/gather table entries: %d\n\t"
  	  "table entry size: %d bytes\n\t"
-@@ -93,6 +103,7 @@ static void tweak_SG_buffer(cdrom_drive 
+@@ -93,6 +107,7 @@
    cdmessage(d,buffer);
  }
  
@@ -41,7 +47,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  static void clear_garbage(cdrom_drive *d){
    fd_set fdset;
    struct timeval tv;
-@@ -123,6 +134,7 @@ static void clear_garbage(cdrom_drive *d
+@@ -123,6 +138,7 @@
      flag=1;
    }
  }
@@ -49,7 +55,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  
  static int check_sbp_error(const unsigned char status,
  			   const unsigned char *sbp) {
-@@ -172,6 +184,7 @@ static int check_sbp_error(const unsigne
+@@ -172,6 +188,7 @@
    return 0;
  }
  
@@ -57,7 +63,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  /* process a complete scsi command. */
  static int sg2_handle_scsi_cmd(cdrom_drive *d,
  			       unsigned char *cmd,
-@@ -356,7 +369,11 @@ static int sgio_handle_scsi_cmd(cdrom_dr
+@@ -356,7 +373,11 @@
    hdr.timeout = 50000;
    hdr.interface_id = 'S';
    hdr.dxferp =  d->private->sg_buffer;
@@ -69,7 +75,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  
    /* scary buffer fill hack */
    if(bytecheck && out_size>in_size)
-@@ -417,6 +434,71 @@ static int sgio_handle_scsi_cmd(cdrom_dr
+@@ -417,6 +438,71 @@
    errno = 0;
    return 0;
  }
@@ -141,7 +147,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  
  static int handle_scsi_cmd(cdrom_drive *d,
  			   unsigned char *cmd,
-@@ -427,9 +509,14 @@ static int handle_scsi_cmd(cdrom_drive *
+@@ -427,9 +513,14 @@
  			   int bytecheck,
  			   unsigned char *sense){
  
@@ -156,7 +162,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  
  }
  
-@@ -453,6 +540,7 @@ static int test_unit_ready(cdrom_drive *
+@@ -453,6 +544,7 @@
    return 1;
  }
  
@@ -164,7 +170,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  static void reset_scsi(cdrom_drive *d){
    int arg,tries=0;
    d->enable_cdda(d,0);
-@@ -471,6 +559,22 @@ static void reset_scsi(cdrom_drive *d){
+@@ -471,6 +563,22 @@
    
    d->enable_cdda(d,1);
  }
@@ -187,7 +193,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  
  static int mode_sense_atapi(cdrom_drive *d,int size,int page){ 
    unsigned char sense[SG_MAX_SENSE];
-@@ -1587,6 +1691,7 @@ static void check_cache(cdrom_drive *d){
+@@ -1587,6 +1695,7 @@
    }
  }
  
@@ -195,7 +201,7 @@ $NetBSD: patch-cg,v 1.11 2009/08/29 04:54:52 hasso Exp $
  static int check_atapi(cdrom_drive *d){
    int atapiret=-1;
    int fd = d->cdda_fd; /* check the device we'll actually be using to read */
-@@ -1616,7 +1721,32 @@ static int check_atapi(cdrom_drive *d){
+@@ -1616,7 +1725,32 @@
  
      return(d->is_atapi);
    }