head 1.5; access; symbols pkgsrc-2020Q1:1.4.0.30 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.52 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.48 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.46 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.44 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.42 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.40 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.38 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.36 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.34 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.32 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.28 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.26 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.24 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.22 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.20 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.18 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.16 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.14 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.12 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.10 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.8 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.6 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.4 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.2 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.3.0.20 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.18 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.16 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.14 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.12 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.10 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.8 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.6 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.2 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.46 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.44 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.42 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.40 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.38 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.34 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.32 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.30 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 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.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 2014.02.16.15.37.53; author wiedi; state Exp; branches; next 1.3; commitid M6E1tICECq488lpx; 1.3 date 2011.10.02.01.20.55; author dholland; 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.29; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.03.25.11.24.29; 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-ac,v 1.4 2014/02/16 15:37:53 wiedi Exp $ - netbsd/dragonfly/openbsd cdrom support - silence LP64 warnings; these seem to be ok Caution: part of the second hunk contains DEVOSSAUDIO to be substituted from the pkgsrc Makefile. Don't commit a presubstituted version of the patch by accident. --- audio_oss.c.orig 2000-12-09 11:12:15.000000000 +0000 +++ audio_oss.c @@@@ -12,11 +12,12 @@@@ #include #include #include -#ifndef __FreeBSD__ -#include +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__sun) +#include +#elif defined(__NetBSD__) || defined(__OpenBSD__) +#include #else -#include -#define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO +#include #endif #include "audio.h" @@@@ -42,12 +43,12 @@@@ int audio_oss_open(gpointer data) if (driver->descriptor==-1) { - driver->descriptor=open("/dev/dsp",O_WRONLY); + driver->descriptor=open("@@DEVOSSAUDIO@@",O_WRONLY); if (driver->descriptor!=-1) { int format_mask=0; - ioctl(driver->descriptor,SNDCTL_DSP_RESET); + ioctl(driver->descriptor,SNDCTL_DSP_RESET, 0); ioctl(driver->descriptor,SNDCTL_DSP_SPEED,&speed); ioctl(driver->descriptor,SNDCTL_DSP_CHANNELS,&channels); ioctl(driver->descriptor,SNDCTL_DSP_GETFMTS,&format_mask); @@@@ -73,7 +74,7 @@@@ int audio_oss_open(gpointer data) * little Endian (like all Soundblaster devices etc.) */ if (format==AFMT_S16_LE) { - driver->data=(gpointer)piping_create_function(stdfiletrack_byteswap, + driver->data=(gpointer)(intptr_t)piping_create_function(stdfiletrack_byteswap, NULL, &inp, &driver->descriptor, @@@@ -99,11 +100,11 @@@@ void audio_oss_close(gpointer data) close(driver->descriptor); driver->descriptor=-1; /* wait for byteswap to finish */ - if ((int)driver->data!=-1) + if ((int)(intptr_t)driver->data!=-1) { /* say good by, byteswap */ - kill((int)driver->data,SIGTERM); - waitpid((int)driver->data,&status,0); + kill((int)(intptr_t)driver->data,SIGTERM); + waitpid((int)(intptr_t)driver->data,&status,0); }; }; }; @ 1.4 log @include sys/soundcard.h on SunOS @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2011/10/02 01:20:55 dholland Exp $ @ 1.3 log @Fix trivial broken build. Then, fix extensive but straightforward LP64 issues reported by gcc. PKGREVISION -> 6. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2006/03/06 22:16:53 joerg Exp $ d18 1 a18 1 +#if defined(__FreeBSD__) || defined(__DragonFly__) @ 1.2 log @Don't hard-code /dev/sound or /dev/dsp, use DEVOSSAUDIO instead. Add DragonFly support. @ text @d1 8 a8 1 $NetBSD$ d44 24 @ 1.1 log @Initial revision @ text @d3 4 a6 3 --- audio_oss.c.orig Sat Dec 9 12:12:15 2000 +++ audio_oss.c Sat Mar 23 21:32:08 2002 @@@@ -13,7 +13,11 @@@@ d9 5 a13 2 #ifndef __FreeBSD__ +#ifdef __NetBSD__ a14 3 +#else #include +#endif d16 7 a22 3 #include #define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO @@@@ -42,12 +46,12 @@@@ d27 1 a27 1 + driver->descriptor=open("/dev/sound",O_WRONLY); @ 1.1.1.1 log @initial import of gnometoaster, another cd recording frontend @ text @@