head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.52 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.50 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.48 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.46 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.44 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.42 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.40 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.38 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.36 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.34 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.32 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.30 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.28 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.26 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.24 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.22 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.20 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.18 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.16 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.14 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.12 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.10 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.3.0.6 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.2 pkgviews-base:1.3 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 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.5 date 2004.01.26.13.38.43; author jmmv; state dead; branches; next 1.4; 1.4 date 2003.01.30.12.22.48; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.07.11.14.24.00; author abs; state Exp; branches; next 1.2; 1.2 date 2002.01.03.11.10.36; author abs; 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.5 log @libflash and flashplayer moved to the multimedia category. @ text @$NetBSD: patch-ad,v 1.4 2003/01/30 12:22:48 jlam Exp $ --- Lib/sound.cc.orig Wed Sep 1 08:10:03 1999 +++ Lib/sound.cc @@@@ -26,7 +26,11 @@@@ #include #include #ifndef NOSOUND -#include +#ifdef HAVE_SOUNDCARD_H +#include +#else +#include +#endif #endif #ifdef RCSID @@@@ -56,16 +60,16 @@@@ void Sound::setSoundFlags(long f) { 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; break; } if (f & soundIs16bit) { @@@@ -162,7 +166,7 @@@@ SoundMixer::SoundMixer(char *device) } // Reset device - status = ioctl(dsp, SNDCTL_DSP_RESET); + status = ioctl(dsp, SNDCTL_DSP_RESET, NULL); if (status < 0) perror("ioctl SNDCTL_DSP_RESET"); // Set sample size @@@@ -187,7 +191,7 @@@@ SoundMixer::SoundMixer(char *device) } // Set sound rate in Hertz - soundRate = 11000; + soundRate = 11025; status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate); if (status < 0) perror("ioctl SNDCTL_DSP_SPEED"); @@@@ -324,7 +328,7 @@@@ SoundMixer::playSounds() if (nbBytes) { // At last ! Play It ! write(dsp,buffer,nbBytes); - status = ioctl(dsp, SNDCTL_DSP_POST); + status = ioctl(dsp, SNDCTL_DSP_POST, NULL); } return nbBytes; @ 1.4 log @Bump PKGREVISIONs of libflash, flashplayer, and moz-flash. These packages can now use audio/oss for OSS audio support. Convert to use buildlink2 and make libflash.so link against the proper libraries so that all inter-library dependencies are recorded. Also build moz-flash using libtool instead of guessing at the link command for the shared module. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 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 @d3 1 a3 1 --- Lib/sound.cc.orig Wed Sep 1 16:10:03 1999 d5 2 a6 1 @@@@ -27,6 +27,10 @@@@ d9 2 a10 1 +#ifdef __NetBSD__ d13 2 a14 1 #include a15 1 +#endif d18 2 a19 1 @@@@ -57,14 +61,14 @@@@ Sound::setSoundFlags(long f) { d38 3 a40 1 @@@@ -163,5 +167,5 @@@@ SoundMixer::SoundMixer(char *device) d47 3 a49 1 @@@@ -188,5 +192,5 @@@@ SoundMixer::SoundMixer(char *device) d56 3 a58 1 @@@@ -325,5 +329,5 @@@@ SoundMixer::playSounds() d65 1 @ 1.2 log @Obey CFLAGS @ text @d3 52 a54 5 --- Makefile.orig Mon Jun 12 09:19:14 2000 +++ Makefile @@@@ -1,4 +1,4 @@@@ -SUBDIRS= Jpeg Zlib Lib Player Plugin Kflash +SUBDIRS?= Lib Player Plugin # Kflash a55 2 all: for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE)); done @ 1.1 log @Initial revision @ text @d3 5 a7 14 --- Player/Makefile.orig Wed Jun 7 20:19:50 2000 +++ Player/Makefile @@@@ -1,7 +1,9 @@@@ -FLASH=../Lib -CPPFLAGS=-I$(FLASH) +FLASH=${LOCALBASE}/lib +CPPFLAGS=-I${LOCALBASE}/include/flash -I${LOCALBASE}include -I${X11BASE}/include CFLAGS=-O3 -LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm +LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lflash\ + -ljpeg -lz -lossaudio -Wl,-R${X11BASE}/lib -L${X11BASE}/lib \ + -lX11 -lXext -lm CC=gcc LDFLAGS= d9 2 @ 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 @@