summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2008-07-07 08:34:54 +0000
committerabs <abs@pkgsrc.org>2008-07-07 08:34:54 +0000
commit809ccbb9d9acd17cf35ea7debe1317a2da78ace6 (patch)
treeff2d2a8947e2f936650297e5e49c09a6dabbb1b1 /multimedia
parenta0d40e1c1b41b9f8a739b5a6015e6953b52711d0 (diff)
downloadpkgsrc-809ccbb9d9acd17cf35ea7debe1317a2da78ace6.tar.gz
Update to 0.8.3nb2
- If the system defines isnan() and isinf() then undef them before using gnash specific versions (which in the case of isnan() has different numbers of arguments). Fixes build on NetBSD-4.0
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gnash/Makefile4
-rw-r--r--multimedia/gnash/distinfo3
-rw-r--r--multimedia/gnash/patches/patch-ac24
3 files changed, 28 insertions, 3 deletions
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 21b56a9b25a..262b2196074 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2008/06/22 20:15:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/07/07 08:34:54 abs Exp $
#
DISTNAME= gnash-${VER}
VER= 0.8.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index e605f62667d..2352ded9f55 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.11 2008/06/22 20:15:51 wiz Exp $
+$NetBSD: distinfo,v 1.12 2008/07/07 08:34:54 abs Exp $
SHA1 (gnash-0.8.3.tar.bz2) = 3cd4a0930e772a42b0155295fca292fd94be7c42
RMD160 (gnash-0.8.3.tar.bz2) = f7bf4d06d35c3ad40df4419b179fc6482731854b
Size (gnash-0.8.3.tar.bz2) = 2902610 bytes
SHA1 (patch-aa) = 05460170941019168fa072c803ad60eac919e44a
SHA1 (patch-ab) = 485aa9fbb3deaeb4b238d1f66d8d6552fd11ab90
+SHA1 (patch-ac) = 6454620529a281c707f7ccf68eb17c0754dfe7a7
SHA1 (patch-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701
SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef
diff --git a/multimedia/gnash/patches/patch-ac b/multimedia/gnash/patches/patch-ac
new file mode 100644
index 00000000000..ae668739cd7
--- /dev/null
+++ b/multimedia/gnash/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1 2008/07/07 08:34:55 abs Exp $
+
+--- server/as_value.h.orig 2008-05-05 22:02:01.000000000 +0100
++++ server/as_value.h
+@@ -65,6 +65,9 @@ class asName;
+ // The following template works just like its C counterpart, with added
+ // type safety (i.e., they will only compile for floating point arguments).
+
++#ifdef isnan
++# undef isnan
++#endif /* isnan */
+ template <typename T>
+ inline bool
+ isnan(const T& num, typename boost::enable_if<boost::is_floating_point<T> >::type* dummy = 0)
+@@ -73,6 +76,9 @@ isnan(const T& num, typename boost::enab
+ return num != num;
+ }
+
++#ifdef isinf
++# undef isinf
++#endif /* isinf */
+ #define isinf(x) (isnan(x - x))
+
+ /// Use this methods to obtain a properly-formatted property name