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.70 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.68 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.66 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.64 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.60 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.58 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.56 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.54 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.52 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.50 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.48 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.46 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.44 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.42 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.40 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.38 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.36 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.34 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.32 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.30 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.28 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.26 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.24 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.22 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.20 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.18 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.16 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.14 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.12 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.10 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.8 pkgsrc-2010Q4-base:1.8 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.6.0.28 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.26 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.24 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.22 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.20 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.18 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.16 pkgsrc-2008Q1:1.6.0.14 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.12 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.10 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.8 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.6 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.4 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.2 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.4.0.14 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.12 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.10 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.8 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 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.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 pkgsrc-base:1.1.1.1 TNF:1.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 2010.03.26.16.38.32; author jdc; state Exp; branches; next 1.7; 1.7 date 2009.08.09.16.00.53; author drochner; state Exp; branches; next 1.6; 1.6 date 2006.09.03.17.13.30; author ben; state Exp; branches; next 1.5; 1.5 date 2006.03.07.06.29.03; author joerg; state Exp; branches; next 1.4; 1.4 date 2004.06.01.20.58.38; author shannonjr; 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 2000.01.28.07.18.38; author rh; 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.9 log @cdparanoia: fix build on FreeBSD Add comments to patches (not always relevant) to appease pkglint Bump revision @ text @$NetBSD: patch-cc,v 1.8 2010/03/26 16:38:32 jdc Exp $ Support for NetBSD. --- interface/utils.h.orig 2008-08-14 13:56:20.000000000 +0000 +++ interface/utils.h 2010-03-24 10:55:09.000000000 +0000 @@@@ -1,4 +1,23 @@@@ +#ifdef __linux__ #include +#endif +#ifdef __NetBSD__ +#include +#if __NetBSD_Version__ >= 104010000 +#include +#else +#include +#include +#endif +#include /* XXX */ +#elif defined(__FreeBSD__) || defined(__DragonFly__) +#include +#endif +#if defined(__APPLE__) && defined(__MACH__) +#include +#include +#define STDERR_FILENO 2 +#endif #include #include #include @@@@ -14,15 +33,35 @@@@ } static inline int32_t swap32(int32_t x){ +#ifdef __NetBSD__ + return bswap32(x); +#else +#if defined(__APPLE__) && defined(__MACH__) + return((((uint32_t)x & 0x000000ffU) << 24) | + (((uint32_t)x & 0x0000ff00U) << 8) | + (((uint32_t)x & 0x00ff0000U) >> 8) | + (((uint32_t)x & 0xff000000U) >> 24)); +#else return((((u_int32_t)x & 0x000000ffU) << 24) | (((u_int32_t)x & 0x0000ff00U) << 8) | (((u_int32_t)x & 0x00ff0000U) >> 8) | (((u_int32_t)x & 0xff000000U) >> 24)); +#endif +#endif } static inline int16_t swap16(int16_t x){ +#ifdef __NetBSD__ + return bswap16(x); +#else +#if defined(__APPLE__) && defined(__MACH__) + return((((uint16_t)x & 0x00ffU) << 8) | + (((uint16_t)x & 0xff00U) >> 8)); +#else return((((u_int16_t)x & 0x00ffU) << 8) | (((u_int16_t)x & 0xff00U) >> 8)); +#endif +#endif } #if BYTE_ORDER == LITTLE_ENDIAN @ 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 @d1 3 a3 1 $NetBSD$ @ 1.7 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 @d3 2 a4 2 --- interface/utils.h.orig 2008-08-14 15:56:20.000000000 +0200 +++ interface/utils.h d29 1 a29 1 @@@@ -14,15 +33,27 @@@@ static inline int bigendianp(void){ d33 3 d47 1 d51 3 d61 1 @ 1.6 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/utils.h.orig 2000-04-19 15:41:04.000000000 -0700 a56 32 @@@@ -112,6 +143,7 @@@@ static void cderror(cdrom_drive *d,const break; case CDDA_MESSAGE_FORGETIT: default: + break; } } } @@@@ -127,6 +159,7 @@@@ static void cdmessage(cdrom_drive *d,con break; case CDDA_MESSAGE_FORGETIT: default: + break; } } } @@@@ -169,6 +202,7 @@@@ static void idperror(int messagedest,cha break; case CDDA_MESSAGE_FORGETIT: default: + break; } } if(malloced)free(buffer); @@@@ -205,6 +239,7 @@@@ static void idmessage(int messagedest,ch break; case CDDA_MESSAGE_FORGETIT: default: + break; } } if(malloced)free(buffer); @ 1.5 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-cc,v 1.4 2004/06/01 20:58:38 shannonjr Exp $ d3 1 a3 1 --- interface/utils.h.orig 2000-04-19 16:41:04.000000000 -0600 d5 1 a5 1 @@@@ -1,4 +1,18 @@@@ d21 5 d29 29 a57 1 @@@@ -112,6 +126,7 @@@@ static void cderror(cdrom_drive *d,const d61 1 a61 1 + ; d65 1 a65 1 @@@@ -127,6 +142,7 @@@@ static void cdmessage(cdrom_drive *d,con d69 1 a69 1 + ; d73 1 a73 1 @@@@ -169,6 +185,7 @@@@ static void idperror(int messagedest,cha d77 1 a77 1 + ; d81 1 a81 1 @@@@ -205,6 +222,7 @@@@ static void idmessage(int messagedest,ch d85 1 a85 1 + ; @ 1.4 log @Re: PR 25727 audio/cdparanoia does not compile with gcc 3.4.0 The problem is that a switch statement has a default case with no statement. The fix is to add a null statement. Four instances of this problem were corrected. This closes the referenced PR. @ text @d1 1 a1 1 $NetBSD$ d18 1 a18 1 +#elif defined(__FreeBSD__) @ 1.3 log @merge some patches from FreeBSD ports. allows this to build on FreeBSD using the ATAPI/CAM subsystem. @ text @d3 1 a3 1 --- interface/utils.h.orig 2000-04-20 08:41:04.000000000 +1000 d24 32 @ 1.2 log @Make cdparanoia compile under NetBSD-1.4.x (pointed out by Eric Mumpower on the cdparanoia mailing list). @ text @d3 3 a5 3 --- interface/utils.h.orig Mon Aug 16 00:13:44 1999 +++ interface/utils.h Fri Jan 28 08:04:27 2000 @@@@ -1,4 +1,16 @@@@ d18 2 @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- interface/utils.h.orig Mon Aug 16 07:13:44 1999 +++ interface/utils.h Sat Jan 15 19:51:10 2000 @@@@ -1,4 +1,10 @@@@ d10 2 d13 4 @ 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 @@