From 5f2eaa837a7577279fd259092b9b3605fd341363 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 11 Jan 2003 09:15:00 +0000 Subject: Fix cooked ioctl bug ignoring the last track, add porter's copyright. Submitted by: corecode@corecode.ath.cx (maintainer) --- audio/cdparanoia/Makefile | 1 + .../files/patch-interface-cooked_interface.c | 10 +++++----- audio/cdparanoia/files/patch-version.h | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 audio/cdparanoia/files/patch-version.h diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile index 9fe60385f50d..6e28d28a219a 100644 --- a/audio/cdparanoia/Makefile +++ b/audio/cdparanoia/Makefile @@ -7,6 +7,7 @@ PORTNAME= cdparanoia PORTVERSION= 3.9.8 +PORTREVISION= 1 CATEGORIES= audio sysutils MASTER_SITES= http://www.xiph.org/paranoia/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/} diff --git a/audio/cdparanoia/files/patch-interface-cooked_interface.c b/audio/cdparanoia/files/patch-interface-cooked_interface.c index 38066a31b551..456505feaaa8 100644 --- a/audio/cdparanoia/files/patch-interface-cooked_interface.c +++ b/audio/cdparanoia/files/patch-interface-cooked_interface.c @@ -2,10 +2,10 @@ Index: interface/cooked_interface.c =================================================================== RCS file: /home/cvs/cdparanoia/interface/cooked_interface.c,v retrieving revision 1.1.1.1 -retrieving revision 1.7 -diff -u -r1.1.1.1 -r1.7 +retrieving revision 1.8 +diff -u -r1.1.1.1 -r1.8 --- interface/cooked_interface.c 2003/01/05 09:46:26 1.1.1.1 -+++ interface/cooked_interface.c 2003/01/07 00:49:01 1.7 ++++ interface/cooked_interface.c 2003/01/11 08:58:45 1.8 @@ -1,6 +1,8 @@ /****************************************************************** * CopyPolicy: GNU Public License 2 applies @@ -75,9 +75,9 @@ diff -u -r1.1.1.1 -r1.7 + d->disc_toc[i - hdr.starting_track].bTrack = entry.entry.track; + d->disc_toc[i - hdr.starting_track].dwStartSector = be32_to_cpu(entry.entry.addr.lba); + -+ d->cd_extra = FixupTOC(d, hdr.ending_track - hdr.starting_track + 1); ++ d->cd_extra = FixupTOC(d, hdr.ending_track - hdr.starting_track + 2); /* with TOC */ + -+ return hdr.ending_track - hdr.starting_track;; ++ return hdr.ending_track - hdr.starting_track + 1; +} + +static int diff --git a/audio/cdparanoia/files/patch-version.h b/audio/cdparanoia/files/patch-version.h new file mode 100644 index 000000000000..179759417811 --- /dev/null +++ b/audio/cdparanoia/files/patch-version.h @@ -0,0 +1,18 @@ +Index: version.h +=================================================================== +RCS file: /home/cvs/cdparanoia/version.h,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -r1.1.1.1 -r1.2 +--- version.h 2003/01/05 09:46:26 1.1.1.1 ++++ version.h 2003/01/07 00:49:01 1.2 +@@ -8,6 +8,8 @@ + + + #define VERSION "cdparanoia III release 9.8 (March 23, 2001)\n"\ +- "(C) 2001 Monty and Xiphophorus\n\n"\ ++ "(C) 2001 Monty and Xiphophorus\n"\ ++ "FreeBSD porting (c) 2003\n"\ ++ "\tSimon 'corecode' Schubert \n\n"\ + "Report bugs to paranoia@xiph.org\n"\ + "http://www.xiph.org/paranoia/\n" -- cgit v1.2.3