diff options
| author | wiedi <wiedi@pkgsrc.org> | 2014-02-07 14:16:34 +0000 |
|---|---|---|
| committer | wiedi <wiedi@pkgsrc.org> | 2014-02-07 14:16:34 +0000 |
| commit | f5ad3ba2ca50d90765de4619232dbc689d139ec9 (patch) | |
| tree | 03fb606d24f4486df09ff7bc8457635b1c2be37a | |
| parent | b43279d0fe2ba92eebb51e67524fb4adcb5d836c (diff) | |
| download | pkgsrc-f5ad3ba2ca50d90765de4619232dbc689d139ec9.tar.gz | |
fix log(int) is ambiguous error on SunOS
| -rw-r--r-- | audio/libsidplay2/Makefile | 4 | ||||
| -rw-r--r-- | audio/libsidplay2/distinfo | 3 | ||||
| -rw-r--r-- | audio/libsidplay2/patches/patch-resid_sid.cc | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile index a366951223d..a39bca8fa40 100644 --- a/audio/libsidplay2/Makefile +++ b/audio/libsidplay2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2012/09/12 00:24:44 asau Exp $ +# $NetBSD: Makefile,v 1.7 2014/02/07 14:16:34 wiedi Exp $ # DISTNAME= sidplay-libs-2.1.1 PKGNAME= libsidplay2-2.1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sidplay2/} diff --git a/audio/libsidplay2/distinfo b/audio/libsidplay2/distinfo index ba10a4edcad..61530140147 100644 --- a/audio/libsidplay2/distinfo +++ b/audio/libsidplay2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2012/02/05 09:00:13 sbd Exp $ +$NetBSD: distinfo,v 1.7 2014/02/07 14:16:34 wiedi Exp $ SHA1 (sidplay-libs-2.1.1.tar.gz) = 8af6350866edc30b0d331e075fa97292f6f645a5 RMD160 (sidplay-libs-2.1.1.tar.gz) = 1ce4c3cb80470a834c5887b3f3be0b61ca71e4cd @@ -10,3 +10,4 @@ SHA1 (patch-builders_hardsid-builder_src_hardsid-builder.cpp) = cc3001b12d3f18d5 SHA1 (patch-builders_resid-builder_src_resid-builder.cpp) = 46d3686eb67256397458df1eac2c017465b616d8 SHA1 (patch-builders_resid-builder_src_resid.cpp) = db9f0bf3658c38e88eba7ced3f6102587558160d SHA1 (patch-libsidplay_src_sidtune_SidTune.cpp) = 20f2a2f36db8c08989ad1239da15a91d82cd2a2f +SHA1 (patch-resid_sid.cc) = 88da243fab096f6b532af111c1d23ebc64ece632 diff --git a/audio/libsidplay2/patches/patch-resid_sid.cc b/audio/libsidplay2/patches/patch-resid_sid.cc new file mode 100644 index 00000000000..37f09a2adc7 --- /dev/null +++ b/audio/libsidplay2/patches/patch-resid_sid.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-resid_sid.cc,v 1.1 2014/02/07 14:16:34 wiedi Exp $ + +fix log(int) is ambiguous on SunOS +--- resid/sid.cc.orig 2004-06-14 20:08:23.000000000 +0000 ++++ resid/sid.cc +@@ -552,7 +552,7 @@ bool SID::set_sampling_parameters(double + // sample_offset a whole multiple of the filter table resolution. + int res = method == SAMPLE_RESAMPLE_INTERPOLATE ? + FIR_RES_INTERPOLATE : FIR_RES_FAST; +- int n = (int)ceil(log(res/f_cycles_per_sample)/log(2)); ++ int n = (int)ceil(log((double)res/f_cycles_per_sample)/log((double)2)); + fir_RES = 1 << n; + + // Allocate memory for FIR tables. |