From 7000a5b111c25b1ffdcb1c6f5b215b35695a510c Mon Sep 17 00:00:00 2001 From: bouyer Date: Thu, 16 Jun 2016 16:03:55 +0000 Subject: Update to version 20160611 Changes since previous: - update for the new grib plugin - support crossover regions - updated translations - bug fixes --- geography/opencpn-plugin-weather_routing/Makefile | 6 ++-- geography/opencpn-plugin-weather_routing/PLIST | 5 ++- geography/opencpn-plugin-weather_routing/distinfo | 11 +++--- .../patches/patch-src_RouteMap.cpp | 40 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp (limited to 'geography/opencpn-plugin-weather_routing') diff --git a/geography/opencpn-plugin-weather_routing/Makefile b/geography/opencpn-plugin-weather_routing/Makefile index 62a257d41be..6c99add1e00 100644 --- a/geography/opencpn-plugin-weather_routing/Makefile +++ b/geography/opencpn-plugin-weather_routing/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.4 2016/03/14 11:07:59 bouyer Exp $ +# $NetBSD: Makefile,v 1.5 2016/06/16 16:03:55 bouyer Exp $ # -VERSION= 20160208 +VERSION= 20160611 DISTNAME= weather_routing_pi-${VERSION} PKGNAME= opencpn-plugin-weather_routing-${VERSION} CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/} GITHUB_PROJECT= weather_routing_pi -GITHUB_TAG= 509fd720895fcc19fd55bc175305d3a956b0cc8b +GITHUB_TAG= 264605a7a9e3b33e10bbd2375a7d3fd55518b3dc MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://opencpn.org/ocpn/weather_routing_plugin diff --git a/geography/opencpn-plugin-weather_routing/PLIST b/geography/opencpn-plugin-weather_routing/PLIST index 20b1ee3dd40..0e3a5bc93f9 100644 --- a/geography/opencpn-plugin-weather_routing/PLIST +++ b/geography/opencpn-plugin-weather_routing/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2016/03/14 11:07:59 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/06/16 16:03:55 bouyer Exp $ lib/opencpn/libweather_routing_pi.so share/locale/ca/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/cs/LC_MESSAGES/opencpn-weather_routing_pi.mo @@ -12,6 +12,7 @@ share/locale/fr/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/gl/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/hu/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/it/LC_MESSAGES/opencpn-weather_routing_pi.mo +share/locale/ja/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/nb/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/nl/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/pl/LC_MESSAGES/opencpn-weather_routing_pi.mo @@ -19,8 +20,10 @@ share/locale/pt/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/ru/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/sv/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/tr/LC_MESSAGES/opencpn-weather_routing_pi.mo +share/locale/vi/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/zh/LC_MESSAGES/opencpn-weather_routing_pi.mo share/opencpn/plugins/weather_routing_pi/data/WeatherRoutingInformation.html +share/opencpn/plugins/weather_routing_pi/data/info.html share/opencpn/plugins/weather_routing_pi/data/polars/60ft_mono.pol share/opencpn/plugins/weather_routing_pi/data/polars/60ft_multi_1.pol share/opencpn/plugins/weather_routing_pi/data/polars/60ft_multi_2.pol diff --git a/geography/opencpn-plugin-weather_routing/distinfo b/geography/opencpn-plugin-weather_routing/distinfo index 2e212642550..12636b59169 100644 --- a/geography/opencpn-plugin-weather_routing/distinfo +++ b/geography/opencpn-plugin-weather_routing/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2016/03/14 11:07:59 bouyer Exp $ +$NetBSD: distinfo,v 1.5 2016/06/16 16:03:55 bouyer Exp $ -SHA1 (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 5fa4e285a8628bf546e7aa674a79eb181594ee4d -RMD160 (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 484c173e0f85a384ae30d39f98ae429bcff40793 -SHA512 (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 93bc3147bf532cfc956e78a927f7e22be3f1628591ee0baf4a7df94adba6102947b2c6d2863f8429215522122a92c3dbe3acd4d0c258843bec6a2c0d5ae10a66 -Size (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 793334 bytes +SHA1 (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = aac7a6e11ac087d3654cdfe7907e28a8d6fe8d3b +RMD160 (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = 7040af0413957cac5a2e09f16f6afd05467f24ce +SHA512 (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = 920e878d4c25059e30259bcc3d68e32219a7dacb23e35a4b969a568e1ecdd10718bc7b978e4468efcf7faad8927a8bee0076ab8e00a29e51563e1c84083e5006 +Size (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = 847325 bytes SHA1 (patch-cmake_PluginConfigure.cmake) = e2873cbba3d776227d72b8538634f687dc04c439 +SHA1 (patch-src_RouteMap.cpp) = e705e8f11d58675d443c1992c7cf5ab26f2be856 diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp b/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp new file mode 100644 index 00000000000..64ae66f3fcd --- /dev/null +++ b/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp @@ -0,0 +1,40 @@ +$NetBSD: patch-src_RouteMap.cpp,v 1.1 2016/06/16 16:03:55 bouyer Exp $ + +--- src/RouteMap.cpp.orig 2016-06-13 18:14:41.000000000 +0200 ++++ src/RouteMap.cpp 2016-06-13 18:17:23.000000000 +0200 +@@ -550,7 +550,7 @@ + VB = polar.Speed(H, VW); + + /* failed to determine speed.. */ +- if(isnan(B) || isnan(VB)) { ++ if(std::isnan(B) || std::isnan(VB)) { + configuration.polar_failed = true; + return false; //B = VB = 0; + } +@@ -662,7 +662,7 @@ + B = W + H; /* rotated relative to true wind */ + + /* test to avoid extra computations related to backtracking */ +- if(!isnan(bearing1)) { ++ if(!std::isnan(bearing1)) { + double bearing3 = heading_resolve(B); + if((bearing1 > bearing2 && bearing3 > bearing2 && bearing3 < bearing1) || + (bearing1 < bearing2 && (bearing3 > bearing2 || bearing3 < bearing1))) { +@@ -2092,7 +2092,7 @@ + + /* did we tack thru the wind? apply penalty */ + bool tacked = false; +- if(!isnan(dt) && p->parent_heading*H < 0 && fabs(p->parent_heading - H) < 180) { ++ if(!std::isnan(dt) && p->parent_heading*H < 0 && fabs(p->parent_heading - H) < 180) { + tacked = true; + dt += configuration.TackingTime; + #if 0 +@@ -2101,7 +2101,7 @@ + #endif + } + +- if(!isnan(dt) && dt < mindt) { ++ if(!std::isnan(dt) && dt < mindt) { + mindt = dt; + minH = H; + endp = p; -- cgit v1.2.3