From 57094ab5a92249e60c91e164884c2ae22f1b3c46 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 25 Sep 2024 15:04:06 +0200 Subject: [PATCH] updated to 10.2+2.0.1 Signed-off-by: Adrian Reber --- .gitignore | 1 + 38.patch | 620 --------------------------------- COPYING-GPL | 343 ------------------ COPYING-LGPL | 508 --------------------------- libcdio-paranoia-manpage.patch | 22 -- libcdio-paranoia.spec | 15 +- sources | 2 +- 7 files changed, 8 insertions(+), 1503 deletions(-) delete mode 100644 38.patch delete mode 100644 COPYING-GPL delete mode 100644 COPYING-LGPL delete mode 100644 libcdio-paranoia-manpage.patch diff --git a/.gitignore b/.gitignore index 9d0f91c..4969ad6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libcdio-paranoia-10.2+0.94+2.tar.gz /libcdio-paranoia-10.2+2.0.0.tar.bz2 /libcdio-paranoia-10.2+2.0.1.tar.bz2 +/libcdio-paranoia-10.2+2.0.2.tar.bz2 diff --git a/38.patch b/38.patch deleted file mode 100644 index 1c19f6b..0000000 --- a/38.patch +++ /dev/null @@ -1,620 +0,0 @@ -From 9106b5c9031dee5175d8b347114553362c916166 Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Wed, 14 Feb 2024 15:43:11 -0800 -Subject: [PATCH 1/8] Ignore drive offset when verifying track numbers. cdio - doesn't bias by them and the results are wrong for drives with offsets - greater than a sector's worth of samples (588). - ---- - include/cdio/paranoia/cdda.h | 1 + - lib/cdda_interface/toc.c | 2 +- - src/cd-paranoia.c | 12 +++++++----- - 3 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/include/cdio/paranoia/cdda.h b/include/cdio/paranoia/cdda.h -index 05718ea..bd638c9 100644 ---- a/include/cdio/paranoia/cdda.h -+++ b/include/cdio/paranoia/cdda.h -@@ -137,6 +137,7 @@ struct cdrom_drive_s { - the flag masks to simulate a particular kind of - failure. */ - -+ long toc_offset; - }; - - -diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c -index 2e32be8..4c2d6fc 100644 ---- a/lib/cdda_interface/toc.c -+++ b/lib/cdda_interface/toc.c -@@ -172,7 +172,7 @@ cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn) - cderror(d,"400: Device not open\n"); - return CDIO_INVALID_TRACK; - } else { -- if (lsn < d->disc_toc[0].dwStartSector) -+ if (lsn < d->disc_toc[0].dwStartSector - d->toc_offset) - return 0; /* We're in the pre-gap of first track */ - - return cdio_get_track(d->p_cdio, lsn); -diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c -index 1bb3af8..ee424aa 100644 ---- a/src/cd-paranoia.c -+++ b/src/cd-paranoia.c -@@ -225,7 +225,7 @@ parse_offset(cdrom_drive_t *d, char *offset, int begin) - - /* We don't want to outside of the track; if it's relative, that's OK... */ - if( i_track != CDIO_INVALID_TRACK ){ -- if (cdda_sector_gettrack(d,ret) != i_track) { -+ if (cdda_sector_gettrack(d,ret - d->toc_offset) != i_track) { - report("Time/sector offset goes beyond end of specified track."); - exit(1); - } -@@ -1123,6 +1123,8 @@ main(int argc,char *argv[]) - toc_offset = -cdda_track_firstsector(d,1); - } - -+ d->toc_offset = toc_offset; -+ - { - int i; - for( i=0; i < d->tracks+1; i++ ) -@@ -1189,9 +1191,9 @@ main(int argc,char *argv[]) - } - - { -- int track1 = cdda_sector_gettrack(d, i_first_lsn); -+ int track1 = cdda_sector_gettrack(d, i_first_lsn - d->toc_offset); - -- int track2 = cdda_sector_gettrack(d, i_last_lsn); -+ int track2 = cdda_sector_gettrack(d, i_last_lsn - d->toc_offset); - long off1 = i_first_lsn - cdda_track_firstsector(d, track1); - long off2 = i_last_lsn - cdda_track_firstsector(d, track2); - int i; -@@ -1468,7 +1470,7 @@ main(int argc,char *argv[]) - - /* One last bit of silliness to deal with sample offsets */ - if(sample_offset && cursor>batch_last){ -- if (cdda_sector_gettrack(d, batch_last) < d->tracks || force_overread) { -+ if (cdda_sector_gettrack(d, batch_last - toc_offset) < d->tracks || force_overread) { - int i; - - /* Need to flush the buffer when overreading into the leadout */ -@@ -1521,7 +1523,7 @@ main(int argc,char *argv[]) - - /* Write sectors of silent audio to compensate for - missing samples that would be in the leadout */ -- if (cdda_sector_gettrack(d, batch_last) == d->tracks && -+ if (cdda_sector_gettrack(d, batch_last - toc_offset) == d->tracks && - toc_offset > 0 && !force_overread) - { - char *silence; - -From b5f04b7d1e70fdec06f516551a6b18590379f273 Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Thu, 15 Feb 2024 00:48:45 -0800 -Subject: [PATCH 2/8] Attempt to catch all cases of biased sectors in - cd-paranoia and toc. Use correct, raw values when calling cdio. - ---- - lib/cdda_interface/toc.c | 16 ++++++++-------- - src/cd-paranoia.c | 14 +++++++++----- - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c -index 4c2d6fc..9d945f6 100644 ---- a/lib/cdda_interface/toc.c -+++ b/lib/cdda_interface/toc.c -@@ -43,7 +43,7 @@ cdda_track_firstsector(cdrom_drive_t *d, track_t i_track) - - if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = i_last_track; - if (i_track == 0) { -- if (d->disc_toc[0].dwStartSector == 0) { -+ if (d->disc_toc[0].dwStartSector - d->toc_offset == 0) { - /* first track starts at lba 0 -> no pre-gap */ - cderror(d,"402: No initial pregap\n"); - return(-402); -@@ -57,7 +57,7 @@ cdda_track_firstsector(cdrom_drive_t *d, track_t i_track) - cderror(d, buf); - return(-401); - } -- return(d->disc_toc[i_track-i_first_track].dwStartSector); -+ return(d->disc_toc[i_track-i_first_track].dwStartSector - d->toc_offset); - } - } - -@@ -99,13 +99,13 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - const track_t i_last_track = cdio_get_last_track_num(d->p_cdio); - - if (i_track == 0) { -- if (d->disc_toc[0].dwStartSector == 0) { -+ if (d->disc_toc[0].dwStartSector - d->toc_offset == 0) { - /* first track starts at lba 0 -> no pre-gap */ - cderror(d,"402: No initial pregap\n"); - return(-402); - } - else { -- return d->disc_toc[0].dwStartSector-1; -+ return ((d->disc_toc[0].dwStartSector - d->toc_offset) - 1); - } - } else if (i_track < i_first_track || i_track > i_last_track) { - char buf[100]; -@@ -116,15 +116,15 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - - /* CD Extra have their first session ending at the last audio track */ - if (d->cd_extra > 0 && i_track-i_first_track+2 <= d->tracks) { -- if (d->audio_last_sector >= d->disc_toc[i_track-i_first_track].dwStartSector && -- d->audio_last_sector < d->disc_toc[i_track-i_first_track+1].dwStartSector) { -+ if (d->audio_last_sector >= (d->disc_toc[i_track-i_first_track].dwStartSector - d->toc_offset) && -+ d->audio_last_sector < (d->disc_toc[i_track-i_first_track+1].dwStartSector - d->toc_offset)) { - return d->audio_last_sector; - } - } - - /* Index safe because we always have the leadout at - * disc_toc[tracks] */ -- return(d->disc_toc[i_track-i_first_track+1].dwStartSector-1); -+ return((d->disc_toc[i_track-i_first_track+1].dwStartSector - d->toc_offset) - 1); - } - } - -@@ -172,7 +172,7 @@ cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn) - cderror(d,"400: Device not open\n"); - return CDIO_INVALID_TRACK; - } else { -- if (lsn < d->disc_toc[0].dwStartSector - d->toc_offset) -+ if (lsn < (d->disc_toc[0].dwStartSector - d->toc_offset)) - return 0; /* We're in the pre-gap of first track */ - - return cdio_get_track(d->p_cdio, lsn); -diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c -index ee424aa..b81f077 100644 ---- a/src/cd-paranoia.c -+++ b/src/cd-paranoia.c -@@ -225,7 +225,7 @@ parse_offset(cdrom_drive_t *d, char *offset, int begin) - - /* We don't want to outside of the track; if it's relative, that's OK... */ - if( i_track != CDIO_INVALID_TRACK ){ -- if (cdda_sector_gettrack(d,ret - d->toc_offset) != i_track) { -+ if (cdda_sector_gettrack(d,ret) != i_track) { - report("Time/sector offset goes beyond end of specified track."); - exit(1); - } -@@ -1191,9 +1191,9 @@ main(int argc,char *argv[]) - } - - { -- int track1 = cdda_sector_gettrack(d, i_first_lsn - d->toc_offset); -+ int track1 = cdda_sector_gettrack(d, i_first_lsn); - -- int track2 = cdda_sector_gettrack(d, i_last_lsn - d->toc_offset); -+ int track2 = cdda_sector_gettrack(d, i_last_lsn); - long off1 = i_first_lsn - cdda_track_firstsector(d, track1); - long off2 = i_last_lsn - cdda_track_firstsector(d, track2); - int i; -@@ -1220,11 +1220,15 @@ main(int argc,char *argv[]) - - } - -+ i_first_lsn += toc_offset; -+ i_last_lsn += toc_offset; -+ - if (toc_offset && !force_overread) { - d->disc_toc[d->tracks].dwStartSector -= toc_offset; - if (i_last_lsn > cdda_track_lastsector(d, d->tracks)) - i_last_lsn -= toc_offset; - } -+ - { - long cursor; - int16_t offset_buffer[1176]; -@@ -1267,7 +1271,7 @@ main(int argc,char *argv[]) - char outfile_name[PATH_MAX]; - if ( batch ){ - batch_first = cursor; -- batch_track = cdda_sector_gettrack(d,cursor); -+ batch_track = cdda_sector_gettrack(d,cursor - toc_offset); - batch_last = cdda_track_lastsector(d, batch_track); - if (batch_last>i_last_lsn) batch_last=i_last_lsn; - } else { -@@ -1385,7 +1389,7 @@ main(int argc,char *argv[]) - } - - sectorlen = batch_last - batch_first + 1; -- if (cdda_sector_gettrack(d, cursor) == d->tracks && -+ if (cdda_sector_gettrack(d, cursor - toc_offset) == d->tracks && - toc_offset > 0 && !force_overread){ - sectorlen += toc_offset; - } - -From 2477ee52efc34d75caa8c70dd6ae946a1a5965c6 Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Fri, 16 Feb 2024 00:24:56 -0800 -Subject: [PATCH 3/8] Hopefully a better fix. Keep the drive offset management - in cd-paranoia.c and only deal with raw sector id's when calling - libcdio_cdda. - ---- - include/cdio/paranoia/cdda.h | 2 -- - lib/cdda_interface/toc.c | 16 ++++++++-------- - src/cd-paranoia.c | 16 ++++------------ - 3 files changed, 12 insertions(+), 22 deletions(-) - -diff --git a/include/cdio/paranoia/cdda.h b/include/cdio/paranoia/cdda.h -index bd638c9..2b23809 100644 ---- a/include/cdio/paranoia/cdda.h -+++ b/include/cdio/paranoia/cdda.h -@@ -136,8 +136,6 @@ struct cdrom_drive_s { - paranoia operation this can be set to one of - the flag masks to simulate a particular kind of - failure. */ -- -- long toc_offset; - }; - - -diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c -index 9d945f6..cd24867 100644 ---- a/lib/cdda_interface/toc.c -+++ b/lib/cdda_interface/toc.c -@@ -43,7 +43,7 @@ cdda_track_firstsector(cdrom_drive_t *d, track_t i_track) - - if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = i_last_track; - if (i_track == 0) { -- if (d->disc_toc[0].dwStartSector - d->toc_offset == 0) { -+ if (d->disc_toc[0].dwStartSector == 0) { - /* first track starts at lba 0 -> no pre-gap */ - cderror(d,"402: No initial pregap\n"); - return(-402); -@@ -57,7 +57,7 @@ cdda_track_firstsector(cdrom_drive_t *d, track_t i_track) - cderror(d, buf); - return(-401); - } -- return(d->disc_toc[i_track-i_first_track].dwStartSector - d->toc_offset); -+ return(d->disc_toc[i_track-i_first_track].dwStartSector); - } - } - -@@ -99,13 +99,13 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - const track_t i_last_track = cdio_get_last_track_num(d->p_cdio); - - if (i_track == 0) { -- if (d->disc_toc[0].dwStartSector - d->toc_offset == 0) { -+ if (d->disc_toc[0].dwStartSector == 0) { - /* first track starts at lba 0 -> no pre-gap */ - cderror(d,"402: No initial pregap\n"); - return(-402); - } - else { -- return ((d->disc_toc[0].dwStartSector - d->toc_offset) - 1); -+ return (d->disc_toc[0].dwStartSector - 1); - } - } else if (i_track < i_first_track || i_track > i_last_track) { - char buf[100]; -@@ -116,15 +116,15 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - - /* CD Extra have their first session ending at the last audio track */ - if (d->cd_extra > 0 && i_track-i_first_track+2 <= d->tracks) { -- if (d->audio_last_sector >= (d->disc_toc[i_track-i_first_track].dwStartSector - d->toc_offset) && -- d->audio_last_sector < (d->disc_toc[i_track-i_first_track+1].dwStartSector - d->toc_offset)) { -+ if (d->audio_last_sector >= d->disc_toc[i_track-i_first_track].dwStartSector && -+ d->audio_last_sector < d->disc_toc[i_track-i_first_track+1].dwStartSector) { - return d->audio_last_sector; - } - } - - /* Index safe because we always have the leadout at - * disc_toc[tracks] */ -- return((d->disc_toc[i_track-i_first_track+1].dwStartSector - d->toc_offset) - 1); -+ return(d->disc_toc[i_track-i_first_track+1].dwStartSector - 1); - } - } - -@@ -172,7 +172,7 @@ cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn) - cderror(d,"400: Device not open\n"); - return CDIO_INVALID_TRACK; - } else { -- if (lsn < (d->disc_toc[0].dwStartSector - d->toc_offset)) -+ if (lsn < (d->disc_toc[0].dwStartSector)) - return 0; /* We're in the pre-gap of first track */ - - return cdio_get_track(d->p_cdio, lsn); -diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c -index b81f077..3a4d9ec 100644 ---- a/src/cd-paranoia.c -+++ b/src/cd-paranoia.c -@@ -1123,14 +1123,6 @@ main(int argc,char *argv[]) - toc_offset = -cdda_track_firstsector(d,1); - } - -- d->toc_offset = toc_offset; -- -- { -- int i; -- for( i=0; i < d->tracks+1; i++ ) -- d->disc_toc[i].dwStartSector+=toc_offset; -- } -- - if (d->nsectors==1) { - report("WARNING: The autosensed/selected sectors per read value is\n" - " one sector, making it very unlikely Paranoia can \n" -@@ -1220,13 +1212,13 @@ main(int argc,char *argv[]) - - } - -+ // Apply the sector read offset now that we are starting to read data - i_first_lsn += toc_offset; - i_last_lsn += toc_offset; - - if (toc_offset && !force_overread) { -- d->disc_toc[d->tracks].dwStartSector -= toc_offset; -- if (i_last_lsn > cdda_track_lastsector(d, d->tracks)) -- i_last_lsn -= toc_offset; -+ if (i_last_lsn > cdda_track_lastsector(d, d->tracks)) -+ i_last_lsn -= toc_offset; - } - - { -@@ -1265,7 +1257,7 @@ main(int argc,char *argv[]) - willing to read past, assuming that works on the hardware, of - course */ - if(sample_offset && force_overread) -- d->disc_toc[d->tracks].dwStartSector++; -+ i_last_lsn++; - - while(cursor<=i_last_lsn){ - char outfile_name[PATH_MAX]; - -From 6908b9df7c1567dc37645cf973c67f58d1f8294e Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Fri, 16 Feb 2024 00:36:59 -0800 -Subject: [PATCH 4/8] Revert formatting changes to files where I reverted - functional changes. - ---- - include/cdio/paranoia/cdda.h | 1 + - lib/cdda_interface/toc.c | 6 +++--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/include/cdio/paranoia/cdda.h b/include/cdio/paranoia/cdda.h -index 2b23809..05718ea 100644 ---- a/include/cdio/paranoia/cdda.h -+++ b/include/cdio/paranoia/cdda.h -@@ -136,6 +136,7 @@ struct cdrom_drive_s { - paranoia operation this can be set to one of - the flag masks to simulate a particular kind of - failure. */ -+ - }; - - -diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c -index cd24867..9f67bc3 100644 ---- a/lib/cdda_interface/toc.c -+++ b/lib/cdda_interface/toc.c -@@ -105,7 +105,7 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - return(-402); - } - else { -- return (d->disc_toc[0].dwStartSector - 1); -+ return (d->disc_toc[0].dwStartSector-1); - } - } else if (i_track < i_first_track || i_track > i_last_track) { - char buf[100]; -@@ -124,7 +124,7 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - - /* Index safe because we always have the leadout at - * disc_toc[tracks] */ -- return(d->disc_toc[i_track-i_first_track+1].dwStartSector - 1); -+ return(d->disc_toc[i_track-i_first_track+1].dwStartSector-1); - } - } - -@@ -172,7 +172,7 @@ cdio_cddap_sector_gettrack(cdrom_drive_t *d, lsn_t lsn) - cderror(d,"400: Device not open\n"); - return CDIO_INVALID_TRACK; - } else { -- if (lsn < (d->disc_toc[0].dwStartSector)) -+ if (lsn < d->disc_toc[0].dwStartSector) - return 0; /* We're in the pre-gap of first track */ - - return cdio_get_track(d->p_cdio, lsn); - -From a327427124fec7d326c35b2e5f322696750ee44a Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Fri, 16 Feb 2024 00:38:36 -0800 -Subject: [PATCH 5/8] Missed one - ---- - lib/cdda_interface/toc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/cdda_interface/toc.c b/lib/cdda_interface/toc.c -index 9f67bc3..2e32be8 100644 ---- a/lib/cdda_interface/toc.c -+++ b/lib/cdda_interface/toc.c -@@ -105,7 +105,7 @@ cdda_track_lastsector(cdrom_drive_t *d, track_t i_track) - return(-402); - } - else { -- return (d->disc_toc[0].dwStartSector-1); -+ return d->disc_toc[0].dwStartSector-1; - } - } else if (i_track < i_first_track || i_track > i_last_track) { - char buf[100]; - -From c0b25be7025b561084f638c4659728710939fa65 Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Fri, 16 Feb 2024 01:50:37 -0800 -Subject: [PATCH 6/8] Fix batch reads - add offset to returned track last - sector - ---- - src/cd-paranoia.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c -index 3a4d9ec..c33eb95 100644 ---- a/src/cd-paranoia.c -+++ b/src/cd-paranoia.c -@@ -1264,7 +1264,7 @@ main(int argc,char *argv[]) - if ( batch ){ - batch_first = cursor; - batch_track = cdda_sector_gettrack(d,cursor - toc_offset); -- batch_last = cdda_track_lastsector(d, batch_track); -+ batch_last = cdda_track_lastsector(d, batch_track) + toc_offset; - if (batch_last>i_last_lsn) batch_last=i_last_lsn; - } else { - batch_first = i_first_lsn; - -From 847f2f4be7e92b40af622ea5e12bb3a3d0c6d580 Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Fri, 16 Feb 2024 03:50:24 -0800 -Subject: [PATCH 7/8] Tweak the sector read offset configuration and adjust - comments - ---- - src/cd-paranoia.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c -index c33eb95..540531f 100644 ---- a/src/cd-paranoia.c -+++ b/src/cd-paranoia.c -@@ -1212,14 +1212,15 @@ main(int argc,char *argv[]) - - } - -- // Apply the sector read offset now that we are starting to read data -+ /* Apply read sector offset to the first and last sector indicies. -+ If the option has not been given to force overreading, do not offset -+ the last index beyond the last sector of the final track. */ - i_first_lsn += toc_offset; -- i_last_lsn += toc_offset; -- -- if (toc_offset && !force_overread) { -- if (i_last_lsn > cdda_track_lastsector(d, d->tracks)) -- i_last_lsn -= toc_offset; -- } -+ lsn_t lasttrack_lastsector = cdda_track_lastsector(d, d->tracks); -+ if (!force_overread && i_last_lsn + toc_offset >= lasttrack_lastsector) -+ i_last_lsn = lasttrack_lastsector; -+ else -+ i_last_lsn += toc_offset; - - { - long cursor; - -From 2389007b1eb3e43c8d3f3034dcbd9c478afc7dc4 Mon Sep 17 00:00:00 2001 -From: Matt McKenzie -Date: Fri, 16 Feb 2024 03:51:43 -0800 -Subject: [PATCH 8/8] Fix --force-overread behavior and add comments on the - offset behavior - ---- - src/cd-paranoia.c | 78 ++++++++++++++++++++++++++++++++++------------- - 1 file changed, 57 insertions(+), 21 deletions(-) - -diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c -index 540531f..d89af2b 100644 ---- a/src/cd-paranoia.c -+++ b/src/cd-paranoia.c -@@ -1093,19 +1093,62 @@ main(int argc,char *argv[]) - - if (query_only) exit(0); - -- /* bias the disc. A hack. Of course. this is never the default. */ - /* -- Some CD-ROM/CD-R drives will add an offset to the position on -- reading audio data. This is usually around 500-700 audio samples -- (ca. 1/75 second) on reading. So when this program queries a -- specific sector, it might not receive exactly that sector, but -- shifted by some amount. -- -- Note that if ripping includes the end of the CD, this will this -- cause this program to attempt to read partial sectors before or -- past the known user data area of the disc, probably causing read -- errors on most drives and possibly even hard lockups on some -- buggy hardware. -+ Nearly all CD-ROM/CD-R drives will add a sample offset (either -+ positive or negative) to the position when reading audio data. -+ This is usually around 500-700 audio samples (ca. 1/75 second) -+ but can consist of multiple sectors for some drives. -+ -+ To account for this, the --sample-offset option can be specified -+ to adjust for a drive's read offset by a given number of -+ samples. In doing so, the exact data desired can be retrieved, -+ assuming the proper offset is specified for a given drive. -+ -+ An audio CD sector is 2352 bytes in size, consisting of 1176 -+ 16-bit (2-byte) samples or 588 paris of samples (left and right -+ channels). Therefore, every 588 samples of offset required for a -+ given drive will necesitate shifting reads by N sectors and by M -+ samples (assuming the sample offset is not an exact multiple of -+ 588). -+ -+ For example: -+ --sample-offset 0 (default) -+ results in a sector offset of 0 and a sample offset of 0 -+ -+ --sample-offset +48 -+ results in a sector offset of 0 and a sample offset of 48 -+ -+ --sample-offset +667 -+ results in a sector offset of 1 and a sample offset of 79 -+ -+ --sample-offset +1776 -+ results in a sector offset of 3 and a sample offset of 12 -+ -+ --sample-offset -54 -+ results in a sector offset of -1 and a sample offset of 534 -+ -+ --sample-offset -589 -+ results in a sector offset of -2 and a sample offset of 587 -+ -+ --sample-offset -1164 -+ results in a sector offset of -2 and a sample offset of 12 -+ -+ toc_offset - accounts for the number of sectors to offset reads -+ sample_offset - accounts for the number of samples to shift the -+ results -+ -+ Note that if ripping includes the end of the CD and the -+ --force-overread option is specified, this program will attempt -+ to read partial sectors before or past the known user data area -+ of the disc. The drive must suppport this or it will probably -+ cause read errors on most drives and possibly even hard lockups -+ on some buggy hardware. If the --force-overread is not provided, -+ tracks will be padded with empty data rather than attempting to -+ read beyond the disk lead-in/lead-out. -+ -+ For more info, see: -+ - https://www.exactaudiocopy.de/en/index.php/support/faq/offset-questions/ -+ - https://wiki.hydrogenaud.io/index.php?title=AccurateRip#Drive_read_offsets - - [Note to libcdio driver hackers: make sure all CD-drivers don't - try to read outside of the stated disc boundaries.] -@@ -1214,7 +1257,8 @@ main(int argc,char *argv[]) - - /* Apply read sector offset to the first and last sector indicies. - If the option has not been given to force overreading, do not offset -- the last index beyond the last sector of the final track. */ -+ the last sector index beyond the last sector of the final track. -+ */ - i_first_lsn += toc_offset; - lsn_t lasttrack_lastsector = cdda_track_lastsector(d, d->tracks); - if (!force_overread && i_last_lsn + toc_offset >= lasttrack_lastsector) -@@ -1252,14 +1296,6 @@ main(int argc,char *argv[]) - dummy = setegid(getgid()); - #endif - -- /* we'll need to be able to read one sector past user data if we -- have a sample offset in order to pick up the last bytes. We -- need to set the disc length forward here so that the libs are -- willing to read past, assuming that works on the hardware, of -- course */ -- if(sample_offset && force_overread) -- i_last_lsn++; -- - while(cursor<=i_last_lsn){ - char outfile_name[PATH_MAX]; - if ( batch ){ diff --git a/COPYING-GPL b/COPYING-GPL deleted file mode 100644 index e17fde6..0000000 --- a/COPYING-GPL +++ /dev/null @@ -1,343 +0,0 @@ -The cdparanoia command line tool versions 10.1 and later are -distributed under the GNU General Public Licence v2.0 or, at your -option, any later version of the GPL. - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/COPYING-LGPL b/COPYING-LGPL deleted file mode 100644 index e796aff..0000000 --- a/COPYING-LGPL +++ /dev/null @@ -1,508 +0,0 @@ -The 10.1 and later release versions of the cdda-interface and -cdda-paranoia libraries are distributed the GNU Lesser General Public -License v2.1 or, at your option, any later version of the GNU LGPL. - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/libcdio-paranoia-manpage.patch b/libcdio-paranoia-manpage.patch deleted file mode 100644 index ffe8003..0000000 --- a/libcdio-paranoia-manpage.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up wrk/doc/en/cd-paranoia.1.in.wrk wrk/doc/en/cd-paranoia.1.in ---- wrk/doc/en/cd-paranoia.1.in.wrk 2013-07-31 18:43:13.071575017 +0200 -+++ wrk/doc/en/cd-paranoia.1.in 2013-07-31 18:46:22.446042574 +0200 -@@ -1,6 +1,6 @@ - .TH @CDPARANOIA_NAME@ 1 "version III release alpha 9.8 libcdio" - .SH NAME --@CDPARANOIA_NAME@ 9.8 (Paranoia release III via libcdio) \- an audio CD reading utility which includes extra data verification features -+@CDPARANOIA_NAME@ \- 9.8 (Paranoia release III via libcdio) - an audio CD reading utility which includes extra data verification features - .SH SYNOPSIS - .B @CDPARANOIA_NAME@ - .RB [ options ] -diff -up wrk/doc/en/cd-paranoia.1.wrk wrk/doc/en/cd-paranoia.1 ---- wrk/doc/en/cd-paranoia.1.wrk 2013-07-31 18:42:52.799417871 +0200 -+++ wrk/doc/en/cd-paranoia.1 2013-07-31 18:45:13.430507735 +0200 -@@ -1,6 +1,6 @@ - .TH cd-paranoia 1 "version III release alpha 9.8 libcdio" - .SH NAME --cd-paranoia 9.8 (Paranoia release III via libcdio) \- an audio CD reading utility which includes extra data verification features -+cd-paranoia \- 9.8 (Paranoia release III via libcdio) - an audio CD reading utility which includes extra data verification features - .SH SYNOPSIS - .B cd-paranoia - .RB [ options ] diff --git a/libcdio-paranoia.spec b/libcdio-paranoia.spec index 8a2c443..ce80f07 100644 --- a/libcdio-paranoia.spec +++ b/libcdio-paranoia.spec @@ -1,13 +1,11 @@ Name: libcdio-paranoia -Version: 10.2+2.0.1 -Release: 14%{?dist} +Version: 10.2+2.0.2 +Release: 1%{?dist} Summary: CD paranoia on top of libcdio # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later URL: http://www.gnu.org/software/libcdio/ -Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-%{version}.tar.bz2 -Patch0: libcdio-paranoia-manpage.patch -Patch1: https://github.com/rocky/libcdio-paranoia/pull/38.patch +Source0: https://github.com/libcdio/libcdio-paranoia/releases/download/release-%{version}/libcdio-paranoia-%{version}.tar.bz2 BuildRequires: gcc BuildRequires: pkgconfig BuildRequires: gettext-devel @@ -33,8 +31,6 @@ This package contains header files and libraries for %{name}. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 # fix pkgconfig files sed -i -e 's,-I${includedir},-I${includedir}/cdio,g' libcdio_paranoia.pc.in @@ -56,8 +52,6 @@ iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -mv $RPM_BUILD_ROOT%{_mandir}/{jp,ja} - # copy include files to an additional directory for backward compatibility # this is where most software still expects those files cp -a $RPM_BUILD_ROOT%{_includedir}/cdio/paranoia/*.h $RPM_BUILD_ROOT%{_includedir}/cdio/ @@ -86,6 +80,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so.* %changelog +* Wed Sep 25 2024 Adrian Reber - 10.2+2.0.2-1 +- updated to 10.2+2.0.1 + * Thu Jul 25 2024 Miroslav Suchý - 10.2+2.0.1-14 - convert license to SPDX diff --git a/sources b/sources index c25c3e7..e47c362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libcdio-paranoia-10.2+2.0.1.tar.bz2) = c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0 +SHA512 (libcdio-paranoia-10.2+2.0.2.tar.bz2) = ad199c14e77a097e3e9adda222eb42bea880fdf5d08fa3ae08df27e4685508a85d54d8b0c1a35fb043d550bf735890322efb4e0502b3507d6f9563151e3a36c0