head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.52 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.50 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.48 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.46 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.44 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.42 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.40 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.38 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.36 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.34 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.32 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.30 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.28 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.26 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.24 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.22 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.8 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.4 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.6 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.2 pkgviews-base:1.5 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2004.01.26.13.38.43; author jmmv; state dead; branches; next 1.5; 1.5 date 2002.07.11.14.24.00; author abs; state Exp; branches; next 1.4; 1.4 date 2002.01.03.11.10.36; author abs; state Exp; branches; next 1.3; 1.3 date 2001.12.03.04.26.45; author mycroft; state Exp; branches; next 1.2; 1.2 date 2001.12.03.04.22.41; author mycroft; state Exp; branches; next 1.1; 1.1 date 2000.08.28.17.33.50; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.08.28.17.33.50; author rh; state Exp; branches; next ; desc @@ 1.6 log @libflash and flashplayer moved to the multimedia category. @ text @$NetBSD: patch-ac,v 1.5 2002/07/11 14:24:00 abs Exp $ --- Lib/flash.cc.orig Thu Jul 11 15:07:01 2002 +++ Lib/flash.cc @@@@ -100,6 +100,7 @@@@ long FlashGraphicInit(FlashHandle flashH break; default: fprintf(stderr, "Unsupported depth\n"); + return 0; } fh->gd->setMovieDimension(fh->main->frameRect.xmax - fh->main->frameRect.xmin, @ 1.5 log @Updated libflash to 0.4.10nb3 Updated moz-flash to 1.0nb2 Updated flashplayer to 0.4.10nb1 Do not immediately dereference a null pointer after reporting 'Unsupported depth' - return 0 and let the calling function handle it. Avoids coredumps on 8bit displays. They still do not display the flash, but at least its more graceful. Fixes pkg/14827 from Greg A. Woods @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Obey CFLAGS @ text @d3 3 a5 30 --- Lib/sound.cc.orig Wed Sep 1 16:10:03 1999 +++ Lib/sound.cc @@@@ -27,6 +27,10 @@@@ #include #ifndef NOSOUND +#ifdef __NetBSD__ +#include +#else #include #endif +#endif #ifdef RCSID @@@@ -57,14 +61,14 @@@@ switch (GET_SOUND_RATE_CODE(f)) { case 0: - soundRate = 5500; + soundRate = 5512; break; case 1: - soundRate = 11000; + soundRate = 11025; break; case 2: - soundRate = 22000; + soundRate = 22050; break; case 3: - soundRate = 44000; + soundRate = 44100; d7 3 a9 20 } @@@@ -163,5 +167,5 @@@@ // Reset device - status = ioctl(dsp, SNDCTL_DSP_RESET); + status = ioctl(dsp, SNDCTL_DSP_RESET, NULL); if (status < 0) perror("ioctl SNDCTL_DSP_RESET"); @@@@ -188,5 +192,5 @@@@ // Set sound rate in Hertz - soundRate = 11000; + soundRate = 11025; status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate); if (status < 0) perror("ioctl SNDCTL_DSP_SPEED"); @@@@ -325,5 +329,5 @@@@ // At last ! Play It ! write(dsp,buffer,nbBytes); - status = ioctl(dsp, SNDCTL_DSP_POST); + status = ioctl(dsp, SNDCTL_DSP_POST, NULL); d12 1 @ 1.3 log @Trim the patch so it doesn't include an $Id$ tag. This is an awful hack. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2001/12/03 04:22:41 mycroft Exp $ d3 3 a5 4 --- Lib/sound.cc.orig Wed Sep 1 15:10:03 1999 +++ Lib/sound.cc Mon Dec 3 04:12:21 2001 @@@@ -26,7 +26,11 @@@@ #include d16 1 a16 2 @@@@ -56,16 +60,16 @@@@ Sound::setSoundFlags(long f) { d35 1 a35 3 if (f & soundIs16bit) { @@@@ -162,7 +166,7 @@@@ } d42 1 a42 3 // Set sample size @@@@ -187,7 +191,7 @@@@ } d49 1 a49 3 @@@@ -324,7 +328,7 @@@@ if (nbBytes) { a55 1 return nbBytes; @ 1.2 log @Use 44100, 22050, 11025 and 5512Hz, not rounded variants. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $ d5 1 a5 1 @@@@ -26,8 +26,12 @@@@ a16 1 static char *rcsid = "$Id: sound.cc,v 1.11 1999/01/31 21:14:22 olivier Exp $"; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 3 --- Lib/sound.cc.orig Fri Aug 25 17:03:22 2000 +++ Lib/sound.cc Fri Aug 25 17:05:29 2000 @@@@ -27,6 +27,10 @@@@ d17 24 a40 1 @@@@ -163,5 +167,5 @@@@ d47 12 a58 1 @@@@ -325,5 +329,5 @@@@ d65 1 @ 1.1.1.1 log @Initial import of libflash-0.4.10, a GPL library for playing Flash[tm] movies. Provided in private mail by hubertf with some changes by myself to split up the package into separate library, player, and plugin parts. @ text @@