From ba562449a6459dbb189778a5a4f03b8af710b27f Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 26 Jan 2004 13:34:45 +0000 Subject: Move libflash to the multimedia category (coming from graphics). This is version 0.4.10nb4. --- multimedia/libflash/DESCR | 2 ++ multimedia/libflash/Makefile | 18 ++++++++++ multimedia/libflash/Makefile.common | 22 ++++++++++++ multimedia/libflash/PLIST | 27 +++++++++++++++ multimedia/libflash/buildlink2.mk | 25 ++++++++++++++ multimedia/libflash/distinfo | 12 +++++++ multimedia/libflash/patches/patch-ab | 34 +++++++++++++++++++ multimedia/libflash/patches/patch-ac | 12 +++++++ multimedia/libflash/patches/patch-ad | 65 ++++++++++++++++++++++++++++++++++++ multimedia/libflash/patches/patch-af | 26 +++++++++++++++ multimedia/libflash/patches/patch-ag | 17 ++++++++++ multimedia/libflash/patches/patch-ah | 49 +++++++++++++++++++++++++++ multimedia/libflash/patches/patch-ai | 25 ++++++++++++++ multimedia/libflash/patches/patch-aj | 9 +++++ 14 files changed, 343 insertions(+) create mode 100644 multimedia/libflash/DESCR create mode 100644 multimedia/libflash/Makefile create mode 100644 multimedia/libflash/Makefile.common create mode 100644 multimedia/libflash/PLIST create mode 100644 multimedia/libflash/buildlink2.mk create mode 100644 multimedia/libflash/distinfo create mode 100644 multimedia/libflash/patches/patch-ab create mode 100644 multimedia/libflash/patches/patch-ac create mode 100644 multimedia/libflash/patches/patch-ad create mode 100644 multimedia/libflash/patches/patch-af create mode 100644 multimedia/libflash/patches/patch-ag create mode 100644 multimedia/libflash/patches/patch-ah create mode 100644 multimedia/libflash/patches/patch-ai create mode 100644 multimedia/libflash/patches/patch-aj (limited to 'multimedia/libflash') diff --git a/multimedia/libflash/DESCR b/multimedia/libflash/DESCR new file mode 100644 index 00000000000..0ff7e0b140e --- /dev/null +++ b/multimedia/libflash/DESCR @@ -0,0 +1,2 @@ +Libflash is a GPL Flash(tm) library built around a core graphic renderer +that is capable of playing Flash(tm) movies. diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile new file mode 100644 index 00000000000..795b6e40ece --- /dev/null +++ b/multimedia/libflash/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ +# + +.include "Makefile.common" + +PKGNAME= lib${DISTNAME} +PKGREVISION= 4 +COMMENT= Open source Flash(tm) library + +USE_BUILDLINK2= yes +USE_LIBTOOL= yes +BUILD_DIRS= ${WRKSRC}/Lib +MAKE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" +MAKE_ENV+= LIBSTDCPP=-lstdc++ + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common new file mode 100644 index 00000000000..092bee866ff --- /dev/null +++ b/multimedia/libflash/Makefile.common @@ -0,0 +1,22 @@ +# $NetBSD: Makefile.common,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ +# + +DISTNAME= flash-0.4.10 +CATEGORIES= multimedia +MASTER_SITES= http://www.swift-tools.com/Flash/ +EXTRACT_SUFX= .tgz + +MAINTAINER= hubertf@NetBSD.org +HOMEPAGE= http://www.swift-tools.com/Flash/ + +USE_X11= yes + +DISTINFO_FILE= ${.CURDIR}/../libflash/distinfo +PATCHDIR= ${.CURDIR}/../libflash/patches + +post-extract: remove-subpackages + +remove-subpackages: + ${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib + +.include "../../mk/ossaudio.buildlink2.mk" diff --git a/multimedia/libflash/PLIST b/multimedia/libflash/PLIST new file mode 100644 index 00000000000..edc83e8374e --- /dev/null +++ b/multimedia/libflash/PLIST @@ -0,0 +1,27 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ +include/flash/adpcm.h +include/flash/bitmap.h +include/flash/button.h +include/flash/character.h +include/flash/cxform.h +include/flash/displaylist.h +include/flash/flash.h +include/flash/font.h +include/flash/graphic.h +include/flash/matrix.h +include/flash/movie.h +include/flash/program.h +include/flash/rect.h +include/flash/script.h +include/flash/shape.h +include/flash/sound.h +include/flash/sprite.h +include/flash/sqrt.h +include/flash/swf.h +include/flash/text.h +lib/libflash.a +lib/libflash.la +lib/libflash.so +lib/libflash.so.0 +lib/libflash.so.0.4 +@dirrm include/flash diff --git a/multimedia/libflash/buildlink2.mk b/multimedia/libflash/buildlink2.mk new file mode 100644 index 00000000000..a2471898c25 --- /dev/null +++ b/multimedia/libflash/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ + +.if !defined(LIBFLASH_BUILDLINK2_MK) +LIBFLASH_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libflash +BUILDLINK_DEPENDS.libflash?= libflash>=0.4.10nb4 +BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash + +EVAL_PREFIX+= BUILDLINK_PREFIX.libflash=libflash +BUILDLINK_PREFIX.libflash_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libflash+= include/flash/*.h +BUILDLINK_FILES.libflash+= lib/libflash.* + +BUILDLINK_CPPFLAGS.libflash= -I${BUILDLINK_PREFIX.libflash}/include/flash +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.libflash} + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" + +BUILDLINK_TARGETS+= libflash-buildlink + +libflash-buildlink: _BUILDLINK_USE + +.endif # LIBFLASH_BUILDLINK2_MK diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo new file mode 100644 index 00000000000..14ba5dc01bf --- /dev/null +++ b/multimedia/libflash/distinfo @@ -0,0 +1,12 @@ +$NetBSD: distinfo,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ + +SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420 +Size (flash-0.4.10.tgz) = 358995 bytes +SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d +SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8 +SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2 +SHA1 (patch-af) = b55169832b1475f41c7e7ecaf1abe1f7d4c93037 +SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637 +SHA1 (patch-ah) = ff644dd1c53b54a029adc870f69e128213e50635 +SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb +SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7 diff --git a/multimedia/libflash/patches/patch-ab b/multimedia/libflash/patches/patch-ab new file mode 100644 index 00000000000..8e0db487d48 --- /dev/null +++ b/multimedia/libflash/patches/patch-ab @@ -0,0 +1,34 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ + +--- Lib/Makefile.orig Sun Jun 4 02:49:23 2000 ++++ Lib/Makefile +@@ -1,6 +1,5 @@ +-CPPFLAGS=-I../Jpeg -I../Zlib + # Comment out the following line if you use egcs : +-CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions ++CXXFLAGS+=-Wall -fno-rtti -fno-exceptions + + INCLUDES= adpcm.h cxform.h graphic.h script.h sqrt.h\ + bitmap.h displaylist.h matrix.h shape.h swf.h\ +@@ -34,7 +33,20 @@ + # bitstream.o + # dump.o + +-all: libflash.a ++.cc.o: ++ ${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $< ++ ++all: libflash.la ++ ++install: libflash.la ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib ++ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash ++ for file in ${INCLUDES}; do \ ++ ${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \ ++ done ++ ++libflash.la: $(SWFOBJS) ++ ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBSTDCPP} ${LIBOSSAUDIO} -version-info 0:4 + + libflash.a: $(SWFOBJS) + ar rcs $@ $(SWFOBJS) diff --git a/multimedia/libflash/patches/patch-ac b/multimedia/libflash/patches/patch-ac new file mode 100644 index 00000000000..0e43c54ae00 --- /dev/null +++ b/multimedia/libflash/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:34:45 jmmv 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, diff --git a/multimedia/libflash/patches/patch-ad b/multimedia/libflash/patches/patch-ad new file mode 100644 index 00000000000..c822beda7d0 --- /dev/null +++ b/multimedia/libflash/patches/patch-ad @@ -0,0 +1,65 @@ +$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 13:34:45 jmmv 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; diff --git a/multimedia/libflash/patches/patch-af b/multimedia/libflash/patches/patch-af new file mode 100644 index 00000000000..3a03559fc4d --- /dev/null +++ b/multimedia/libflash/patches/patch-af @@ -0,0 +1,26 @@ +$NetBSD: patch-af,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $ + +--- Player/Makefile.orig Wed Jun 7 11:19:50 2000 ++++ Player/Makefile +@@ -1,14 +1,12 @@ +-FLASH=../Lib +-CPPFLAGS=-I$(FLASH) +-CFLAGS=-O3 +-LIBS = $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext -lm +-CC=gcc +-LDFLAGS= ++LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP) + +-swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a ++all: swfplayer ++ ++install: swfplayer ++ ${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin ++ ++swfplayer: main.o + $(CC) $(LDFLAGS) -o $@ main.o $(LIBS) + + clean: + rm -f *~ *.o swfplayer core gmon.out +- +- diff --git a/multimedia/libflash/patches/patch-ag b/multimedia/libflash/patches/patch-ag new file mode 100644 index 00000000000..f69e777b2a5 --- /dev/null +++ b/multimedia/libflash/patches/patch-ag @@ -0,0 +1,17 @@ +$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 13:34:46 jmmv 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); + diff --git a/multimedia/libflash/patches/patch-ah b/multimedia/libflash/patches/patch-ah new file mode 100644 index 00000000000..7dcdf0d19e8 --- /dev/null +++ b/multimedia/libflash/patches/patch-ah @@ -0,0 +1,49 @@ +$NetBSD: patch-ah,v 1.1.1.1 2004/01/26 13:34:46 jmmv 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) diff --git a/multimedia/libflash/patches/patch-ai b/multimedia/libflash/patches/patch-ai new file mode 100644 index 00000000000..210de7f473b --- /dev/null +++ b/multimedia/libflash/patches/patch-ai @@ -0,0 +1,25 @@ +$NetBSD: patch-ai,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $ + +--- Plugin/plugin.c.orig Mon Jun 12 01:24:09 2000 ++++ Plugin/plugin.c +@@ -162,7 +162,11 @@ NPP_New(NPMIMEType pluginType, + + FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance); + +- FlashSoundInit(This->fh, "/dev/dsp"); ++#ifndef DEV_DSP ++#define DEV_DSP "/dev/dsp" ++#endif ++ ++ FlashSoundInit(This->fh, DEV_DSP); + + 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; diff --git a/multimedia/libflash/patches/patch-aj b/multimedia/libflash/patches/patch-aj new file mode 100644 index 00000000000..2e9c3e12e07 --- /dev/null +++ b/multimedia/libflash/patches/patch-aj @@ -0,0 +1,9 @@ +$NetBSD: patch-aj,v 1.1.1.1 2004/01/26 13:34:46 jmmv Exp $ + +--- Lib/shape.cc.orig Wed Jun 7 19:11:08 2000 ++++ Lib/shape.cc +@@ -24,2 +24,4 @@ + ++#include ++ + #ifdef RCSID -- cgit v1.2.3