From 6ccaad46c56cef2f2da0ca79f67942324d355235 Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 11 Jul 2002 14:24:00 +0000 Subject: 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 --- graphics/libflash/Makefile | 4 +-- graphics/libflash/distinfo | 19 ++++++------ graphics/libflash/patches/patch-aa | 4 +-- graphics/libflash/patches/patch-ab | 4 +-- graphics/libflash/patches/patch-ac | 59 +++++------------------------------ graphics/libflash/patches/patch-ad | 63 ++++++++++++++++++++++++++++++++------ graphics/libflash/patches/patch-ae | 23 +++++--------- graphics/libflash/patches/patch-af | 29 +++++++++--------- graphics/libflash/patches/patch-ag | 45 +++++++-------------------- graphics/libflash/patches/patch-ah | 53 ++++++++++++++++++++------------ graphics/libflash/patches/patch-ai | 24 +++++++++++++++ 11 files changed, 170 insertions(+), 157 deletions(-) create mode 100644 graphics/libflash/patches/patch-ai (limited to 'graphics/libflash') diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile index 149bc354fad..1ce85775bef 100644 --- a/graphics/libflash/Makefile +++ b/graphics/libflash/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2001/12/03 04:23:00 mycroft Exp $ +# $NetBSD: Makefile,v 1.6 2002/07/11 14:24:00 abs Exp $ # PKGNAME= lib${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= open source flash(tm) library diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo index 08590f77ae7..6224131d7ae 100644 --- a/graphics/libflash/distinfo +++ b/graphics/libflash/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.9 2002/01/03 11:10:35 abs Exp $ +$NetBSD: distinfo,v 1.10 2002/07/11 14:24:00 abs Exp $ SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420 Size (flash-0.4.10.tgz) = 358995 bytes -SHA1 (patch-aa) = e23ae7d4d32fc87061657a2293eeb1e33292b777 -SHA1 (patch-ab) = 5f3d335da5f2f6ef59c597b30c6f363bc97a4e98 -SHA1 (patch-ac) = 958037fe0ba76975ceceb23d390e34563585ca14 -SHA1 (patch-ad) = 0be721c008bd4caca667ee5366d7678a2f9dab5f -SHA1 (patch-ae) = b4bccafc46500529d1f04ad9cbbef462e1a7cde9 -SHA1 (patch-af) = 67e6c0cb053bbe8dcf36bf24efe80cc720896d76 -SHA1 (patch-ag) = f23cbd2eb2308d9afe625da23bb5f1f5a6177c2b -SHA1 (patch-ah) = f9e0ec51cff1701510c740874bce45c5df0ae67c +SHA1 (patch-aa) = a6b56653644506e1695811ff677ca3bc832e88b3 +SHA1 (patch-ab) = 571690220bbfcbbe81b7aa6aa812a1cff023cd91 +SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8 +SHA1 (patch-ad) = cc0fa0cc19565ee3ed3c0c9f22e144705d2ab167 +SHA1 (patch-ae) = 0be721c008bd4caca667ee5366d7678a2f9dab5f +SHA1 (patch-af) = b4bccafc46500529d1f04ad9cbbef462e1a7cde9 +SHA1 (patch-ag) = 2755ab4b79f1c01e2190816609aa7246c43c764f +SHA1 (patch-ah) = 60cd6c9fd3d67374ee4e201935fa24695177c2eb +SHA1 (patch-ai) = aa2c26edb5ae2fde5c21c9bd784445ab8fb89ae4 diff --git a/graphics/libflash/patches/patch-aa b/graphics/libflash/patches/patch-aa index 1d7cbbac25c..b25854e7a1e 100644 --- a/graphics/libflash/patches/patch-aa +++ b/graphics/libflash/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2002/01/03 11:10:35 abs Exp $ +$NetBSD: patch-aa,v 1.3 2002/07/11 14:24:00 abs Exp $ --- Kflash/kflash.cc.orig Mon Jun 12 08:46:38 2000 +++ Kflash/kflash.cc -@@ -443,7 +443,11 @@ +@@ -443,7 +443,11 @@ void KFlashSaver::initialise() FlashSettings(flashHandle, PLAYER_LOOP); if (enableSound) { diff --git a/graphics/libflash/patches/patch-ab b/graphics/libflash/patches/patch-ab index 437b570debc..56850510f28 100644 --- a/graphics/libflash/patches/patch-ab +++ b/graphics/libflash/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-ab,v 1.3 2002/07/11 14:24:00 abs Exp $ --- Lib/Makefile.orig Sun Jun 4 10:49:23 2000 +++ Lib/Makefile @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2002/01/03 11:10:36 abs Exp $ INCLUDES= adpcm.h cxform.h graphic.h script.h sqrt.h\ bitmap.h displaylist.h matrix.h shape.h swf.h\ -@@ -34,10 +34,20 @@ +@@ -34,10 +34,20 @@ SWFOBJS=\ # bitstream.o # dump.o diff --git a/graphics/libflash/patches/patch-ac b/graphics/libflash/patches/patch-ac index 0a9dca609b4..29f04719526 100644 --- a/graphics/libflash/patches/patch-ac +++ b/graphics/libflash/patches/patch-ac @@ -1,55 +1,12 @@ -$NetBSD: patch-ac,v 1.4 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-ac,v 1.5 2002/07/11 14:24:00 abs Exp $ ---- 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; +--- Lib/flash.cc.orig Thu Jul 11 15:07:01 2002 ++++ Lib/flash.cc +@@ -100,6 +100,7 @@ long FlashGraphicInit(FlashHandle flashH break; - } -@@ -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); + default: + fprintf(stderr, "Unsupported depth\n"); ++ return 0; } + fh->gd->setMovieDimension(fh->main->frameRect.xmax - fh->main->frameRect.xmin, diff --git a/graphics/libflash/patches/patch-ad b/graphics/libflash/patches/patch-ad index 168cef807b4..562fe479df7 100644 --- a/graphics/libflash/patches/patch-ad +++ b/graphics/libflash/patches/patch-ad @@ -1,10 +1,55 @@ -$NetBSD: patch-ad,v 1.2 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-ad,v 1.3 2002/07/11 14:24:00 abs Exp $ ---- 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 - - all: - for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE)); done +--- 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 @@ 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; + } +@@ -163,5 +167,5 @@ 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"); + +@@ -188,5 +192,5 @@ 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"); +@@ -325,5 +329,5 @@ SoundMixer::playSounds() + // At last ! Play It ! + write(dsp,buffer,nbBytes); +- status = ioctl(dsp, SNDCTL_DSP_POST); ++ status = ioctl(dsp, SNDCTL_DSP_POST, NULL); + } + diff --git a/graphics/libflash/patches/patch-ae b/graphics/libflash/patches/patch-ae index 04ccf5daff4..253f4780fac 100644 --- a/graphics/libflash/patches/patch-ae +++ b/graphics/libflash/patches/patch-ae @@ -1,17 +1,10 @@ -$NetBSD: patch-ae,v 1.4 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-ae,v 1.5 2002/07/11 14:24:00 abs Exp $ ---- Player/Makefile.orig Wed Jun 7 19: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= +--- 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 + all: + for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE)); done diff --git a/graphics/libflash/patches/patch-af b/graphics/libflash/patches/patch-af index 7fbea66a6e7..a913d72e1c8 100644 --- a/graphics/libflash/patches/patch-af +++ b/graphics/libflash/patches/patch-af @@ -1,16 +1,17 @@ -$NetBSD: patch-af,v 1.2 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-af,v 1.3 2002/07/11 14:24:00 abs Exp $ ---- Player/main.c.orig Thu Jun 8 07: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 - - FlashSetGetUrlMethod(flashHandle, showUrl, 0); +--- Player/Makefile.orig Wed Jun 7 19: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= diff --git a/graphics/libflash/patches/patch-ag b/graphics/libflash/patches/patch-ag index 4cd8f56bf0f..6bd1a548ed0 100644 --- a/graphics/libflash/patches/patch-ag +++ b/graphics/libflash/patches/patch-ag @@ -1,39 +1,16 @@ -$NetBSD: patch-ag,v 1.2 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-ag,v 1.3 2002/07/11 14:24:00 abs Exp $ ---- Plugin/Makefile.orig Tue Sep 28 13:13:38 1999 -+++ Plugin/Makefile -@@ -21,7 +21,7 @@ +--- Player/main.c.orig Thu Jun 8 07:56:11 2000 ++++ Player/main.c +@@ -559,7 +559,11 @@ main(int argc, char **argv) - PLUGIN_DEFINES= -DXP_UNIX - OPTIMIZER= --FLASH=../Lib -+FLASH=${LOCALBASE}/include/flash + FlashGraphicInitX11(flashHandle, dpy, movie, onRoot); - # 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 ++#ifdef __NetBSD__ ++ FlashSoundInit(flashHandle, "/dev/sound"); ++#else + FlashSoundInit(flashHandle, "/dev/dsp"); ++#endif --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 + FlashSetGetUrlMethod(flashHandle, showUrl, 0); - 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) diff --git a/graphics/libflash/patches/patch-ah b/graphics/libflash/patches/patch-ah index c5bd1cb53b1..357acad2228 100644 --- a/graphics/libflash/patches/patch-ah +++ b/graphics/libflash/patches/patch-ah @@ -1,24 +1,39 @@ -$NetBSD: patch-ah,v 1.3 2002/01/03 11:10:36 abs Exp $ +$NetBSD: patch-ah,v 1.4 2002/07/11 14:24:00 abs Exp $ ---- Plugin/plugin.c.orig Mon Jun 12 09:24:09 2000 -+++ Plugin/plugin.c -@@ -162,7 +162,11 @@ +--- Plugin/Makefile.orig Tue Sep 28 13:13:38 1999 ++++ Plugin/Makefile +@@ -21,7 +21,7 @@ - FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance); + PLUGIN_DEFINES= -DXP_UNIX + OPTIMIZER= +-FLASH=../Lib ++FLASH=${LOCALBASE}/include/flash -+#ifdef __NetBSD__ -+ FlashSoundInit(This->fh, "/dev/sound"); -+#else - FlashSoundInit(This->fh, "/dev/dsp"); -+#endif + # Solaris + #LIBCXX=/usr/lib/libC.so +@@ -31,12 +31,12 @@ LIBCXX= + # Solaris (Sun compiler/linker) + #SHARED=-G + # FreeBSD +-#SHARED=-Bshareable ++SHARED=-Bshareable + # Linux +-SHARED=-shared ++#SHARED=-shared - 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); +-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 - FlashClose(This->fh); - This->fh = 0; + SRC= plugin.c npunix.c + OBJ= plugin.o npunix.o +@@ -48,7 +48,7 @@ default all: $(SHAREDTARGET) + $(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) diff --git a/graphics/libflash/patches/patch-ai b/graphics/libflash/patches/patch-ai new file mode 100644 index 00000000000..79a9414ba70 --- /dev/null +++ b/graphics/libflash/patches/patch-ai @@ -0,0 +1,24 @@ +$NetBSD: patch-ai,v 1.1 2002/07/11 14:24:00 abs Exp $ + +--- Plugin/plugin.c.orig Mon Jun 12 09:24:09 2000 ++++ Plugin/plugin.c +@@ -162,7 +162,11 @@ NPP_New(NPMIMEType pluginType, + + 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 @@ NPP_Destroy(NPP instance, NPSavedData** + XSync(This->dpy,False); + XFreePixmap(This->dpy, This->canvas); + shmdt(This->segInfo.shmaddr); ++ shmctl(This->segInfo.shmid, IPC_RMID, 0); + + FlashClose(This->fh); + This->fh = 0; -- cgit v1.2.3