head 1.11; access; symbols pkgsrc-2026Q1:1.11.0.62 pkgsrc-2026Q1-base:1.11 pkgsrc-2025Q4:1.11.0.60 pkgsrc-2025Q4-base:1.11 pkgsrc-2025Q3:1.11.0.58 pkgsrc-2025Q3-base:1.11 pkgsrc-2025Q2:1.11.0.56 pkgsrc-2025Q2-base:1.11 pkgsrc-2025Q1:1.11.0.54 pkgsrc-2025Q1-base:1.11 pkgsrc-2024Q4:1.11.0.52 pkgsrc-2024Q4-base:1.11 pkgsrc-2024Q3:1.11.0.50 pkgsrc-2024Q3-base:1.11 pkgsrc-2024Q2:1.11.0.48 pkgsrc-2024Q2-base:1.11 pkgsrc-2024Q1:1.11.0.46 pkgsrc-2024Q1-base:1.11 pkgsrc-2023Q4:1.11.0.44 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.42 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.40 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.11.0.38 pkgsrc-2023Q1-base:1.11 pkgsrc-2022Q4:1.11.0.36 pkgsrc-2022Q4-base:1.11 pkgsrc-2022Q3:1.11.0.34 pkgsrc-2022Q3-base:1.11 pkgsrc-2022Q2:1.11.0.32 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.30 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.28 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.26 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.24 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.22 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.20 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.18 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.16 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.12 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.14 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.10 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.8 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.6 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.4 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.2 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.10.0.40 pkgsrc-2018Q2-base:1.10 pkgsrc-2018Q1:1.10.0.38 pkgsrc-2018Q1-base:1.10 pkgsrc-2017Q4:1.10.0.36 pkgsrc-2017Q4-base:1.10 pkgsrc-2017Q3:1.10.0.34 pkgsrc-2017Q3-base:1.10 pkgsrc-2017Q2:1.10.0.30 pkgsrc-2017Q2-base:1.10 pkgsrc-2017Q1:1.10.0.28 pkgsrc-2017Q1-base:1.10 pkgsrc-2016Q4:1.10.0.26 pkgsrc-2016Q4-base:1.10 pkgsrc-2016Q3:1.10.0.24 pkgsrc-2016Q3-base:1.10 pkgsrc-2016Q2:1.10.0.22 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.20 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.18 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.16 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.14 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.12 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.10.0.10 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.10.0.8 pkgsrc-2014Q3-base:1.10 pkgsrc-2014Q2:1.10.0.6 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.10.0.4 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.2 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.9.0.24 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.22 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.20 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.18 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.16 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.14 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.12 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.10 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.8 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.6 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.4 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.2 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.8.0.6 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.4 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.2 pkgsrc-2010Q1-base:1.8 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.4.0.28 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.26 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.24 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.22 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.20 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.18 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.16 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 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.11 date 2018.09.27.15.29.06; author triaxx; state Exp; branches; next 1.10; commitid XAIjiOr0UyKxWKTA; 1.10 date 2013.12.12.16.41.32; author jperkin; state Exp; branches; next 1.9; commitid lQNU6i8bUcN6BRgx; 1.9 date 2010.12.16.04.55.46; author chuck; state Exp; branches; next 1.8; 1.8 date 2010.03.26.16.38.32; author jdc; 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.14.15.51.06; author drochner; state Exp; branches; next 1.5; 1.5 date 2009.08.09.16.00.53; author drochner; state Exp; branches; next 1.4; 1.4 date 2006.09.03.17.13.30; author ben; state Exp; branches; next 1.3; 1.3 date 2006.05.14.21.31.01; author minskim; 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.11 log @cdparanoia: fix build on FreeBSD Add comments to patches (not always relevant) to appease pkglint Bump revision @ text @$NetBSD: patch-ci,v 1.10 2013/12/12 16:41:32 jperkin Exp $ Support for MacOS. --- interface/interface.c.orig 2008-09-11 10:43:52.000000000 +0000 +++ interface/interface.c @@@@ -35,6 +35,10 @@@@ int cdda_close(cdrom_drive *d){ _clean_messages(d); if(d->cdda_device_name)free(d->cdda_device_name); +#if !defined(__FreeBSD__) +#if defined(__APPLE__) && defined(__MACH__) + if(d->fd != -1) close(d->fd); +#else if(d->ioctl_device_name)free(d->ioctl_device_name); if(d->drive_model)free(d->drive_model); if(d->cdda_fd!=-1)close(d->cdda_fd); @@@@ -43,6 +47,19 @@@@ int cdda_close(cdrom_drive *d){ if(d->private->sg_hd)free(d->private->sg_hd); free(d->private); } +#endif +#else + if(d->drive_model) + free(d->drive_model); + if(d->ccb) + cam_freeccb(d->ccb); + if(d->dev) + cam_close_device(d->dev); + if(d->private->sg_buffer) + free(d->private->sg_buffer); + if(d->ioctl_fd != -1) + close(d->ioctl_fd); +#endif free(d); } @@@@ -55,22 +72,32 @@@@ int cdda_open(cdrom_drive *d){ if(d->opened)return(0); switch(d->interface){ +#if defined(__APPLE__) && defined(__MACH__) + case OSX_IOKIT: + if((ret=osx_open_device(d))) + return ret; + break; +#elif defined(__sun) +#else case SGIO_SCSI_BUGGY1: case SGIO_SCSI: case GENERIC_SCSI: if((ret=scsi_init_drive(d))) return(ret); break; +#if !defined(__NetBSD__) && !defined(__sun) case COOKED_IOCTL: if((ret=cooked_init_drive(d))) return(ret); break; +#endif #ifdef CDDA_TEST case TEST_INTERFACE: if((ret=test_init_drive(d))) return(ret); break; #endif +#endif default: cderror(d,"100: Interface not supported\n"); return(-100); @@@@ -113,7 +140,7 @@@@ long cdda_read_timed(cdrom_drive *d, voi if(sectors>0){ sectors=d->read_audio(d,buffer,beginsector,sectors); - if(sectors>0){ + if(sectors>0 && buffer != NULL){ /* byteswap? */ if(d->bigendianp==-1) /* not determined yet */ d->bigendianp=data_bigendianp(d); @@@@ -127,7 +154,9 @@@@ long cdda_read_timed(cdrom_drive *d, voi } } } - if(ms)*ms=d->private->last_milliseconds; + if(ms) { + *ms = (d->private == NULL) ? 0 : d->private->last_milliseconds; + } return(sectors); } @ 1.10 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-ci,v 1.9 2010/12/16 04:55:46 chuck Exp $ @ 1.9 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 3 a5 3 --- interface/interface.c.orig 2008-09-11 06:43:52.000000000 -0400 +++ interface/interface.c 2010-12-15 23:41:29.000000000 -0500 @@@@ -35,6 +35,10 @@@@ d16 1 a16 1 @@@@ -43,6 +47,19 @@@@ d36 1 a36 1 @@@@ -55,22 +72,31 @@@@ d45 1 d53 1 a53 1 +#ifndef __NetBSD__ d69 1 a69 1 @@@@ -113,7 +139,7 @@@@ d78 1 a78 1 @@@@ -127,7 +153,9 @@@@ @ 1.8 log @patch-ad: fix an #endif versus #else error patch-cc: adds NetBSD bswap* to interface/utils.h as per utils.h patch-ci: fix a crash on big-endian machines @ text @d3 2 a4 2 --- interface/interface.c.orig 2008-09-11 10:43:52.000000000 +0000 +++ interface/interface.c 2010-03-24 13:57:38.000000000 +0000 d77 11 @ 1.7 log @Make it just build on DragonFly. Doesn't work yet though. @ text @d1 1 a1 1 $NetBSD: patch-ci,v 1.6 2009/08/14 15:51:06 drochner Exp $ d3 3 a5 3 --- interface/interface.c.orig 2008-09-11 13:43:52 +0300 +++ interface/interface.c 2009-08-26 09:57:44 +0300 @@@@ -35,6 +35,10 @@@@ int cdda_close(cdrom_drive *d){ d16 1 a16 1 @@@@ -43,6 +47,19 @@@@ int cdda_close(cdrom_drive *d){ d36 1 a36 1 @@@@ -55,22 +72,31 @@@@ int cdda_open(cdrom_drive *d){ d68 9 @ 1.6 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 2 a4 2 --- interface/interface.c.orig 2008-09-11 12:43:52.000000000 +0200 +++ interface/interface.c d9 1 a9 1 +#if !defined(__FreeBSD__) && !defined(__DragonFly__) d28 2 a29 2 + if(d->sg_buffer) + free(d->sg_buffer); @ 1.5 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 @d36 1 a36 1 @@@@ -55,6 +72,12 @@@@ int cdda_open(cdrom_drive *d){ d49 12 a60 1 @@@@ -71,6 +94,7 @@@@ int cdda_open(cdrom_drive *d){ @ 1.4 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/interface.c.orig 2000-04-19 15:41:04.000000000 -0700 d5 1 a5 1 @@@@ -30,12 +30,29 @@@@ int cdda_close(cdrom_drive *d){ d16 4 a19 3 if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); if(d->sg)free(d->sg); - d33 1 a33 1 + d36 1 a36 2 return(0); @@@@ -47,6 +64,12 @@@@ int cdda_open(cdrom_drive *d){ d46 2 d49 1 a49 3 if((ret=scsi_init_drive(d))) return(ret); @@@@ -61,6 +84,7 @@@@ int cdda_open(cdrom_drive *d){ @ 1.3 log @Regen patch-ci so that it can be applied with GNU patch. @ text @d3 1 a3 1 --- interface/interface.c.orig 2000-04-19 22:41:04.000000000 +0000 d5 1 a5 1 @@@@ -30,12 +30,25 @@@@ int cdda_close(cdrom_drive *d){ d10 3 d19 1 d36 21 @ 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-ci,v 1.1 2003/10/20 12:08:03 grant Exp $ d3 1 a3 1 --- interface/interface.c.orig 2000-04-20 08:41:04.000000000 +1000 d5 1 a5 2 @@@@ -29,13 +29,26 @@@@ int cdda_close(cdrom_drive *d){ d->enable_cdda(d,0); @ 1.1 log @files missed in last commit @ text @d1 1 a1 1 $NetBSD$ a8 1 +#ifndef __FreeBSD__ d10 1 @