Re: pkg/46491: audio/cdparanoia doesn't build

[Francois Tigeot <ftigeot%wolfpond.org@localhost>]

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

From: Francois Tigeot <ftigeot%wolfpond.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: ftigeot%wolfpond.org@localhost
Subject: Re: pkg/46491: audio/cdparanoia doesn't build
Date: Mon, 28 May 2012 19:07:47 +0200

 --/04w6evG8XlLl3ft
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Mon, May 28, 2012 at 05:05:00PM +0000, gnats-admin%NetBSD.org@localhost 
wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `pkg/46491'.
 > The individual assigned to look at your
 > report is: pkg-manager. 
 > 
 > >Category:       pkg
 > >Responsible:    pkg-manager
 > >Synopsis:       audio/cdparanoia doesn't build
 > >Arrival-Date:   Mon May 28 17:05:00 +0000 2012
 
 New version of patch-ch
 
 
 -- 
 Francois Tigeot
 
 --/04w6evG8XlLl3ft
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch-ch
 
 $NetBSD$
 
 --- interface/cdda_interface.h.orig    2008-09-11 10:43:52.000000000 +0000
 +++ interface/cdda_interface.h
 @@ -18,9 +18,24 @@
  #endif
  #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4)
  
 +#if defined(__APPLE__) && defined(__MACH__)
 +#include <IOKit/IOKitLib.h>
 +#include <IOKit/storage/IOCDTypes.h>
 +#endif
 +
  #include <sys/types.h>
  #include <signal.h>
  
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#define CAM_NO_SCSI_INQUIRY
 +#include <stdio.h>
 +#include <camlib.h>
 +#endif
 +
 +#if defined(__NetBSD__) || (defined(__APPLE__) && defined(__MACH__))
 +#define ENOMEDIUM 12345
 +#endif
 +
  #define MAXTRK 100
  
  typedef struct TOC {  /* structure of table of contents */
 @@ -35,6 +50,7 @@ typedef struct TOC { /* structure of tab
  #define TEST_INTERFACE         2
  #define SGIO_SCSI      3
  #define SGIO_SCSI_BUGGY1 4
 +#define OSX_IOKIT        5
  
  #define CDDA_MESSAGE_FORGETIT 0
  #define CDDA_MESSAGE_PRINTIT 1
 @@ -49,13 +65,27 @@ typedef struct cdrom_drive{
    int opened; /* This struct may just represent a candidate for opening */
  
    char *cdda_device_name;
 +#if !defined(__FreeBSD__)
    char *ioctl_device_name;
  
    int cdda_fd;
 -  int ioctl_fd;
  
 -  char *drive_model;
    int drive_type;
 +#else
 +  struct cam_device *dev;
 +  union ccb *ccb;
 +#endif
 +
 +#if defined(__APPLE__) && defined(__MACH__)
 +  io_object_t io;
 +  int fd;
 +  char *dev;
 +  CDTOC *raw_toc;
 +  int descriptor_count;
 +#endif
 +
 +  int ioctl_fd;
 +  char *drive_model;
    int interface;
    int bigendianp;
    int nsectors;
 
 --/04w6evG8XlLl3ft--