head 1.8; access; symbols pkgsrc-2019Q2:1.7.0.62 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.60 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.58 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.56 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.54 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.52 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.50 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.48 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.44 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.42 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.40 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.38 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.36 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.34 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.32 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.30 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.28 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.26 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.24 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.22 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.20 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.18 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.16 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.14 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.12 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.10 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.8 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.6 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.4 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.2 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.2 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.4.0.74 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.72 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.70 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.68 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.66 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.64 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.62 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.60 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.58 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.56 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.54 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.52 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.50 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.48 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.46 pkgsrc-2008Q1:1.4.0.44 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.42 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.40 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.38 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.36 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.34 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.32 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.30 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.28 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.26 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.24 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.22 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.20 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 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.2 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.8 date 2019.07.16.10.46.45; author micha; state dead; branches; next 1.7; commitid R7wgO0DX2AEXZfvB; 1.7 date 2012.02.06.03.16.15; author sbd; state Exp; branches; next 1.6; 1.6 date 2012.01.12.21.13.17; author hans; state Exp; branches; next 1.5; 1.5 date 2011.09.04.22.17.41; author dholland; state Exp; branches; next 1.4; 1.4 date 99.02.10.14.55.33; author frueauf; state Exp; branches; next 1.3; 1.3 date 99.01.17.20.07.28; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.36.21; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.30.00.30.25; author augustss; state Exp; branches; next ; desc @@ 1.8 log @xmix: Failed to build with RELRO option - Honor LDFLAGS - Bump PKGREVISION @ text @$NetBSD: patch-ab,v 1.7 2012/02/06 03:16:15 sbd Exp $ - support more OSes (is the first hunk actually correct?) - fix void main - remove debug printout --- xmix.c.orig 2012-02-06 03:11:54.306900057 +0000 +++ xmix.c @@@@ -77,7 +77,16 @@@@ to Rick! I'll call this version V2.1 #include "square_empty.bit" #include "square_with_x.bit" +#if defined(__linux__) #include +#elif defined(__NetBSD__) +#include +#include +#elif defined(__sun) +#include +#else +#include +#endif #define SOUND_FULL_SCALE 100.0 #define MAX_SOUND_VOL 95 @@@@ -450,7 +459,7 @@@@ static void set_supported(VolumeControl } -void main (int argc, char **argv) +int main (int argc, char **argv) { XtAppContext app_context; int scroll_sep, longway; @@@@ -742,7 +751,7 @@@@ void main (int argc, char **argv) mic.locked = 0; reclvl.locked = 0; - printf("supported = 0x%x\n",supported); + /*printf("supported = 0x%x\n",supported);*/ set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0); set_supported(&bass,(supported & SOUND_MASK_BASS) != 0); set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0); @ 1.7 log @Include on Linux. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2012/01/12 21:13:17 hans Exp $ @ 1.6 log @Fix build on SunOS. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2011/09/04 22:17:41 dholland Exp $ d7 1 a7 1 --- xmix.c.orig 2011-09-04 22:12:45.000000000 +0000 d9 1 a9 1 @@@@ -77,7 +77,14 @@@@ to Rick! I'll call this version V2.1 d13 3 a15 2 -#include +#ifdef __NetBSD__ d26 1 a26 1 @@@@ -450,7 +457,7 @@@@ static void set_supported(VolumeControl d35 1 a35 1 @@@@ -742,7 +749,7 @@@@ void main (int argc, char **argv) @ 1.5 log @void main @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 1999/02/10 14:55:33 frueauf Exp $ d9 1 a9 1 @@@@ -77,7 +77,12 @@@@ to Rick! I'll call this version V2.1 d17 2 d25 1 a25 1 @@@@ -450,7 +455,7 @@@@ static void set_supported(VolumeControl d34 1 a34 1 @@@@ -742,7 +747,7 @@@@ void main (int argc, char **argv) @ 1.4 log @pkglint: add missing rcs id. @ text @d1 1 a1 1 $NetBSD$ d3 7 a9 4 diff -r -u ../../src/xmix-2.1/xmix.c ./xmix.c --- ../../src/xmix-2.1/xmix.c Sun Jan 17 13:13:12 1999 +++ ./xmix.c Sun Jan 17 13:16:12 1999 @@@@ -77,7 +77,12 @@@@ d23 10 a32 1 @@@@ -742,7 +747,7 @@@@ @ 1.3 log @Clean up patches submitted by Rob Windsor in PR 6830 @ text @d1 2 @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 3 a3 17 $NetBSD$ diff -u ../../work/xmix/Imakefile ./Imakefile --- ../../work/xmix/Imakefile Thu Oct 30 01:21:25 1997 +++ ./Imakefile Thu Oct 30 00:46:39 1997 @@@@ -12,7 +12,7 @@@@ all:: $(PROGRAMS) -LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) +LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lossaudio PROGRAM = $(PROGRAMS) diff -u ../../work/xmix/xmix.c ./xmix.c --- ../../work/xmix/xmix.c Thu Oct 30 01:21:25 1997 +++ ./xmix.c Thu Oct 30 00:45:45 1997 d8 1 d13 1 a13 1 #include d18 9 @ 1.1 log @NetBSD port. @ text @d1 2 @