head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.62 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.60 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.58 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.56 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.54 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.52 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.50 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.48 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.46 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.44 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.42 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.40 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.38 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.36 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.34 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.32 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.30 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.28 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.26 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.24 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.22 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.20 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.18 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.16 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.12 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.14 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.10 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.8 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.6 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.4 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.2 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.8.0.40 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.38 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.36 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.34 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.30 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.28 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.26 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.24 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.22 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.20 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.18 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.16 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.14 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.12 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.10 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.8 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.6 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.4 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.2 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.7.0.24 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.22 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.20 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.18 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.16 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.14 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.12 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.10 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.8 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.6 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.4 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.2 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.6.0.10 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.8 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.6 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.4 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.2 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.3.0.28 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.26 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.24 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.22 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.20 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.18 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.16 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.18 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.16 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.14 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.12 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.10 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.8 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.6 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.4 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.9 date 2018.09.27.15.29.06; author triaxx; state Exp; branches; next 1.8; commitid XAIjiOr0UyKxWKTA; 1.8 date 2013.12.12.16.41.32; author jperkin; state Exp; branches; next 1.7; commitid lQNU6i8bUcN6BRgx; 1.7 date 2010.12.16.04.55.46; author chuck; state Exp; branches; next 1.6; 1.6 date 2009.08.29.04.54.52; author hasso; state Exp; branches; next 1.5; 1.5 date 2009.08.14.15.51.06; author drochner; state Exp; branches; next 1.4; 1.4 date 2009.08.09.16.00.53; author drochner; state Exp; branches; next 1.3; 1.3 date 2006.09.03.17.13.30; author ben; state Exp; branches; next 1.2; 1.2 date 2006.03.07.06.29.04; author joerg; state Exp; branches; next 1.1; 1.1 date 2003.10.20.12.08.03; author grant; state Exp; branches; next ; desc @@ 1.9 log @cdparanoia: fix build on FreeBSD Add comments to patches (not always relevant) to appease pkglint Bump revision @ text @$NetBSD: patch-ch,v 1.8 2013/12/12 16:41:32 jperkin Exp $ Support for MacOS. --- interface/cdda_interface.h.orig 2008-09-11 10:43:52.000000000 +0000 +++ interface/cdda_interface.h @@@@ -18,9 +18,25 @@@@ #endif #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4) +#if defined(__APPLE__) && defined(__MACH__) +#include +#include +#endif + #include #include +#if defined(__FreeBSD__) || defined(__DragonFly__) +#define CAM_NO_SCSI_INQUIRY +#include +#include +#endif + +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__sun) || \ + (defined(__APPLE__) && defined(__MACH__)) +#define ENOMEDIUM 12345 +#endif + #define MAXTRK 100 typedef struct TOC { /* structure of table of contents */ @@@@ -35,6 +51,7 @@@@ typedef struct TOC { /* structure of tab #define TEST_INTERFACE 2 #define SGIO_SCSI 3 #define SGIO_SCSI_BUGGY1 4 +#define OSX_IOKIT 5 #define CDDA_MESSAGE_FORGETIT 0 #define CDDA_MESSAGE_PRINTIT 1 @@@@ -49,13 +66,27 @@@@ typedef struct cdrom_drive{ int opened; /* This struct may just represent a candidate for opening */ char *cdda_device_name; +#if !defined(__FreeBSD__) char *ioctl_device_name; int cdda_fd; - int ioctl_fd; - char *drive_model; int drive_type; +#else + struct cam_device *dev; + union ccb *ccb; +#endif + +#if defined(__APPLE__) && defined(__MACH__) + io_object_t io; + int fd; + char *dev; + CDTOC *raw_toc; + int descriptor_count; +#endif + + int ioctl_fd; + char *drive_model; int interface; int bigendianp; int nsectors; @@@@ -84,7 +115,7 @@@@ typedef struct cdrom_drive{ int is_atapi; int is_mmc; - cdda_private_data_t *private; + cdda_private_data_t *private_data; void *reserved; unsigned char inqbytes[4]; @ 1.8 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-ch,v 1.7 2010/12/16 04:55:46 chuck Exp $ d7 1 a7 1 @@@@ -18,9 +18,24 @@@@ d25 2 a26 1 +#if defined(__NetBSD__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__sun) d33 1 a33 1 @@@@ -35,6 +50,7 @@@@ typedef struct TOC { /* structure of tab d41 1 a41 1 @@@@ -49,13 +65,27 @@@@ typedef struct cdrom_drive{ d71 1 a71 1 @@@@ -84,7 +114,7 @@@@ typedef struct cdrom_drive{ @ 1.7 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/cdda_interface.h.orig 2008-09-11 06:43:52.000000000 -0400 +++ interface/cdda_interface.h 2010-12-15 23:39:17.000000000 -0500 d23 1 a23 1 +#if defined(__NetBSD__) || (defined(__APPLE__) && defined(__MACH__)) d30 1 a30 1 @@@@ -35,6 +50,7 @@@@ d38 1 a38 1 @@@@ -49,13 +65,27 @@@@ d68 1 a68 1 @@@@ -84,7 +114,7 @@@@ @ 1.6 log @Make it just build on DragonFly. Doesn't work yet though. @ text @d1 1 a1 1 $NetBSD: patch-ch,v 1.5 2009/08/14 15:51:06 drochner Exp $ d3 2 a4 2 --- interface/cdda_interface.h.orig 2008-09-11 13:43:52 +0300 +++ interface/cdda_interface.h 2009-08-28 11:50:44 +0300 d23 1 a23 1 +#ifdef __NetBSD__ d30 1 a30 1 @@@@ -35,6 +50,7 @@@@ typedef struct TOC { /* structure of tab d38 1 a38 1 @@@@ -49,13 +65,27 @@@@ typedef struct cdrom_drive{ d68 1 a68 1 @@@@ -84,7 +114,7 @@@@ typedef struct cdrom_drive{ @ 1.5 log @some fixes and cleanup: -replace a struct member name "private" in a public header, it is reserved in C+, fixes build problems reported by joerg and wiz -link against librt on Linux (needed for clock_gettime()), should fix build problem reported by dsainty -don't even compile cooked_interface.c on NetBSD, and g/c patches which added NetBSD support code which was never used bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- interface/cdda_interface.h.orig 2008-09-11 12:43:52.000000000 +0200 +++ interface/cdda_interface.h @@@@ -18,9 +18,23 @@@@ d18 1 d30 1 a30 1 @@@@ -35,6 +49,7 @@@@ typedef struct TOC { /* structure of tab d38 1 a38 1 @@@@ -49,13 +64,27 @@@@ typedef struct cdrom_drive{ d42 1 a42 1 +#if !defined(__FreeBSD__) && !defined(__DragonFly__) d68 1 a68 1 @@@@ -84,7 +113,7 @@@@ typedef struct cdrom_drive{ @ 1.4 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 @d67 9 @ 1.3 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/cdda_interface.h.orig 2001-03-23 17:15:46.000000000 -0800 d5 1 a5 1 @@@@ -18,9 +18,19 @@@@ d22 4 d29 5 a33 5 @@@@ -33,6 +43,7 @@@@ typedef struct TOC { /* structure of tab #define GENERIC_SCSI 0 #define COOKED_IOCTL 1 #define TEST_INTERFACE 2 +#define OSX_IOKIT 3 d37 1 a37 1 @@@@ -47,13 +58,27 @@@@ typedef struct cdrom_drive{ a66 14 @@@@ -83,9 +108,13 @@@@ typedef struct cdrom_drive{ int is_mmc; /* SCSI command buffer and offset pointers */ +#if !defined(__FreeBSD__) && !defined(__DragonFly__) unsigned char *sg; unsigned char *sg_buffer; unsigned char inqbytes[4]; +#else + unsigned char *sg_buffer; +#endif /* Scsi parameters and state */ unsigned char density; @ 1.2 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-ch,v 1.1 2003/10/20 12:08:03 grant Exp $ d3 1 a3 1 --- interface/cdda_interface.h.orig 2001-03-24 12:15:46.000000000 +1100 d5 9 a13 1 @@@@ -21,6 +21,11 @@@@ d25 9 a33 1 @@@@ -47,13 +50,19 @@@@ typedef struct cdrom_drive{ d50 8 d63 1 a63 1 @@@@ -83,9 +94,13 @@@@ typedef struct cdrom_drive{ @ 1.1 log @files missed in last commit @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +#ifdef __FreeBSD__ d17 1 a17 2 @@@@ -46,14 +51,20 @@@@ typedef struct cdrom_drive{ a19 1 +#ifndef __FreeBSD__ d21 1 d43 1 a43 1 +#ifndef __FreeBSD__ @