head 1.5; access; symbols pkgsrc-2020Q1:1.4.0.50 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.72 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.68 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.66 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.64 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.62 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.60 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.58 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.56 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.54 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.52 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.48 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.46 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.44 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.42 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.40 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.38 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.36 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.34 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.32 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.30 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.28 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.26 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.24 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.22 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.20 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.18 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.16 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.14 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.12 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.10 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.8 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.6 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.2 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 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.1.1.0.26 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.24 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.22 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2020.05.15.12.18.03; author nia; state dead; branches; next 1.4; commitid p3lSejDZu12GJk8C; 1.4 date 2011.10.02.01.20.55; author dholland; state Exp; branches; next 1.3; 1.3 date 2006.05.21.23.02.29; author wiz; state Exp; branches; next 1.2; 1.2 date 2006.03.06.22.16.53; author joerg; state Exp; branches; next 1.1; 1.1 date 2002.03.25.11.24.28; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.03.25.11.24.28; author drochner; state Exp; branches; next ; desc @@ 1.5 log @sysutils: Remove gnometoaster This has been "early alpha" since 2005 and is now unique to pkgsrc @ text @$NetBSD: patch-aa,v 1.4 2011/10/02 01:20:55 dholland Exp $ - netbsd/dragonfly cdrom support - fix LP64 problems --- cdromlow.c.orig 2001-10-27 09:23:21.000000000 +0000 +++ cdromlow.c @@@@ -9,7 +9,7 @@@@ #include #include #include -#if !defined( __FreeBSD__) && !defined(__svr4__ ) +#if !defined( __FreeBSD__) && !defined(__svr4__ ) && !defined(__NetBSD__) && !defined(__DragonFly__) # include #else # include @@@@ -37,7 +37,7 @@@@ /* we provide some macro mappings here. FreeBSD structs are a bit * different to those used by Linux so we will use macros to compensate that */ -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* Needed by FreeBSD */ # define CDROM_DATA_TRACK 4 @@@@ -46,19 +46,35 @@@@ # define CD_FRAMESIZE_RAW 2352 # define CDROM_LBA CD_LBA_FORMAT # define CDROMREADTOCHDR CDIOREADTOCHEADER +#ifdef __NetBSD__ +# define CDROMREADTOCENTRY CDIOREADTOCENTRIES +#else # define CDROMREADTOCENTRY CDIOREADTOCENTRY +#endif # define cdromlow_definecdromheader struct ioc_toc_header +#ifdef __NetBSD__ +# define cdromlow_definecdromhentry struct ioc_read_toc_entry +#else # define cdromlow_definecdromhentry struct ioc_read_toc_single_entry +#endif /* referencing the TOC header */ # define cdromlow_tochdr_firstt starting_track # define cdromlow_tochdr_lastt ending_track /* referencing TOC entries */ +#ifdef __NetBSD__ +# define cdromlow_tocent_track starting_track +#else # define cdromlow_tocent_track track +#endif # define cdromlow_tocent_format address_format +#ifdef __NetBSD__ +# define cdromlow_tocent_addr data->addr +#else # define cdromlow_tocent_addr entry.addr +#endif #elif __svr4__ # define CD_FRAMESIZE 2048 # define CD_FRAMESIZE_RAW 2352 @@@@ -94,15 +110,14 @@@@ #define CDROMLOW_MAXCDTEXTOUT 16384 -typedef struct +struct cdromlow_tochandle { char *cdda2wavoutput; char *devicename; int filedescriptor; -} -cdromlow_tochandle; +}; -int cdromlow_gettochandle(const char *device) +cdromlow_tochandle *cdromlow_gettochandle(const char *device) { cdromlow_tochandle *handle=(cdromlow_tochandle*)malloc(sizeof(cdromlow_tochandle)); /* no cd text output is generated until needed */ @@@@ -112,12 +127,11 @@@@ int cdromlow_gettochandle(const char *de #ifdef DEBUG printf("cdromlow_gettochandle result is %i\n",(int)handle); #endif - return (int)handle; + return handle; }; -void cdromlow_closetochandle(int handle) +void cdromlow_closetochandle(cdromlow_tochandle *info) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; /* free cd text output if it was generated */ if (info->cdda2wavoutput) free (info->cdda2wavoutput); @@@@ -130,14 +144,18 @@@@ void cdromlow_closetochandle(int handle) /* reimplemented using direct cdrom access: * does the current cd have one or more data tracks ? * * returns -1 or data track of cd */ -int cdromlow_hasdatatrack(int handle) +int cdromlow_hasdatatrack(cdromlow_tochandle *info) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; cdromlow_definecdromheader header; cdromlow_definecdromhentry entry; int x; int hasdatatrack=-1; +#ifdef __NetBSD__ + struct cd_toc_entry entrydata; + entry.data = &entrydata; + entry.data_len = sizeof(entrydata); +#endif if (info->filedescriptor!=-1) { @@@@ -147,8 +165,12 @@@@ int cdromlow_hasdatatrack(int handle) entry.cdromlow_tocent_track=x; entry.cdromlow_tocent_format=CDROM_LBA; ioctl(info->filedescriptor,CDROMREADTOCENTRY,&entry); -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__DragonFly__) +#ifdef __NetBSD__ + if (entry.data->control & CDROM_DATA_TRACK) +#else if (entry.cdte_ctrl&CDROM_DATA_TRACK) +#endif #else if (entry.entry.control & CDROM_DATA_TRACK) #endif @@@@ -166,9 +188,8 @@@@ int cdromlow_hasdatatrack(int handle) ; /* return number of tracks on cd,reimplemented using ioctl()s */ -int cdromlow_tracks(int handle) +int cdromlow_tracks(cdromlow_tochandle *info) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; cdromlow_definecdromheader header; int tracknum; @@@@ -186,16 +207,20 @@@@ int cdromlow_tracks(int handle) ; /* returns the offset of a track's starting position in LBA format */ -int cdromlow_trackoffset(int handle,int num) +int cdromlow_trackoffset(cdromlow_tochandle *info,int num) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; cdromlow_definecdromhentry entry; int offset=-1; +#ifdef __NetBSD__ + struct cd_toc_entry entrydata; + entry.data = &entrydata; + entry.data_len = sizeof(entrydata); +#endif if (info->filedescriptor!=-1) { /* Return offset of leadout if track > last track is requested */ - if (num>cdromlow_tracks(handle)) + if (num>cdromlow_tracks(info)) entry.cdromlow_tocent_track=CDROM_LEADOUT; else entry.cdromlow_tocent_track=num; @@@@ -216,13 +241,19 @@@@ int cdromlow_trackoffset(int handle,int ; /* return tracksize of track num in sectors (LBA) */ -int cdromlow_tracksize_sectors(int handle,int num) +int cdromlow_tracksize_sectors(cdromlow_tochandle *info,int num) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; cdromlow_definecdromhentry track; cdromlow_definecdromhentry tracknext; int tracksize; int ok=1; +#ifdef __NetBSD__ + struct cd_toc_entry trackdata, tracknextdata; + track.data = &trackdata; + track.data_len = sizeof(trackdata); + tracknext.data = &tracknextdata; + tracknext.data_len = sizeof(tracknextdata); +#endif tracksize=0; if (info->filedescriptor!=-1) @@@@ -232,7 +263,7 @@@@ int cdromlow_tracksize_sectors(int handl if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1) ok=0; - if (num==cdromlow_tracks(handle)) + if (num==cdromlow_tracks(info)) tracknext.cdromlow_tocent_track=CDROM_LEADOUT; else tracknext.cdromlow_tocent_track=num+1; @@@@ -251,14 +282,14 @@@@ int cdromlow_tracksize_sectors(int handl ; /* return tracksize for audiotrack n in bytes,reimplemented using ioctl()s */ -int cdromlow_tracksize(int handle,int num) +int cdromlow_tracksize(cdromlow_tochandle *handle,int num) { return cdromlow_tracksize_sectors(handle,num)*CD_FRAMESIZE_RAW; } ; /* return tracksize of datatrack in bytes,reimplemented using ioctl()s */ -int cdromlow_datatracksize(int handle,int tracknum) +int cdromlow_datatracksize(cdromlow_tochandle *handle,int tracknum) { if (cdromlow_hasdatatrack(handle)!=-1) return cdromlow_tracksize_sectors(handle, @@@@ -270,14 +301,17 @@@@ int cdromlow_datatracksize(int handle,in ; /* return cddb number of cdrom */ -int cdromlow_cddbnumber(int handle) +int cdromlow_cddbnumber(cdromlow_tochandle *info) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; - cdromlow_definecdromheader header; cdromlow_definecdromhentry entry; int x,secs; int cddbnum=0; +#ifdef __NetBSD__ + struct cd_toc_entry entrydata; + entry.data = &entrydata; + entry.data_len = sizeof(entrydata); +#endif cddbnum=0; if (info->filedescriptor!=-1) @@@@ -311,12 +345,16 @@@@ int cdromlow_cddbnumber(int handle) ; /* return the tracktype of specified track */ -cdromlow_tracktype cdromlow_gettracktype(int handle,int num) +cdromlow_tracktype cdromlow_gettracktype(cdromlow_tochandle *info,int num) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; cdromlow_definecdromhentry track; int ok=1; cdromlow_tracktype result=TRACKTYPE_UNKNOWN; +#ifdef __NetBSD__ + struct cd_toc_entry trackdata; + track.data = &trackdata; + track.data_len = sizeof(trackdata); +#endif if (info->filedescriptor!=-1) { @@@@ -324,8 +362,12 @@@@ cdromlow_tracktype cdromlow_gettracktype track.cdromlow_tocent_format=CDROM_LBA; if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1) ok=0; -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__DragonFly__) +#ifdef __NetBSD__ + if (track.data->control & CDROM_DATA_TRACK) +#else if (track.cdte_ctrl&CDROM_DATA_TRACK) +#endif #else if (track.entry.control & CDROM_DATA_TRACK) #endif @@@@ -338,9 +380,8 @@@@ cdromlow_tracktype cdromlow_gettracktype } ; -void cdromlow_createcdtextoutput(int handle) +void cdromlow_createcdtextoutput(cdromlow_tochandle *info) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; if (!info->cdda2wavoutput) { char *call=varman_getvar_copy(global_defs, @@@@ -362,13 +403,12 @@@@ void cdromlow_createcdtextoutput(int han }; }; -char *cdromlow_getcdtext(int handle, int num,const char *parse) +char *cdromlow_getcdtext(cdromlow_tochandle *info, int num,const char *parse) { - cdromlow_tochandle *info=(cdromlow_tochandle*)handle; char buffer[256]; char *func=(char*)malloc(((parse)?strlen(parse):0)+11); - cdromlow_createcdtextoutput(handle); + cdromlow_createcdtextoutput(info); strcpy(buffer,""); strcpy(func,((parse)?parse:"")); @@@@ -390,22 +430,22 @@@@ char *cdromlow_getcdtext(int handle, int return (strlen(buffer)?strdup(buffer):NULL); }; -char *cdromlow_gettitle(int handle,int num) +char *cdromlow_gettitle(cdromlow_tochandle *handle,int num) { return cdromlow_getcdtext(handle,num,varman_getvar(global_defs,"audiotrack_parsecdtext_title")); }; -char *cdromlow_getperformer(int handle,int num) +char *cdromlow_getperformer(cdromlow_tochandle *handle,int num) { return cdromlow_getcdtext(handle,num,varman_getvar(global_defs,"audiotrack_parsecdtext_performer")); }; -char *cdromlow_getdisctitle(int handle) +char *cdromlow_getdisctitle(cdromlow_tochandle *handle) { return cdromlow_getcdtext(handle,0,varman_getvar(global_defs,"audiotrack_parsecdtext_cdtitle")); }; -char *cdromlow_getdiscperformer(int handle) +char *cdromlow_getdiscperformer(cdromlow_tochandle *handle) { return cdromlow_getcdtext(handle,0,varman_getvar(global_defs,"audiotrack_parsecdtext_cdperformer")); }; @ 1.4 log @Fix trivial broken build. Then, fix extensive but straightforward LP64 issues reported by gcc. PKGREVISION -> 6. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $ @ 1.3 log @Regen symmetrically for GNU patch (found in irix bulk build). @ text @d1 4 a4 1 $NetBSD: patch-aa,v 1.2 2006/03/06 22:16:53 joerg Exp $ d62 44 a105 1 @@@@ -138,6 +154,11 @@@@ int cdromlow_hasdatatrack(int handle) d117 1 a117 1 @@@@ -147,8 +168,12 @@@@ int cdromlow_hasdatatrack(int handle) d131 19 a149 2 @@@@ -191,6 +216,11 @@@@ int cdromlow_trackoffset(int handle,int cdromlow_tochandle *info=(cdromlow_tochandle*)handle; d160 15 a174 1 @@@@ -223,6 +253,13 @@@@ int cdromlow_tracksize_sectors(int handl d188 36 a223 1 @@@@ -278,6 +315,11 @@@@ int cdromlow_cddbnumber(int handle) d235 8 a242 1 @@@@ -317,6 +359,11 @@@@ cdromlow_tracktype cdromlow_gettracktype d254 1 a254 1 @@@@ -324,8 +371,12 @@@@ cdromlow_tracktype cdromlow_gettracktype d268 54 @ 1.2 log @Don't hard-code /dev/sound or /dev/dsp, use DEVOSSAUDIO instead. Add DragonFly support. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ d3 2 a4 2 --- cdromlow.c.orig Sat Mar 23 19:48:00 2002 +++ cdromlow.c Sat Mar 23 20:10:30 2002 d59 1 a59 1 @@@@ -138,6 +154,11 @@@@ d71 2 a72 1 @@@@ -148,7 +169,11 @@@@ d85 1 a85 1 @@@@ -191,6 +216,11 @@@@ d97 1 a97 1 @@@@ -223,6 +253,13 @@@@ d111 1 a111 1 @@@@ -278,6 +315,11 @@@@ d123 1 a123 1 @@@@ -317,6 +359,11 @@@@ d135 2 a136 1 @@@@ -325,7 +372,11 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +#if !defined( __FreeBSD__) && !defined(__svr4__ ) && !defined(__NetBSD__) d19 1 a19 1 +#if defined(__FreeBSD__) || defined(__NetBSD__) d74 2 a75 1 #ifndef __FreeBSD__ d137 2 a138 1 #ifndef __FreeBSD__ @ 1.1.1.1 log @initial import of gnometoaster, another cd recording frontend @ text @@