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-ag,v 1.4 2003/01/30 12:22:48 jlam Exp $ --- Player/main.c.orig Wed Jun 7 23:56:11 2000 +++ Player/main.c @@@@ -559,7 +559,11 @@@@ main(int argc, char **argv) FlashGraphicInitX11(flashHandle, dpy, movie, onRoot); - FlashSoundInit(flashHandle, "/dev/dsp"); +#ifndef DEV_DSP +#define DEV_DSP "/dev/dsp" +#endif + + FlashSoundInit(flashHandle, DEV_DSP); FlashSetGetUrlMethod(flashHandle, showUrl, 0); @ 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 --- Player/main.c.orig Thu Jun 8 07:56:11 2000 d9 3 a11 4 +#ifdef __NetBSD__ + FlashSoundInit(flashHandle, "/dev/sound"); +#else FlashSoundInit(flashHandle, "/dev/dsp"); d13 2 @ 1.2 log @Obey CFLAGS @ text @d3 11 a13 3 --- Plugin/Makefile.orig Tue Sep 28 13:13:38 1999 +++ Plugin/Makefile @@@@ -21,7 +21,7 @@@@ d15 1 a15 4 PLUGIN_DEFINES= -DXP_UNIX OPTIMIZER= -FLASH=../Lib +FLASH=${LOCALBASE}/include/flash a16 28 # Solaris #LIBCXX=/usr/lib/libC.so @@@@ -31,12 +31,12 @@@@ # Solaris (Sun compiler/linker) #SHARED=-G # FreeBSD -#SHARED=-Bshareable +SHARED=-Bshareable # Linux -SHARED=-shared +#SHARED=-shared -CFLAGS= $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include -LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a +CFLAGS= $(OPTIMIZER) -fPIC $(PLUGIN_DEFINES) -I$(FLASH) -I${X11BASE}/include +LDFLAGS= -lflash $(LIBCXX) -L${LOCALBASE}/lib -R${LOCALBASE}/lib -L${X11BASE}/lib -R${X11BASE}/lib -lXt -lX11 -ljpeg -lz -lossaudio SRC= plugin.c npunix.c OBJ= plugin.o npunix.o @@@@ -48,7 +48,7 @@@@ $(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a $(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) -plugin.o: $(FLASH)/flash.h +plugin.o: ${LOCALBASE}/include/flash/flash.h clean: $(RM) $(OBJ) $(SHAREDTARGET) @ 1.1 log @Initial revision @ text @d3 3 a5 11 --- Player/main.c.orig Thu Jun 8 08:56:11 2000 +++ Player/main.c @@@@ -559,7 +559,11 @@@@ FlashGraphicInitX11(flashHandle, dpy, movie, onRoot); +#ifdef __NetBSD__ + FlashSoundInit(flashHandle, "/dev/sound"); +#else FlashSoundInit(flashHandle, "/dev/dsp"); +#endif d7 4 a10 1 FlashSetGetUrlMethod(flashHandle, showUrl, 0); d12 28 @ 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 @@