summaryrefslogtreecommitdiff
path: root/multimedia/libflash
diff options
context:
space:
mode:
authortron <tron>2006-06-30 21:57:45 +0000
committertron <tron>2006-06-30 21:57:45 +0000
commit6d31fd4cd2a8d713ffa41003ddd12a594b153ab3 (patch)
treeadc993ec40243b85c584e9a351caa38f030e795b /multimedia/libflash
parente9edf66c11436ef073280c7acf2cef2c4c48a06f (diff)
downloadpkgsrc-6d31fd4cd2a8d713ffa41003ddd12a594b153ab3.tar.gz
Link "flashplayer" executable with C++ compiler to avoid unresolved
symbols in the C++ shared library.
Diffstat (limited to 'multimedia/libflash')
-rw-r--r--multimedia/libflash/distinfo4
-rw-r--r--multimedia/libflash/patches/patch-af21
2 files changed, 13 insertions, 12 deletions
diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo
index 1d00a4c4c0d..166b340db33 100644
--- a/multimedia/libflash/distinfo
+++ b/multimedia/libflash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/06/30 21:47:20 tron Exp $
+$NetBSD: distinfo,v 1.5 2006/06/30 21:57:45 tron Exp $
SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c
-SHA1 (patch-af) = f0c7f279ac3295b5bef7de8d5405b04de33260c0
+SHA1 (patch-af) = 7e6ab6312cf2d6a9e36abde8d5d94d627fcd9231
SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
diff --git a/multimedia/libflash/patches/patch-af b/multimedia/libflash/patches/patch-af
index f81eadddc01..2b3a7aa5e05 100644
--- a/multimedia/libflash/patches/patch-af
+++ b/multimedia/libflash/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2004/04/24 22:25:31 wiz Exp $
+$NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $
---- Player/Makefile.orig 2000-06-07 20:19:50.000000000 +0200
-+++ Player/Makefile
+--- Player/Makefile.orig 2000-06-07 19:19:50.000000000 +0100
++++ Player/Makefile 2006-06-30 22:53:51.000000000 +0100
@@ -1,14 +1,13 @@
-FLASH=../Lib
-CPPFLAGS=-I$(FLASH)
@@ -13,15 +13,16 @@ $NetBSD: patch-af,v 1.2 2004/04/24 22:25:31 wiz Exp $
+CFLAGS+= -I${PREFIX}/include/flash
-swfplayer: main.o $(FLASH)/libflash.a ../Zlib/libz.a ../Jpeg/libjpeg.a
+- $(CC) $(LDFLAGS) -o $@ main.o $(LIBS)
+all: swfplayer
-+
+
+-clean:
+- rm -f *~ *.o swfplayer core gmon.out
+install: swfplayer
+ ${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin
-+
+
+swfplayer: main.o
- $(CC) $(LDFLAGS) -o $@ main.o $(LIBS)
++ $(CXX) $(LDFLAGS) -o $@ main.o $(LIBS)
- clean:
- rm -f *~ *.o swfplayer core gmon.out
--
--
++clean:
++ rm -f *~ *.o swfplayer core gmon.out