head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.52 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.50 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.48 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.46 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.44 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.42 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.40 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.38 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.36 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.34 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.32 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.30 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.28 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.26 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.24 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.22 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.20 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.18 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.16 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.14 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.12 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.10 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.8 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.6 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.5.0.4 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.2 netbsd-1-6-1-base:1.5 netbsd-1-6:1.4.0.6 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.2 pkgviews-base:1.4 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 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.7 date 2004.01.26.13.38.43; author jmmv; state dead; branches; next 1.6; 1.6 date 2004.01.01.21.29.09; author agc; state Exp; branches; next 1.5; 1.5 date 2003.01.30.12.22.48; author jlam; state Exp; branches; next 1.4; 1.4 date 2002.07.11.14.24.00; author abs; state Exp; branches; next 1.3; 1.3 date 2002.01.03.11.10.36; author abs; state Exp; branches; next 1.2; 1.2 date 2001.12.03.04.44.58; 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.7 log @libflash and flashplayer moved to the multimedia category. @ text @$NetBSD: patch-ah,v 1.6 2004/01/01 21:29:09 agc Exp $ --- Plugin/Makefile.orig Tue Sep 28 05:13:38 1999 +++ Plugin/Makefile @@@@ -21,34 +21,30 @@@@ PLUGIN_DEFINES= -DXP_UNIX OPTIMIZER= -FLASH=../Lib # Solaris #LIBCXX=/usr/lib/libC.so # gcc LIBCXX= -# Solaris (Sun compiler/linker) -#SHARED=-G -# FreeBSD -#SHARED=-Bshareable -# Linux -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) $(PLUGIN_DEFINES) $(CPPFLAGS) +LIBS= -lflash $(LIBSTDCPP) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt SRC= plugin.c npunix.c OBJ= plugin.o npunix.o SHAREDTARGET=npflash.so -default all: $(SHAREDTARGET) +.c.o: + $(SHLIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + +default all: npflash.la -$(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a - $(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) +npflash.la: $(OBJ) + $(SHLIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@@ $(OBJ:.o=.lo) $(LIBS) -avoid-version -module -rpath $(MOZ_PLUGDIR) -plugin.o: $(FLASH)/flash.h +$(SHAREDTARGET): $(OBJ) + $(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) $(LIBS) clean: $(RM) $(OBJ) $(SHAREDTARGET) @ 1.6 log @Link libflash with libstdc++ - makes the mozilla flash plugin work when compiled with gcc3. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.5 2003/01/30 12:22:48 jlam Exp $ @ 1.5 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$ d26 1 a26 1 +LIBS= -lflash $(LIBCXX) -ljpeg -lz $(LIBOSSAUDIO) -lX11 -lXt @ 1.4 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 --- Plugin/Makefile.orig Tue Sep 28 13:13:38 1999 d5 1 a5 1 @@@@ -21,7 +21,7 @@@@ a9 1 +FLASH=${LOCALBASE}/include/flash d13 6 a18 4 @@@@ -31,12 +31,12 @@@@ LIBCXX= # Solaris (Sun compiler/linker) #SHARED=-G # FreeBSD d20 1 a20 2 +SHARED=-Bshareable # Linux d22 1 a22 2 +#SHARED=-shared d25 2 a26 2 +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 d30 13 a42 3 @@@@ -48,7 +48,7 @@@@ default all: $(SHAREDTARGET) $(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a $(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) d45 2 a46 1 +plugin.o: ${LOCALBASE}/include/flash/flash.h @ 1.3 log @Obey CFLAGS @ text @d3 3 a5 19 --- Plugin/plugin.c.orig Mon Jun 12 09:24:09 2000 +++ Plugin/plugin.c @@@@ -162,7 +162,11 @@@@ FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance); +#ifdef __NetBSD__ + FlashSoundInit(This->fh, "/dev/sound"); +#else FlashSoundInit(This->fh, "/dev/dsp"); +#endif return NPERR_NO_ERROR; } @@@@ -193,6 +197,7 @@@@ XSync(This->dpy,False); XFreePixmap(This->dpy, This->canvas); shmdt(This->segInfo.shmaddr); + shmctl(This->segInfo.shmid, IPC_RMID, 0); d7 33 a39 2 FlashClose(This->fh); This->fh = 0; @ 1.2 log @Make sure to actually GC the shm descriptor. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $ d3 2 a4 2 --- Plugin/plugin.c.orig Mon Jun 12 08:24:09 2000 +++ Plugin/plugin.c Mon Dec 3 04:43:37 2001 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Plugin/plugin.c.orig Sat Aug 26 06:41:31 2000 +++ Plugin/plugin.c d17 8 @ 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 @@