head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.186 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.184 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.182 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.180 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.178 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.176 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.174 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.172 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.170 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.168 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.166 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.164 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.162 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.160 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.158 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.156 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.154 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.152 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.150 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.148 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.146 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.144 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.142 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.138 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.118 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.140 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.136 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.134 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.132 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.130 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.128 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.126 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.124 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.122 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.120 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.116 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.114 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.112 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.110 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.108 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.106 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.104 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.102 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.100 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.98 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.96 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.94 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.92 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.90 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.88 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.86 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.84 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.82 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.80 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.78 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.76 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.74 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.72 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.70 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.68 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.66 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.64 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.62 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.60 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.58 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.56 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.54 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.52 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.50 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.48 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.46 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.44 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.42 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.40 pkgsrc-2008Q1:1.8.0.38 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.36 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.34 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.32 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.30 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.28 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.26 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.24 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.22 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.20 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.18 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.16 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.14 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.12 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.10 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.8 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.6 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.4 pkgsrc-2003Q4-base:1.8 netbsd-1-6-1:1.8.0.2 netbsd-1-6-1-base:1.8 netbsd-1-6:1.7.0.8 netbsd-1-6-RELEASE-base:1.7 pkgviews:1.7.0.4 pkgviews-base:1.7 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.4 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.3 FreeBSD-97-10-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.8 date 2002.10.08.12.30.57; author jlam; state Exp; branches; next 1.7; 1.7 date 2001.07.14.12.55.09; author agc; state Exp; branches; next 1.6; 1.6 date 2000.11.02.14.24.32; author mjl; state Exp; branches; next 1.5; 1.5 date 2000.09.19.11.09.21; author fredb; state Exp; branches; next 1.4; 1.4 date 98.08.07.10.36.22; author agc; state Exp; branches; next 1.3; 1.3 date 97.11.08.21.57.17; author augustss; state Exp; branches; next 1.2; 1.2 date 97.10.29.00.40.36; author augustss; state Exp; branches; next 1.1; 1.1 date 97.10.28.23.19.29; author augustss; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.28.23.19.29; author augustss; state Exp; branches; next ; desc @@ 1.8 log @Use buildlink2 and make this work with audio/oss installed. @ text @$NetBSD: patch-aa,v 1.7 2001/07/14 12:55:09 agc Exp $ --- Imakefile.orig Sun Jul 14 19:48:56 1996 +++ Imakefile Fri Oct 24 23:34:17 1997 @@@@ -43,7 +43,7 @@@@ * #include "Motif.tmpl" * #include "Motif.rules" */ -LOCAL_LIBRARIES= XmClientLibs +LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs ${LIBOSSAUDIO} /* @ 1.7 log @Make this compile and link with buildlink @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2000/11/02 14:24:32 mjl Exp $ d10 1 a10 1 +LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs -lossaudio @ 1.6 log @Split patches for different files into separate patch files. Use imake's XmClientLibs instead of handcoded libs. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2000/09/19 11:09:21 fredb Exp $ d3 2 a4 2 --- ../xmmix-1.2/Imakefile Sun Jul 14 19:48:56 1996 +++ ./Imakefile Fri Oct 24 23:34:17 1997 d10 1 a10 1 +LOCAL_LIBRARIES= XmClientLibs -lossaudio @ 1.5 log @Sliders go from 0 to 255 on NetBSD, not 0 to 100. Correct spelling -- non-existent widget type was making the "-debug" output unreadable. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 1998/08/07 10:36:22 agc Exp $ d10 1 a10 1 +LOCAL_LIBRARIES= -lXm -lXt -lX11 -lossaudio a13 48 --- ../xmmix-1.2/appenv.h Sun Jul 14 19:48:59 1996 +++ ./appenv.h Fri Oct 24 23:33:47 1997 @@@@ -59,7 +59,13 @@@@ #include #include #include +#ifdef __NetBSD__ +#include +/* Ensure we SIGIO */ +#undef _POSIX_SOURCE +#else #include +#endif #include #include #include --- ../xmmix-1.2/main.c Thu Nov 7 17:01:43 1996 +++ ./main.c Mon Aug 11 23:12:51 1997 @@@@ -159,7 +159,7 @@@@ post_realize_config(&widgets); /* Register callback routines */ - register_callbacks(&widgets); + register_callbacks(&widgets, app); /* Initialize screen controls */ mx_start(&widgets); --- ../xmmix-1.2/mixer.h Sun Jul 14 19:49:04 1996 +++ ./mixer.h Mon Aug 11 23:19:17 1997 @@@@ -78,6 +78,7 @@@@ extern void mx_fsok_btn(Widget, XtPointer, XtPointer); extern void mx_fscancel_btn(Widget, XtPointer, XtPointer); extern void mx_focuschg(Widget, XtPointer, XtPointer); +extern void mx_change(XtPointer); #endif /* __MIXER_H__ */ --- ../xmmix-1.2/widget.h Sun Jul 14 19:49:10 1996 +++ ./widget.h Mon Aug 11 23:13:43 1997 @@@@ -119,7 +119,7 @@@@ extern void widget_init(widgets_t *); extern void create_widgets(widgets_t *); extern void post_realize_config(widgets_t *); -extern void register_callbacks(widgets_t *); +extern void register_callbacks(widgets_t *, XtAppContext); #endif /* __WIDGET_H__ */ @ 1.4 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ a40 77 --- ../xmmix-1.2/mixer.c Thu Nov 7 17:00:26 1996 +++ ./mixer.c Mon Aug 11 23:20:15 1997 @@@@ -104,6 +104,14 @@@@ ***********************/ +#ifdef __NetBSD__ +void +mxchg(int sig) +{ + deliverSIGIO(); +} +#endif + /* * do_ioctl * Perform ioctl command. If file is not yet open or if we @@@@ -681,11 +689,13 @@@@ /* Query sound driver version */ if ((fp = fopen("/dev/sndstat", "r")) == NULL) { if (!app_data.demo) { +#ifndef __NetBSD__ fprintf(errfp, "%s: %s: %s\n", PROGNAME, "Cannot open /dev/sndstat", "assuming pre-3.0 sound driver."); maxdevs = MAXDEVS_V2; +#endif } return; } @@@@ -915,6 +925,7 @@@@ mx_start(widgets_t *m) { char msg[256]; + int one = 1; if (app_data.autoload != NULL && app_data.autoload[0] != '\0' && strcmp(app_data.autoload, "/dev/null") != 0) { @@@@ -930,6 +941,14 @@@@ } } +#if defined(__NetBSD__) + signal(SIGIO, mxchg); + ioctl(dev_fd, FIOASYNC, &one); +#endif + + /* Query hardware mixer settings */ + mx_queryhw(&widgets); + /* Update screen controls to match current status */ mx_updctl(m); } @@@@ -1531,6 +1550,22 @@@@ if (p->reason != XmCR_FOCUS || form == (Widget) NULL) return; + /* Query hardware mixer settings */ + mx_queryhw(&widgets); + + /* Update screen controls */ + mx_updctl(&widgets); +} + + +/* + * mx_change + * Mixer device has changed + */ +/*ARGSUSED*/ +void +mx_change(XtPointer client_data) +{ /* Query hardware mixer settings */ mx_queryhw(&widgets); a50 38 --- ../xmmix-1.2/widget.c Sun Jul 14 19:49:09 1996 +++ ./widget.c Sat Oct 25 00:24:43 1997 @@@@ -973,6 +973,10 @@@@ delw = XmInternAtom(display, "WM_DELETE_WINDOW", False); } +static XtSignalId sigid; +void deliverSIGIO() { + XtNoticeSignal(sigid); +} /* * register_callbacks @@@@ -985,7 +989,7 @@@@ * Nothing */ void -register_callbacks(widgets_t *m) +register_callbacks(widgets_t *m, XtAppContext app) { int i; @@@@ -1126,6 +1130,15 @@@@ XmNfocusCallback, (XtCallbackProc) mx_focuschg, (XtPointer) m->form ); + +#ifdef __NetBSD__ + /* + * Mixer SIGIO change callback + */ + sigid = XtAppAddSignal(app, + (XtSignalCallbackProc) mx_change, (XtPointer) 0 + ); +#endif /* * Install WM_DELETE_WINDOW handler @ 1.3 log @Make sure SIGIO gets defined. @ text @d1 2 @ 1.2 log @Change from the FreeBSD port to my port. @ text @d14 1 a14 1 @@@@ -59,7 +59,11 @@@@ d20 2 @ 1.1 log @Initial revision @ text @d1 14 a14 3 --- ./appenv.h.org Sun Jul 14 10:48:59 1996 +++ ./appenv.h Mon Aug 19 04:05:16 1996 @@@@ -59,7 +59,7 @@@@ d18 5 a22 2 -#include +#include d26 113 a138 5 --- ./Imakefile.org Sun Jul 14 10:48:56 1996 +++ ./Imakefile Mon Aug 19 04:09:48 1996 @@@@ -43,7 +43,7 @@@@ * #include "Motif.tmpl" * #include "Motif.rules" d140 30 a169 2 -LOCAL_LIBRARIES= XmClientLibs +LOCAL_LIBRARIES= ${MOTIFLIB} ${XTOOLLIB} ${XLIB} d171 1 a172 1 /* @ 1.1.1.1 log @Initial import of FreeBSD audio packages. @ text @@