diff options
| author | tron <tron> | 2003-09-28 20:05:20 +0000 |
|---|---|---|
| committer | tron <tron> | 2003-09-28 20:05:20 +0000 |
| commit | d56c16fee26864c2eafb254bd4bf7e0a78aab468 (patch) | |
| tree | c1fc5a0a964f3df5274654d4264a1f5a105d2b28 /graphics | |
| parent | ed83b43ff15f2abda8ce6fee149f303e97824a83 (diff) | |
| download | pkgsrc-d56c16fee26864c2eafb254bd4bf7e0a78aab468.tar.gz | |
Fix GCC 3.3.1 related build problem.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/flashplayer/Makefile | 8 | ||||
| -rw-r--r-- | graphics/libflash/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libflash/patches/patch-af | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile index 928fbe2a8e3..77dd0b25dfc 100644 --- a/graphics/flashplayer/Makefile +++ b/graphics/flashplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/21 16:51:39 martti Exp $ +# $NetBSD: Makefile,v 1.10 2003/09/28 20:05:20 tron Exp $ # .include "../libflash/Makefile.common" @@ -11,5 +11,11 @@ USE_BUILDLINK2= yes BUILD_DIRS= ${WRKSRC}/Player CPPFLAGS+= -DDEV_DSP=\\\"${DEVOSSSOUND}\\\" +.if defined(CC_VERSION) && !empty(CC_VERSION:Mgcc-3.*) +MAKE_ENV+= LIBSTDCPP=-lstdc++ +.else +MAKE_ENV+= LIBSTDCPP= +.endif + .include "../libflash/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo index 9a3dadbbbdd..2a4b6af6f6f 100644 --- a/graphics/libflash/distinfo +++ b/graphics/libflash/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.13 2003/06/17 07:35:43 abs Exp $ +$NetBSD: distinfo,v 1.14 2003/09/28 20:08:14 tron Exp $ SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420 Size (flash-0.4.10.tgz) = 358995 bytes SHA1 (patch-ab) = f2d681555e672a9ea39206db468ab1499307a5f6 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2 -SHA1 (patch-af) = 4e7d298ca6443f55bbed55d6dd17939c13fababb +SHA1 (patch-af) = b55169832b1475f41c7e7ecaf1abe1f7d4c93037 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637 SHA1 (patch-ah) = 030219457c785e851abfeb7ed5166a00ae6eface SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb diff --git a/graphics/libflash/patches/patch-af b/graphics/libflash/patches/patch-af index bdee906d29a..36e02d51dea 100644 --- a/graphics/libflash/patches/patch-af +++ b/graphics/libflash/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2003/01/30 12:22:48 jlam Exp $ +$NetBSD: patch-af,v 1.5 2003/09/28 20:08:14 tron Exp $ --- Player/Makefile.orig Wed Jun 7 11:19:50 2000 +++ Player/Makefile @@ -9,7 +9,7 @@ $NetBSD: patch-af,v 1.4 2003/01/30 12:22:48 jlam Exp $ -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 ++LIBS = -lflash -ljpeg -lz ${LIBOSSAUDIO} -lX11 -lXext -lm $(LIBSTDCPP) -swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a +all: swfplayer |