diff options
| -rw-r--r-- | audio/cdparanoia/Makefile | 4 | ||||
| -rw-r--r-- | audio/cdparanoia/files/patch-interface-cdda_interface.h | 15 | ||||
| -rw-r--r-- | audio/cdparanoia/files/patch-interface-scan_devices.c | 14 |
3 files changed, 14 insertions, 19 deletions
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile index 30d4e8db44fc..a23ebfd4ae52 100644 --- a/audio/cdparanoia/Makefile +++ b/audio/cdparanoia/Makefile @@ -7,13 +7,13 @@ PORTNAME= cdparanoia PORTVERSION= 3.9.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio sysutils MASTER_SITES= http://www.xiph.org/paranoia/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/} EXTRACT_SUFX= .src.tgz -MAINTAINER= corecode@corecode.ath.cx +MAINTAINER= markus@FreeBSD.org COMMENT= A CDDA extraction tool (also known as ripper) USE_GETOPT_LONG=yes diff --git a/audio/cdparanoia/files/patch-interface-cdda_interface.h b/audio/cdparanoia/files/patch-interface-cdda_interface.h index 6dc527af7ffa..cf44b717b52d 100644 --- a/audio/cdparanoia/files/patch-interface-cdda_interface.h +++ b/audio/cdparanoia/files/patch-interface-cdda_interface.h @@ -1,11 +1,5 @@ -Index: interface/cdda_interface.h -=================================================================== -RCS file: /home/cvs/cdparanoia/interface/cdda_interface.h,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- interface/cdda_interface.h 2003/01/05 09:46:26 1.1.1.1 -+++ interface/cdda_interface.h 2003/01/06 21:26:23 1.3 +--- interface/cdda_interface.h.orig Sat Mar 24 02:15:46 2001 ++++ interface/cdda_interface.h Thu Jan 5 22:27:11 2006 @@ -21,6 +21,11 @@ #include <sys/types.h> #include <signal.h> @@ -18,12 +12,11 @@ diff -u -r1.1.1.1 -r1.3 #define MAXTRK 100 typedef struct TOC { /* structure of table of contents */ -@@ -46,14 +51,20 @@ - +@@ -47,13 +52,19 @@ int opened; /* This struct may just represent a candidate for opening */ -+#ifdef Linux char *cdda_device_name; ++#ifdef Linux char *ioctl_device_name; int cdda_fd; diff --git a/audio/cdparanoia/files/patch-interface-scan_devices.c b/audio/cdparanoia/files/patch-interface-scan_devices.c index b35fb205cf9c..7cc9b3b7b5be 100644 --- a/audio/cdparanoia/files/patch-interface-scan_devices.c +++ b/audio/cdparanoia/files/patch-interface-scan_devices.c @@ -1,5 +1,5 @@ ---- interface/scan_devices.c.orig Sun Mar 25 21:44:01 2001 -+++ interface/scan_devices.c Fri Nov 7 17:47:38 2003 +--- interface/scan_devices.c.orig Mon Mar 26 07:44:01 2001 ++++ interface/scan_devices.c Thu Jan 5 22:27:44 2006 @@ -1,6 +1,8 @@ /****************************************************************** * CopyPolicy: GNU Public License 2 applies @@ -72,7 +72,7 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest, char **messages){ -@@ -275,6 +299,60 @@ +@@ -275,6 +299,61 @@ return(d); } @@ -109,6 +109,7 @@ + goto cdda_identify_cooked_fail; + } + ++ d->cdda_device_name = copystring(dev); + d->drive_model = copystring("Generic cooked ioctl CDROM"); + d->interface = COOKED_IOCTL; + d->bigendianp = -1; @@ -133,7 +134,7 @@ struct sg_id { long l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */ long l2; /* Unique id */ -@@ -390,6 +468,7 @@ +@@ -390,6 +469,7 @@ if(dev!=-1)close(dev); return(NULL); } @@ -141,7 +142,7 @@ void strscat(char *a,char *b,int n){ int i; -@@ -401,6 +480,7 @@ +@@ -401,6 +481,7 @@ strcat(a," "); } @@ -149,7 +150,7 @@ /* At this point, we're going to punt compatability before SG2, and allow only SG2 and SG3 */ static int verify_SG_version(cdrom_drive *d,int messagedest, -@@ -653,6 +733,88 @@ +@@ -653,6 +734,89 @@ if(g_fd!=-1)close(g_fd); return(NULL); } @@ -201,6 +202,7 @@ + goto cdda_identify_scsi_fail; + } + ++ d->cdda_device_name = copystring(devname); + d->ioctl_fd = -1; + d->bigendianp = -1; + d->nsectors = -1; |