summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-10-20 12:08:03 +0000
committergrant <grant@pkgsrc.org>2003-10-20 12:08:03 +0000
commit151c445d3be60d218231ed6c103eca2fc7b3905c (patch)
tree348e090750e0844ecde85a61cc2c6d4a1913bdeb /audio
parent5fac19942a120b5b38e6e59910a2fd399254a170 (diff)
downloadpkgsrc-151c445d3be60d218231ed6c103eca2fc7b3905c.tar.gz
files missed in last commit
Diffstat (limited to 'audio')
-rw-r--r--audio/cdparanoia/patches/patch-ch53
-rw-r--r--audio/cdparanoia/patches/patch-ci32
2 files changed, 85 insertions, 0 deletions
diff --git a/audio/cdparanoia/patches/patch-ch b/audio/cdparanoia/patches/patch-ch
new file mode 100644
index 00000000000..d96177e9554
--- /dev/null
+++ b/audio/cdparanoia/patches/patch-ch
@@ -0,0 +1,53 @@
+$NetBSD: patch-ch,v 1.1 2003/10/20 12:08:03 grant Exp $
+
+--- interface/cdda_interface.h.orig 2001-03-24 12:15:46.000000000 +1100
++++ interface/cdda_interface.h
+@@ -21,6 +21,11 @@
+ #include <sys/types.h>
+ #include <signal.h>
+
++#ifdef __FreeBSD__
++#include <stdio.h>
++#include <camlib.h>
++#endif
++
+ #define MAXTRK 100
+
+ typedef struct TOC { /* structure of table of contents */
+@@ -46,14 +51,20 @@ typedef struct cdrom_drive{
+
+ int opened; /* This struct may just represent a candidate for opening */
+
++#ifndef __FreeBSD__
+ char *cdda_device_name;
+ 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
++
++ int ioctl_fd;
++ char *drive_model;
+ int interface;
+ int bigendianp;
+ int nsectors;
+@@ -83,9 +94,13 @@ typedef struct cdrom_drive{
+ int is_mmc;
+
+ /* SCSI command buffer and offset pointers */
++#ifndef __FreeBSD__
+ unsigned char *sg;
+ unsigned char *sg_buffer;
+ unsigned char inqbytes[4];
++#else
++ unsigned char *sg_buffer;
++#endif
+
+ /* Scsi parameters and state */
+ unsigned char density;
diff --git a/audio/cdparanoia/patches/patch-ci b/audio/cdparanoia/patches/patch-ci
new file mode 100644
index 00000000000..bb3440f3c7e
--- /dev/null
+++ b/audio/cdparanoia/patches/patch-ci
@@ -0,0 +1,32 @@
+$NetBSD: patch-ci,v 1.1 2003/10/20 12:08:03 grant Exp $
+
+--- interface/interface.c.orig 2000-04-20 08:41:04.000000000 +1000
++++ interface/interface.c
+@@ -29,13 +29,26 @@ int cdda_close(cdrom_drive *d){
+ d->enable_cdda(d,0);
+
+ _clean_messages(d);
++#ifndef __FreeBSD__
+ if(d->cdda_device_name)free(d->cdda_device_name);
+ if(d->ioctl_device_name)free(d->ioctl_device_name);
+ if(d->drive_model)free(d->drive_model);
+ if(d->cdda_fd!=-1)close(d->cdda_fd);
+ if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
+ if(d->sg)free(d->sg);
+-
++#else
++ if(d->drive_model)
++ free(d->drive_model);
++ if(d->ccb)
++ cam_freeccb(d->ccb);
++ if(d->dev)
++ cam_close_device(d->dev);
++ if(d->sg_buffer)
++ free(d->sg_buffer);
++ if(d->ioctl_fd != -1)
++ close(d->ioctl_fd);
++#endif
++
+ free(d);
+ }
+ return(0);