pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: [pkgsrc-2018Q2] pkgsrc/geography
Module Name: pkgsrc
Committed By: bsiegert
Date: Sat Aug 18 10:31:59 UTC 2018
Modified Files:
pkgsrc/geography/opencpn [pkgsrc-2018Q2]: Makefile distinfo
pkgsrc/geography/opencpn-plugin-debugger [pkgsrc-2018Q2]: Makefile
pkgsrc/geography/opencpn-plugin-draw [pkgsrc-2018Q2]: Makefile
pkgsrc/geography/opencpn-plugin-statusbar [pkgsrc-2018Q2]: Makefile
pkgsrc/geography/opencpn-plugin-watchdog [pkgsrc-2018Q2]: Makefile
distinfo
pkgsrc/geography/opencpn-plugin-watchdog/patches [pkgsrc-2018Q2]:
patch-src_Alarm.cpp patch-src_watchdog_pi.cpp
pkgsrc/geography/opencpn-plugin-weather_routing [pkgsrc-2018Q2]:
Makefile
pkgsrc/geography/opencpn/patches [pkgsrc-2018Q2]: patch-CMakeLists.txt
patch-plugins_wmm_pi_src_MagneticPlotMap.cpp
Log Message:
Pullup ticket #5804 - requested by bouyer
geography/opencpn: build fix
Revisions pulled up:
- geography/opencpn-plugin-debugger/Makefile 1.11
- geography/opencpn-plugin-draw/Makefile 1.17
- geography/opencpn-plugin-statusbar/Makefile 1.8
- geography/opencpn-plugin-watchdog/Makefile 1.15
- geography/opencpn-plugin-watchdog/distinfo 1.10
- geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp 1.2
- geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp 1.2
- geography/opencpn-plugin-weather_routing/Makefile 1.18
- geography/opencpn/Makefile 1.24
- geography/opencpn/distinfo 1.19-1.20
- geography/opencpn/patches/patch-CMakeLists.txt 1.7
- geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp 1.2
---
Module Name: pkgsrc
Committed By: bouyer
Date: Tue Jul 3 15:14:16 UTC 2018
Modified Files:
pkgsrc/geography/opencpn: distinfo
pkgsrc/geography/opencpn-plugin-watchdog: distinfo
pkgsrc/geography/opencpn-plugin-watchdog/patches: patch-src_Alarm.cpp
patch-src_watchdog_pi.cpp
pkgsrc/geography/opencpn/patches:
patch-plugins_wmm_pi_src_MagneticPlotMap.cpp
Log Message:
newer gcc (e.g. 8.0_RC2) requires <cmath> for std::isnan().
This is only a build fix so no revision bump
---
Module Name: pkgsrc
Committed By: bouyer
Date: Thu Jul 19 17:58:58 UTC 2018
Modified Files:
pkgsrc/geography/opencpn: Makefile distinfo
pkgsrc/geography/opencpn-plugin-debugger: Makefile
pkgsrc/geography/opencpn-plugin-draw: Makefile
pkgsrc/geography/opencpn-plugin-statusbar: Makefile
pkgsrc/geography/opencpn-plugin-watchdog: Makefile
pkgsrc/geography/opencpn-plugin-weather_routing: Makefile
pkgsrc/geography/opencpn/patches: patch-CMakeLists.txt
Log Message:
Do not include buildlink3 files already inclued by wxGTK30/buildlink3.mk
(especially, remove gtk2 buildlink3).
Make opencpn build with gtk3
Conservatively bump PKGREVISIONs
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 pkgsrc/geography/opencpn/Makefile
cvs rdiff -u -r1.18 -r1.18.2.1 pkgsrc/geography/opencpn/distinfo
cvs rdiff -u -r1.10 -r1.10.2.1 \
pkgsrc/geography/opencpn-plugin-debugger/Makefile
cvs rdiff -u -r1.16 -r1.16.2.1 pkgsrc/geography/opencpn-plugin-draw/Makefile
cvs rdiff -u -r1.7 -r1.7.2.1 \
pkgsrc/geography/opencpn-plugin-statusbar/Makefile
cvs rdiff -u -r1.14 -r1.14.2.1 \
pkgsrc/geography/opencpn-plugin-watchdog/Makefile
cvs rdiff -u -r1.9 -r1.9.2.1 \
pkgsrc/geography/opencpn-plugin-watchdog/distinfo
cvs rdiff -u -r1.1 -r1.1.2.1 \
pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp \
pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp
cvs rdiff -u -r1.17 -r1.17.2.1 \
pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
cvs rdiff -u -r1.6 -r1.6.12.1 \
pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.1.2.1 \
pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/geography/opencpn/Makefile
diff -u pkgsrc/geography/opencpn/Makefile:1.23 pkgsrc/geography/opencpn/Makefile:1.23.2.1
--- pkgsrc/geography/opencpn/Makefile:1.23 Sun Apr 29 21:31:42 2018
+++ pkgsrc/geography/opencpn/Makefile Sat Aug 18 10:31:58 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2018/04/29 21:31:42 adam Exp $
+# $NetBSD: Makefile,v 1.23.2.1 2018/08/18 10:31:58 bsiegert Exp $
DISTNAME= OpenCPN-4.8.2
-PKGREVISION= 4
+PKGREVISION= 5
PKGNAME= ${DISTNAME:S/OpenCPN/opencpn/}
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenCPN/}
@@ -14,9 +14,9 @@ HOMEPAGE= http://www.opencpn.org/
COMMENT= Concise ChartPlotter/Navigator
LICENSE= gnu-gpl-v2
-USE_LANGUAGES= c c++
-USE_TOOLS= gettext
-USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= gettext pkg-config
+USE_CMAKE= yes
CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_ARGS+= -DBUNDLE_DOCS=ON -DBUNDLE_GSHHS=CRUDE -DBUNDLE_TCDATA=ON
@@ -41,10 +41,7 @@ SUBST_SED.prefix= -e s,"/usr/local,"${PR
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../audio/portaudio-devel/buildlink3.mk"
Index: pkgsrc/geography/opencpn/distinfo
diff -u pkgsrc/geography/opencpn/distinfo:1.18 pkgsrc/geography/opencpn/distinfo:1.18.2.1
--- pkgsrc/geography/opencpn/distinfo:1.18 Fri Apr 13 18:57:29 2018
+++ pkgsrc/geography/opencpn/distinfo Sat Aug 18 10:31:58 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2018/04/13 18:57:29 bouyer Exp $
+$NetBSD: distinfo,v 1.18.2.1 2018/08/18 10:31:58 bsiegert Exp $
SHA1 (OpenCPN-4.8.2.zip) = 9547a99c0de739fb0f4953d37bb738ed651f5c62
RMD160 (OpenCPN-4.8.2.zip) = f217d07cc639292e657b0f89f96daa12cab2a355
SHA512 (OpenCPN-4.8.2.zip) = 53635bcb77d96171afecdbf6bb987256016dce9019eca6c644500e14b820ed0843be6cdc3c0567b537eb1a65dbee4cfcaa73fa13361d6deb1ed0aa585d0e6cba
Size (OpenCPN-4.8.2.zip) = 61827184 bytes
-SHA1 (patch-CMakeLists.txt) = c20b25c64790f5a595a5ef2940f430e588ffdf14
+SHA1 (patch-CMakeLists.txt) = 6d11df2c83e445050c91e23ec6657798726b4338
SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65
@@ -12,7 +12,7 @@ SHA1 (patch-plugins_dashboard_pi_CMakeLi
SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49
SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046
SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a
-SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = eb2f4c09913e849becf1e270b0219ffdf46bb922
+SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = 885f940777b38c8e59cc5d2e4fdbd1bf9a91578d
SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
Index: pkgsrc/geography/opencpn-plugin-debugger/Makefile
diff -u pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.10 pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.10.2.1
--- pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.10 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-debugger/Makefile Sat Aug 18 10:31:58 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2018/08/18 10:31:58 bsiegert Exp $
#
VERSION= 20170414
-PKGREVISION= 5
+PKGREVISION= 6
DISTNAME= ocpndebugger_pi-${VERSION}
PKGNAME= opencpn-plugin-debugger-${VERSION}
CATEGORIES= geography
@@ -26,9 +26,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-draw/Makefile
diff -u pkgsrc/geography/opencpn-plugin-draw/Makefile:1.16 pkgsrc/geography/opencpn-plugin-draw/Makefile:1.16.2.1
--- pkgsrc/geography/opencpn-plugin-draw/Makefile:1.16 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-draw/Makefile Sat Aug 18 10:31:58 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2018/08/18 10:31:58 bsiegert Exp $
#
VERSION= 1.5_20180405
DISTNAME= ocpn_draw_pi-${VERSION}
PKGNAME= opencpn-plugin-draw-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=jongough/}
GITHUB_PROJECT= ocpn_draw_pi
@@ -26,9 +26,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-statusbar/Makefile
diff -u pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.7 pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.7.2.1
--- pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.7 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-statusbar/Makefile Sat Aug 18 10:31:58 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2018/08/18 10:31:58 bsiegert Exp $
VERSION= 20180405
-PKGREVISION= 3
+PKGREVISION= 4
DISTNAME= statusbar_pi-${VERSION}
PKGNAME= opencpn-plugin-statusbar-${VERSION}
CATEGORIES= geography
@@ -25,9 +25,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-watchdog/Makefile
diff -u pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.14 pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.14.2.1
--- pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.14 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-watchdog/Makefile Sat Aug 18 10:31:58 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2018/08/18 10:31:58 bsiegert Exp $
#
VERSION= 20180405
DISTNAME= watchdog_pi-${VERSION}
PKGNAME= opencpn-plugin-watchdog-${VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
GITHUB_PROJECT= watchdog_pi
@@ -26,9 +26,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-watchdog/distinfo
diff -u pkgsrc/geography/opencpn-plugin-watchdog/distinfo:1.9 pkgsrc/geography/opencpn-plugin-watchdog/distinfo:1.9.2.1
--- pkgsrc/geography/opencpn-plugin-watchdog/distinfo:1.9 Thu Apr 19 09:59:28 2018
+++ pkgsrc/geography/opencpn-plugin-watchdog/distinfo Sat Aug 18 10:31:58 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2018/04/19 09:59:28 bouyer Exp $
+$NetBSD: distinfo,v 1.9.2.1 2018/08/18 10:31:58 bsiegert Exp $
SHA1 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = e96b4390349488a41d8ca74203a3316512be84cb
RMD160 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = 033f0c65129a811b01ce24655c9bc4ec4435f3d8
SHA512 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) =
9398cc2663d5acee13022105a98a76eb1b2dc3cf67e7d49bb0554161488125276b181e9e5392654dea23413e167b95b0acfd4600d1f4ed1c72b678e622873c89
Size (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = 485682 bytes
SHA1 (patch-cmake_PluginConfigure.cmake) = bc2d6409f95cffee145173280c33f9e7fe439864
-SHA1 (patch-src_Alarm.cpp) = 5cbe32ca31ad1ec8407683358e0a5c44ea062e06
-SHA1 (patch-src_watchdog_pi.cpp) = bcae586e09820f80ea34d5c497476b0883742b5b
+SHA1 (patch-src_Alarm.cpp) = 3eab8a83a2304c9378b1e21bfc367e41833b3973
+SHA1 (patch-src_watchdog_pi.cpp) = 8d8077490aa7a121fae82931ae0c8de89f82fbaf
SHA1 (patch-src_wddc.cpp) = 3c43974da65dfe9a18a77f4b84595a4ab602cfd9
Index: pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp
diff -u pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp:1.1 pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp:1.1.2.1
--- pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp:1.1 Mon Apr 9 14:18:26 2018
+++ pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp Sat Aug 18 10:31:58 2018
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_Alarm.cpp,v 1.1 2018/04/09 14:18:26 bouyer Exp $
+$NetBSD: patch-src_Alarm.cpp,v 1.1.2.1 2018/08/18 10:31:58 bsiegert Exp $
---- src/Alarm.cpp.orig 2018-04-09 14:38:56.349739590 +0200
-+++ src/Alarm.cpp 2018-04-09 14:39:24.526834514 +0200
-@@ -81,7 +81,7 @@
+--- src/Alarm.cpp.orig 2018-03-04 15:24:36.000000000 +0100
++++ src/Alarm.cpp 2018-07-02 12:13:29.929855122 +0200
+@@ -27,6 +27,7 @@
+ #include <map>
+
+ #include <wx/wx.h>
++#include <cmath>
+ #include "wx28compat.h"
+ #include "wddc.h"
+
+@@ -81,7 +82,7 @@
bool Test() {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -11,7 +19,16 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return m_bNoData;
double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2;
-@@ -188,7 +188,7 @@
+@@ -96,7 +97,7 @@
+ while(count < 10 && dist1 > 1e-6) {
+ PositionBearingDistanceMercator_Plugin
+ (lastfix.Lat, lastfix.Lon, lastfix.Cog, dist + dist1, &lat2, &lon2);
+- if(!wxIsNaN(lat2) && PlugIn_GSHHS_CrossesLand(lat1, lon1, lat2, lon2)) {
++ if(!std::isnan(lat2) && PlugIn_GSHHS_CrossesLand(lat1, lon1, lat2, lon2)) {
+ if(dist1 < 1) {
+ m_LandFallTime = wxTimeSpan::Seconds(3600.0 * (dist + dist1) / lastfix.Sog);
+ m_crossinglat1 = lat1, m_crossinglon1 = lon1;
+@@ -188,7 +189,7 @@
void Render(wdDC &dc, PlugIn_ViewPort &vp) {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -20,7 +37,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return;
wxPoint r1, r2, r3, r4;
-@@ -350,7 +350,7 @@
+@@ -350,7 +351,7 @@
bool Test() {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -29,7 +46,43 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return m_bNoData;
double lat, lon;
-@@ -1701,7 +1701,7 @@
+@@ -389,7 +390,7 @@
+
+ switch(m_Mode) {
+ case TIME: {
+- if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon) ||wxIsNaN(lastfix.Cog) || wxIsNaN(lastfix.Sog)) break;
++ if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon) ||std::isnan(lastfix.Cog) || std::isnan(lastfix.Sog)) break;
+ if(ODVersionNewerThan( 1, 1, 1)) {
+ dist = lastfix.Sog * ( m_TimeMinutes / 60 );
+ PositionBearingDistanceMercator_Plugin(lastfix.Lat, lastfix.Lon, lastfix.Cog, dist, &lat, &lon);
+@@ -589,7 +590,7 @@
+ break;
+ }
+ case DISTANCE: {
+- if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon)) break;
++ if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon)) break;
+ // check OD version to see which lookup to use
+ if( ODVersionNewerThan( 1, 1, 1)) {
+ BoundaryCrossingList.clear();
+@@ -817,7 +818,7 @@
+ break;
+ }
+ case ANCHOR: {
+- if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon)) break;
++ if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon)) break;
+ if(m_BoundaryName == wxEmptyString)
+ m_BoundaryName = g_BoundaryName;
+ if(m_BoundaryDescription == wxEmptyString)
+@@ -850,7 +851,7 @@
+ break;
+ }
+ case GUARD: {
+- if(wxIsNaN(g_AISTarget.m_dLat) || wxIsNaN(g_AISTarget.m_dLat)) break;
++ if(std::isnan(g_AISTarget.m_dLat) || std::isnan(g_AISTarget.m_dLat)) break;
+ wxJSONValue jMsg;
+ wxJSONWriter writer;
+ wxString MsgString;
+@@ -1701,7 +1702,7 @@
}
bool Test() {
@@ -38,7 +91,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return m_bNoData;
return Distance() > m_Radius;
}
-@@ -1718,7 +1718,7 @@
+@@ -1718,7 +1719,7 @@
double anchordist = Distance();
wxString s;
@@ -47,7 +100,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
s = _T("N/A");
else {
wxString fmt(_T("%.0f "));
-@@ -1782,7 +1782,7 @@
+@@ -1782,7 +1783,7 @@
private:
double Distance() {
@@ -56,7 +109,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return NAN;
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
-@@ -1820,7 +1820,7 @@
+@@ -1820,7 +1821,7 @@
bool Test() {
double error = CourseError();
@@ -65,7 +118,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return m_bNoData;
return error > m_Tolerance;
-@@ -1829,7 +1829,7 @@
+@@ -1829,7 +1830,7 @@
wxString GetStatus() {
double courseerror = CourseError();
wxString s;
@@ -74,7 +127,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
s = _T("N/A");
else {
wxString fmt(_T("%.0f "));
-@@ -1850,7 +1850,7 @@
+@@ -1850,7 +1851,7 @@
double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2, lat3, lon3;
double dist = lastfix.Sog;
@@ -83,7 +136,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return;
PositionBearingDistanceMercator_Plugin(lat1, lon1, m_Course+m_Tolerance,
-@@ -1949,7 +1949,7 @@
+@@ -1949,7 +1950,7 @@
wxString GetStatus() {
wxString s;
@@ -92,7 +145,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
s = _T("N/A");
else {
wxString fmt(_T("%.1f"));
-@@ -1983,7 +1983,7 @@
+@@ -1983,7 +1984,7 @@
bool Test() {
double knots = Knots();
@@ -101,7 +154,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
return m_bNoData;
if(m_Mode == UNDERSPEED)
-@@ -2038,7 +2038,7 @@
+@@ -2038,7 +2039,7 @@
{
Alarm::OnTimer( tEvent );
double sog = g_watchdog_pi->LastFix().Sog;
@@ -110,7 +163,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
m_SOGqueue.push_front(sog) ;
return;
}
-@@ -2101,7 +2101,7 @@
+@@ -2101,7 +2102,7 @@
val = 360 - val;
}
@@ -119,7 +172,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
s = _T("N/A");
else {
wxString fmt(_T("%.1f"));
-@@ -2300,7 +2300,7 @@
+@@ -2300,7 +2301,7 @@
s += _T(" ");
double val = Value();
@@ -128,7 +181,7 @@ $NetBSD: patch-src_Alarm.cpp,v 1.1 2018/
s += _T("N/A");
else {
wxString fmt(_T("%.2f"));
-@@ -2439,7 +2439,7 @@
+@@ -2439,7 +2440,7 @@
value = nmea.Mtw.Temperature;
break;
}
Index: pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp
diff -u pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp:1.1 pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp:1.1.2.1
--- pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp:1.1 Mon Apr 9 14:18:26 2018
+++ pkgsrc/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp Sat Aug 18 10:31:58 2018
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_watchdog_pi.cpp,v 1.1 2018/04/09 14:18:26 bouyer Exp $
+$NetBSD: patch-src_watchdog_pi.cpp,v 1.1.2.1 2018/08/18 10:31:58 bsiegert Exp $
---- src/watchdog_pi.cpp.orig 2018-04-09 14:24:25.426153922 +0200
-+++ src/watchdog_pi.cpp 2018-04-09 14:25:01.452945740 +0200
-@@ -345,14 +345,14 @@
+--- src/watchdog_pi.cpp.orig 2018-03-04 15:24:36.000000000 +0100
++++ src/watchdog_pi.cpp 2018-07-02 12:05:36.112240381 +0200
+@@ -26,6 +26,7 @@
+
+ #include <wx/wx.h>
+ #include <wx/stdpaths.h>
++#include <cmath>
+
+ #include "wxJSON/jsonreader.h"
+ #include "wxJSON/jsonwriter.h"
+@@ -345,14 +346,14 @@
{
/* calculate course and speed over ground from gps */
double dt = m_lastfix.FixTime - m_lasttimerfix.FixTime;
Index: pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.17 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.17.2.1
--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.17 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile Sat Aug 18 10:31:58 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2018/08/18 10:31:58 bsiegert Exp $
#
VERSION= 20180405
DISTNAME= weather_routing_pi-${VERSION}
PKGNAME= opencpn-plugin-weather_routing-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
GITHUB_PROJECT= weather_routing_pi
@@ -27,9 +27,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
diff -u pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.6 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.6.12.1
--- pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.6 Tue Apr 18 13:31:55 2017
+++ pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt Sat Aug 18 10:31:59 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2017/04/18 13:31:55 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6.12.1 2018/08/18 10:31:59 bsiegert Exp $
---- CMakeLists.txt.orig 2017-04-02 05:17:09.000000000 +0200
-+++ CMakeLists.txt 2017-04-18 15:03:46.000000000 +0200
-@@ -65,8 +65,21 @@
+--- CMakeLists.txt.orig 2018-02-07 12:08:26.000000000 +0100
++++ CMakeLists.txt 2018-07-19 17:20:24.093239101 +0200
+@@ -91,8 +91,21 @@
# Based on code from nohal
IF (NOT WIN32)
# default
@@ -25,7 +25,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.6 2017
IF (EXISTS /etc/debian_version)
SET (PACKAGE_FORMAT "DEB")
SET (PACKAGE_DEPS "libc6, libwxgtk3.0-0, wx3.0-i18n, libglu1-mesa (>= 7.0.0), libgl1-mesa-glx (>= 7.0.0), zlib1g, bzip2, libtinyxml2.6.2, libportaudio2")
-@@ -99,7 +112,6 @@
+@@ -125,7 +138,6 @@
ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
SET (ARCH "x86_64")
@@ -33,7 +33,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.6 2017
ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
SET (ARCH "i386")
SET (LIB_INSTALL_DIR "lib")
-@@ -318,7 +330,7 @@
+@@ -344,7 +356,7 @@
# Search for opengles, short of running a program to test the speed
# of acceleration, I simply use gles on "native linux" arm systems
@@ -42,7 +42,20 @@ $NetBSD: patch-CMakeLists.txt,v 1.6 2017
find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
IF (OPENGLESv1_INCLUDE_DIR)
MESSAGE (STATUS "Found OpenGLESv1")
-@@ -1861,10 +1873,10 @@
+@@ -868,7 +880,11 @@
+
+
+ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+- OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF)
++ IF(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD")
++ OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" ON)
++ ELSE(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD")
++ OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF)
++ ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD")
+
+ IF(NOT OCPN_FORCE_GTK3)
+ FIND_PACKAGE(GTK2)
+@@ -1919,10 +1935,10 @@
# Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries
# So, add them manually. These declarations may be redundant in some architectures, but do no harm.
Index: pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp
diff -u pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp:1.1 pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp:1.1.2.1
--- pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp:1.1 Mon Apr 9 18:44:50 2018
+++ pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp Sat Aug 18 10:31:59 2018
@@ -1,8 +1,16 @@
-$NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.1 2018/04/09 18:44:50 bouyer Exp $
+$NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.1.2.1 2018/08/18 10:31:59 bsiegert Exp $
---- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig 2018-04-09 18:01:32.900360435 +0200
-+++ plugins/wmm_pi/src/MagneticPlotMap.cpp 2018-04-09 18:02:29.319040318 +0200
-@@ -230,7 +230,7 @@
+--- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig 2018-02-07 12:08:26.000000000 +0100
++++ plugins/wmm_pi/src/MagneticPlotMap.cpp 2018-07-02 12:16:38.589797991 +0200
+@@ -32,6 +32,7 @@
+ #endif //precompiled headers
+
+ #include <wx/progdlg.h>
++#include <cmath>
+
+ #include "ocpn_plugin.h"
+
+@@ -230,7 +231,7 @@
else
p = CalcParameter(lonval, rx);
@@ -11,7 +19,7 @@ $NetBSD: patch-plugins_wmm_pi_src_Magnet
return true;
if(m_type == DECLINATION && p-ry*m_Spacing < -180) /* way off, try other way around */
-@@ -290,7 +290,7 @@
+@@ -290,7 +291,7 @@
double p3 = CachedCalcParameter(lat2, lon1);
double p4 = CachedCalcParameter(lat2, lon2);
@@ -20,7 +28,7 @@ $NetBSD: patch-plugins_wmm_pi_src_Magnet
return;
double ry1, ry2, ry3, ry4 = 0.0;
-@@ -318,7 +318,7 @@
+@@ -318,7 +319,7 @@
ry1*=m_Spacing, ry2*=m_Spacing, ry3*=m_Spacing, ry4*=m_Spacing;
/* determine which interpolations need line segments */
Home |
Main Index |
Thread Index |
Old Index