diff options
| author | markd <markd@pkgsrc.org> | 2015-12-12 20:44:13 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2015-12-12 20:44:13 +0000 |
| commit | 3b26f9950bb6e8be640df1a14e1f79f30f2933bd (patch) | |
| tree | 4d20e4ecb586f231f8150620a454cfb8e37ef5b4 /graphics | |
| parent | e3cc5e202554155d7b48ec13326c684917ed4d2a (diff) | |
| download | pkgsrc-3b26f9950bb6e8be640df1a14e1f79f30f2933bd.tar.gz | |
Upstream patch for GSL 2.0.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/asymptote/Makefile | 4 | ||||
| -rw-r--r-- | graphics/asymptote/distinfo | 3 | ||||
| -rw-r--r-- | graphics/asymptote/patches/patch-gsl.cc | 26 |
3 files changed, 30 insertions, 3 deletions
diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile index c5321addc16..79d36a6e5bc 100644 --- a/graphics/asymptote/Makefile +++ b/graphics/asymptote/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2015/06/12 10:50:08 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2015/12/12 20:44:13 markd Exp $ # DISTNAME= asymptote-2.15 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asymptote/} EXTRACT_SUFX= .tgz diff --git a/graphics/asymptote/distinfo b/graphics/asymptote/distinfo index c0bbc659dea..e0dc1439980 100644 --- a/graphics/asymptote/distinfo +++ b/graphics/asymptote/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 21:33:52 agc Exp $ +$NetBSD: distinfo,v 1.7 2015/12/12 20:44:13 markd Exp $ SHA1 (asymptote-2.15.src.tgz) = e0fb336c195fb21a39e3d0f3acd4881ce5e170a7 RMD160 (asymptote-2.15.src.tgz) = 1916f4160034d4d76280bfed8ebe0bb898fc80ce @@ -6,5 +6,6 @@ SHA512 (asymptote-2.15.src.tgz) = 62cdaa6cda0d4055fe7f26270e5cac1e8d373ebbfbcc3d Size (asymptote-2.15.src.tgz) = 1763773 bytes SHA1 (patch-configure) = ddefab8f9aed037a32cc854d0aedc4b861153b0f SHA1 (patch-genv.cc) = a02d289383ff2f84617d9cb8bf2df1e51962ee11 +SHA1 (patch-gsl.cc) = 4620bb0c3105cd69ed3e8ce18d1c02213716d7dc SHA1 (patch-prc_writePRC.h) = 4b26db72fd611f0dd8ded8484f0025a3f058a141 SHA1 (patch-runtime.cc) = e61bdfc8c911f81f727c0b341522e66372905b1a diff --git a/graphics/asymptote/patches/patch-gsl.cc b/graphics/asymptote/patches/patch-gsl.cc new file mode 100644 index 00000000000..4b5dbdb7407 --- /dev/null +++ b/graphics/asymptote/patches/patch-gsl.cc @@ -0,0 +1,26 @@ +$NetBSD: patch-gsl.cc,v 1.1 2015/12/12 20:44:13 markd Exp $ + +Support GSL 2.0 (upstream commit 71ff9e769ba5d9995b367201f0d41b7a8dedab9d) + +--- gsl.cc.orig 2015-11-29 11:11:59.000000000 +0000 ++++ gsl.cc +@@ -27,6 +27,7 @@ + #include <gsl/gsl_rng.h> + #include <gsl/gsl_randist.h> + #include <gsl/gsl_cdf.h> ++#include <gsl/gsl_version.h> + + #include "opsymbols.h" + +@@ -1089,7 +1090,11 @@ void gen_rungsl_venv(venv &ve) + addGSLDOUBLE2Func<gsl_sf_ellint_E>(SYM(E)); + addGSLDOUBLE3Func<gsl_sf_ellint_P>(SYM(P),SYM(phi),SYM(k),SYM(n)); ++#if GSL_MAJOR_VERSION >= 2 ++ addGSLDOUBLE2Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k)); ++#else + addGSLDOUBLE3Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k),SYM(n)); ++#endif + addGSLDOUBLE2Func<gsl_sf_ellint_RC>(SYM(RC),SYM(x),SYM(y)); + addGSLDOUBLE3Func<gsl_sf_ellint_RD>(SYM(RD),SYM(x),SYM(y),SYM(z)); + addGSLDOUBLE3Func<gsl_sf_ellint_RF>(SYM(RF),SYM(x),SYM(y),SYM(z)); + addGSLDOUBLE4Func<gsl_sf_ellint_RJ>(SYM(RJ),SYM(x),SYM(y),SYM(z),SYM(p)); |