[pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 Fix off-by-one errors which ...

[mycroft <mycroft%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8728fdc3f27
branches:  trunk
changeset: 481710:e8728fdc3f27
user:      mycroft <mycroft%pkgsrc.org@localhost>
date:      Sun Oct 10 19:50:23 2004 +0000

description:
Fix off-by-one errors which were causing the chunk sizes in .wav files
produced by kaudiocreator to be one sector too short, which in turn caused
flac to barf on the "garbage" at the end.  Now kaudiocreator can actually
read and encode an entire CD.

diffstat:

 multimedia/kdemultimedia3/distinfo         |   3 ++-
 multimedia/kdemultimedia3/patches/patch-cu |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r dd9156245c9c -r e8728fdc3f27 multimedia/kdemultimedia3/distinfo
--- a/multimedia/kdemultimedia3/distinfo        Sun Oct 10 18:26:00 2004 +0000
+++ b/multimedia/kdemultimedia3/distinfo        Sun Oct 10 19:50:23 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/08/21 14:44:47 markd Exp $
+$NetBSD: distinfo,v 1.8 2004/10/10 19:50:23 mycroft Exp $
 
 SHA1 (kdemultimedia-3.3.0.tar.bz2) = 45b96acb218af5c0b1e3f87b045143350ebfdc99
 Size (kdemultimedia-3.3.0.tar.bz2) = 5356679 bytes
@@ -9,3 +9,4 @@
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
+SHA1 (patch-cu) = 030ad7fef29f974e10f7d265d246c3da173e9836
diff -r dd9156245c9c -r e8728fdc3f27 multimedia/kdemultimedia3/patches/patch-cu
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/kdemultimedia3/patches/patch-cu        Sun Oct 10 19:50:23 2004 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-cu,v 1.3 2004/10/10 19:50:23 mycroft Exp $
+
+--- kioslave/audiocd/audiocd.cpp.orig  2004-08-05 19:25:33.000000000 +0000
++++ kioslave/audiocd/audiocd.cpp       2004-10-10 19:38:46.000000000 +0000
+@@ -1047,7 +1047,7 @@
+ 
+       long currentSector(firstSector);
+ 
+-      unsigned long processed = encoder->readInit(CD_FRAMESIZE_RAW * (lastSector - firstSector));
++      unsigned long processed = encoder->readInit(CD_FRAMESIZE_RAW * (lastSector - firstSector + 1));
+       // TODO test for errors (processed<0)?
+       processedSize(processed);
+       bool ok = true;
+@@ -1092,7 +1092,7 @@
+                * 2) Only increase in size unless the decrease is %5 of last estimate.
+                * This prevents continues small changes which is just annoying.
+                */
+-              unsigned long end = lastSector - firstSector;
++              unsigned long end = lastSector - firstSector + 1;
+               unsigned long cur = currentSector - firstSector;
+               unsigned long estSize = (processed / cur ) * end;
+