head 1.10; access; symbols pkgsrc-2026Q1:1.10.0.62 pkgsrc-2026Q1-base:1.10 pkgsrc-2025Q4:1.10.0.60 pkgsrc-2025Q4-base:1.10 pkgsrc-2025Q3:1.10.0.58 pkgsrc-2025Q3-base:1.10 pkgsrc-2025Q2:1.10.0.56 pkgsrc-2025Q2-base:1.10 pkgsrc-2025Q1:1.10.0.54 pkgsrc-2025Q1-base:1.10 pkgsrc-2024Q4:1.10.0.52 pkgsrc-2024Q4-base:1.10 pkgsrc-2024Q3:1.10.0.50 pkgsrc-2024Q3-base:1.10 pkgsrc-2024Q2:1.10.0.48 pkgsrc-2024Q2-base:1.10 pkgsrc-2024Q1:1.10.0.46 pkgsrc-2024Q1-base:1.10 pkgsrc-2023Q4:1.10.0.44 pkgsrc-2023Q4-base:1.10 pkgsrc-2023Q3:1.10.0.42 pkgsrc-2023Q3-base:1.10 pkgsrc-2023Q2:1.10.0.40 pkgsrc-2023Q2-base:1.10 pkgsrc-2023Q1:1.10.0.38 pkgsrc-2023Q1-base:1.10 pkgsrc-2022Q4:1.10.0.36 pkgsrc-2022Q4-base:1.10 pkgsrc-2022Q3:1.10.0.34 pkgsrc-2022Q3-base:1.10 pkgsrc-2022Q2:1.10.0.32 pkgsrc-2022Q2-base:1.10 pkgsrc-2022Q1:1.10.0.30 pkgsrc-2022Q1-base:1.10 pkgsrc-2021Q4:1.10.0.28 pkgsrc-2021Q4-base:1.10 pkgsrc-2021Q3:1.10.0.26 pkgsrc-2021Q3-base:1.10 pkgsrc-2021Q2:1.10.0.24 pkgsrc-2021Q2-base:1.10 pkgsrc-2021Q1:1.10.0.22 pkgsrc-2021Q1-base:1.10 pkgsrc-2020Q4:1.10.0.20 pkgsrc-2020Q4-base:1.10 pkgsrc-2020Q3:1.10.0.18 pkgsrc-2020Q3-base:1.10 pkgsrc-2020Q2:1.10.0.16 pkgsrc-2020Q2-base:1.10 pkgsrc-2020Q1:1.10.0.12 pkgsrc-2020Q1-base:1.10 pkgsrc-2019Q4:1.10.0.14 pkgsrc-2019Q4-base:1.10 pkgsrc-2019Q3:1.10.0.10 pkgsrc-2019Q3-base:1.10 pkgsrc-2019Q2:1.10.0.8 pkgsrc-2019Q2-base:1.10 pkgsrc-2019Q1:1.10.0.6 pkgsrc-2019Q1-base:1.10 pkgsrc-2018Q4:1.10.0.4 pkgsrc-2018Q4-base:1.10 pkgsrc-2018Q3:1.10.0.2 pkgsrc-2018Q3-base:1.10 pkgsrc-2018Q2:1.9.0.40 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.38 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.36 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.34 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.30 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.28 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.26 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.24 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.22 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.20 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.18 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.16 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.14 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.12 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.10 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.8 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.6 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.4 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.2 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.8.0.24 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.22 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.20 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.18 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.16 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.14 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.12 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.10 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.8 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.6 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.4 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.2 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.7.0.10 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.8 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.6 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.4 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.2 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.5.0.28 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.26 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.24 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.22 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.20 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.18 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.16 pkgsrc-2008Q1:1.5.0.14 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.12 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.10 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.8 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.6 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.4 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.2 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.10 date 2018.09.27.15.29.06; author triaxx; state Exp; branches; next 1.9; commitid XAIjiOr0UyKxWKTA; 1.9 date 2013.12.12.16.41.32; author jperkin; state Exp; branches; next 1.8; commitid lQNU6i8bUcN6BRgx; 1.8 date 2010.12.16.04.55.46; author chuck; state Exp; branches; next 1.7; 1.7 date 2009.08.29.04.54.52; author hasso; state Exp; branches; next 1.6; 1.6 date 2009.08.09.16.00.53; author drochner; state Exp; branches; next 1.5; 1.5 date 2006.09.03.17.13.30; author ben; state Exp; branches; next 1.4; 1.4 date 2006.03.07.06.29.03; author joerg; state Exp; branches; next 1.3; 1.3 date 2003.10.20.12.07.23; author grant; state Exp; branches; next 1.2; 1.2 date 2002.03.04.14.45.14; author itohy; state Exp; branches; next 1.1; 1.1 date 2000.01.19.08.03.00; author itohy; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.01.19.08.03.00; author itohy; state Exp; branches; next ; desc @@ 1.10 log @cdparanoia: fix build on FreeBSD Add comments to patches (not always relevant) to appease pkglint Bump revision @ text @$NetBSD: patch-cb,v 1.9 2013/12/12 16:41:32 jperkin Exp $ Support for Common Access Method. --- interface/low_interface.h.orig 2008-09-11 10:43:52.000000000 +0000 +++ interface/low_interface.h @@@@ -26,6 +26,7 @@@@ #include #include +#ifdef __linux__ #include #include @@@@ -54,6 +55,26 @@@@ #include #include +#elif defined(__sun) + +#include + +#elif defined(__FreeBSD__) || defined(__DragonFly__) + +#include +#include + +#define CAM_NO_SCSI_INQUIRY +#include +#include +#include + +#elif defined(__NetBSD__) + +#include +#include +#endif + #include "cdda_interface.h" #ifndef SG_EMULATED_HOST @@@@ -100,17 +121,29 @@@@ typedef struct sg_io_hdr struct cdda_private_data { struct sg_header *sg_hd; unsigned char *sg_buffer; /* points into sg_hd */ +#if defined(__APPLE__) && defined(__MACH__) + /* don't need clock */ +#else clockid_t clock; +#endif int last_milliseconds; }; #define MAX_RETRIES 8 #define MAX_BIG_BUFF_SIZE 65536 #define MIN_BIG_BUFF_SIZE 4096 +#ifdef __linux__ #define SG_OFF sizeof(struct sg_header) +#elif defined(__FreeBSD__) || defined(__DragonFly__) +#define SG_OFF (0) +#elif defined(__NetBSD__) +#define SG_OFF sizeof(scsireq_t) +#endif extern int cooked_init_drive (cdrom_drive *d); +#if !defined(__FreeBSD__) && !defined(__DragonFly__) extern unsigned char *scsi_inquiry (cdrom_drive *d); +#endif extern int scsi_init_drive (cdrom_drive *d); #ifdef CDDA_TEST extern int test_init_drive (cdrom_drive *d); @ 1.9 log @Make package build on SunOS. The end result is mostly non-functional as it is missing SCSI and CDDA support, however this does enable a number of other packages to now build, many of which do not depend on working cdparanoia for their own functionality. @ text @d1 3 a3 1 $NetBSD: patch-cb,v 1.8 2010/12/16 04:55:46 chuck Exp $ @ 1.8 log @make 10.2 work on macosx (port wouldn't compile since it was upgraded from 9.8 to 10.2). the main issue is that macosx doesn't have the clockid_t and clock_gettime() API. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- interface/low_interface.h.orig 2008-09-11 06:43:52.000000000 -0400 +++ interface/low_interface.h 2010-12-15 23:40:19.000000000 -0500 d13 1 a13 1 @@@@ -54,6 +55,22 @@@@ d17 4 d40 1 a40 1 @@@@ -100,17 +117,29 @@@@ @ 1.7 log @Make it just build on DragonFly. Doesn't work yet though. @ text @d1 1 a1 1 $NetBSD: patch-cb,v 1.6 2009/08/09 16:00:53 drochner Exp $ d3 2 a4 2 --- interface/low_interface.h.orig 2008-09-11 13:43:52 +0300 +++ interface/low_interface.h 2009-08-26 10:00:01 +0300 d36 12 a47 1 @@@@ -107,10 +124,18 @@@@ struct cdda_private_data { @ 1.6 log @update to 3.0.10.2 (which is III-10.2 upstream) This is a major update (9.8 was released 2001), most significant changes are support for new (Linux) kernel interfaces and improved drive cache model. pkgsrc note: I've tried to retain Darwin/FreeBSD/DragonFly support, except in scsi_interface.c where the structure changed significantly. Someone who can test please add it back. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- interface/low_interface.h.orig 2008-09-11 12:43:52.000000000 +0200 +++ interface/low_interface.h d13 1 a13 1 @@@@ -54,6 +55,20 @@@@ d22 1 d24 1 d36 1 a36 1 @@@@ -107,10 +122,18 @@@@ struct cdda_private_data { @ 1.5 log @Fix build on Mac OS X and bump pkgrevision. This is based on the work found at: http://strangehours.livejournal.com/9698.html Tested on i386 Mac OS X 10.4.7 and i386 NetBSD 3.0. TODO: manual device selection in Mac OS X. @ text @d3 1 a3 1 --- interface/low_interface.h.orig 2001-03-25 22:12:11.000000000 -0800 d5 1 a5 1 @@@@ -25,6 +25,7 @@@@ d13 1 a13 1 @@@@ -48,12 +49,32 @@@@ d33 2 a45 5 #ifndef SG_EMULATED_HOST /* old kernel version; the check for the ioctl is still runtime, this @@@@ -64,7 +85,9 @@@@ #endif @ 1.4 log @Sync DragonFly/FreeBSD support with FreeBSD ports by adding cdda_device_name to struct cdrom_drive. This makes a number of hacks in various places superfluous and should fix the KDE multimedia issues. Bump revision. Recursive bump will follow, since the major version changed. @ text @d1 1 a1 1 $NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $ d3 1 a3 1 --- interface/low_interface.h.orig 2001-03-26 16:12:11.000000000 +1000 @ 1.3 log @merge some patches from FreeBSD ports. allows this to build on FreeBSD using the ATAPI/CAM subsystem. @ text @d1 1 a1 1 $NetBSD$ d17 1 a17 1 +#elif defined(__FreeBSD__) d38 1 a38 1 +#elif defined(__FreeBSD__) d50 1 a50 1 +#ifndef __FreeBSD__ @ 1.2 log @Upgrade to cdparanoia III 9.8. Install headers in separate directory. Related changes: - Patch for Kenwood TruX drives (they worked before, but were very slow) - Slightly different default read command to alleviate end-of-track read problems on a number of drives - New -z command syntax; option argument to allow a skip after a user-configurable number of tries - Added more possible read commands to autoprobe - Removed autoprobe limitation, so starting a new rip will not potentially stall in autoprobe until previous rip finishes - Patch to allow sample-granulairy offset - allow NULL callbacks to be passed to library interface @ text @d1 1 a1 1 $NetBSD: patch-cb,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $ d3 2 a4 2 --- interface/low_interface.h.orig Mon Mar 26 15:12:11 2001 +++ interface/low_interface.h Mon Mar 4 22:47:22 2002 d13 1 a13 2 @@@@ -47,13 +48,24 @@@@ d16 10 a25 1 +#endif a26 1 +#ifdef __NetBSD__ d30 1 a30 1 d38 3 a40 2 +#endif +#ifdef __NetBSD__ d46 10 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- interface/low_interface.h.orig Thu Dec 2 16:19:53 1999 +++ interface/low_interface.h Sun Jan 16 18:48:11 2000 d13 1 a13 1 @@@@ -48,13 +49,24 @@@@ @ 1.1.1.1 log @An attempt to port cdparanoia-III-alpha9.7. CD-DA extraction tool with excessive data corrections, such as jitter, loss of data, etc. This will soon be obsoleted by cdparanoia IV, I hope.... Most SCSI/ATAPI CD-ROM drives should work fine. However, the ATAPI stuff is totally untested, and if it happened to work, it was a miracle. :-) Currently, - the feature to search for CD-ROM device is not implemented and the -g option is required, - the libraries are not installed. @ text @@