pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2018Q2]: pkgsrc/geography Pullup ticket #5804 - requested by b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd955fb5f6ca
branches:  pkgsrc-2018Q2
changeset: 313954:bd955fb5f6ca
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Aug 18 10:31:58 2018 +0000

description:
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

diffstat:

 geography/opencpn-plugin-debugger/Makefile                             |   7 +-
 geography/opencpn-plugin-draw/Makefile                                 |   7 +-
 geography/opencpn-plugin-statusbar/Makefile                            |   7 +-
 geography/opencpn-plugin-watchdog/Makefile                             |   7 +-
 geography/opencpn-plugin-watchdog/distinfo                             |   6 +-
 geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp          |  89 +++++++--
 geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp    |  16 +-
 geography/opencpn-plugin-weather_routing/Makefile                      |   7 +-
 geography/opencpn/Makefile                                             |  13 +-
 geography/opencpn/distinfo                                             |   6 +-
 geography/opencpn/patches/patch-CMakeLists.txt                         |  27 ++-
 geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp |  20 +-
 12 files changed, 138 insertions(+), 74 deletions(-)

diffs (truncated from 521 to 300 lines):

diff -r 25323b520847 -r bd955fb5f6ca geography/opencpn-plugin-debugger/Makefile
--- a/geography/opencpn-plugin-debugger/Makefile        Sat Aug 18 10:21:45 2018 +0000
+++ b/geography/opencpn-plugin-debugger/Makefile        Sat Aug 18 10:31:58 2018 +0000
@@ -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/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"
diff -r 25323b520847 -r bd955fb5f6ca geography/opencpn-plugin-draw/Makefile
--- a/geography/opencpn-plugin-draw/Makefile    Sat Aug 18 10:21:45 2018 +0000
+++ b/geography/opencpn-plugin-draw/Makefile    Sat Aug 18 10:31:58 2018 +0000
@@ -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/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"
diff -r 25323b520847 -r bd955fb5f6ca geography/opencpn-plugin-statusbar/Makefile
--- a/geography/opencpn-plugin-statusbar/Makefile       Sat Aug 18 10:21:45 2018 +0000
+++ b/geography/opencpn-plugin-statusbar/Makefile       Sat Aug 18 10:31:58 2018 +0000
@@ -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/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"
diff -r 25323b520847 -r bd955fb5f6ca geography/opencpn-plugin-watchdog/Makefile
--- a/geography/opencpn-plugin-watchdog/Makefile        Sat Aug 18 10:21:45 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/Makefile        Sat Aug 18 10:31:58 2018 +0000
@@ -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/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"
diff -r 25323b520847 -r bd955fb5f6ca geography/opencpn-plugin-watchdog/distinfo
--- a/geography/opencpn-plugin-watchdog/distinfo        Sat Aug 18 10:21:45 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/distinfo        Sat Aug 18 10:31:58 2018 +0000
@@ -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
diff -r 25323b520847 -r bd955fb5f6ca geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp
--- a/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp     Sat Aug 18 10:21:45 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp     Sat Aug 18 10:31:58 2018 +0000
@@ -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 @@
              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 @@
              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 @@
              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 @@
              return m_bNoData;
          return Distance() > m_Radius;
      }
-@@ -1718,7 +1718,7 @@
+@@ -1718,7 +1719,7 @@
  
          double anchordist = Distance();
          wxString s;
@@ -47,7 +100,7 @@
              s = _T("N/A");
          else {
              wxString fmt(_T("%.0f "));
-@@ -1782,7 +1782,7 @@
+@@ -1782,7 +1783,7 @@
  
  private:
      double Distance() {
@@ -56,7 +109,7 @@
              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 @@
              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 @@
              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 @@
              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 @@
              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 @@
              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 @@
              m_SOGqueue.push_front(sog) ;
          return;
      }
-@@ -2101,7 +2101,7 @@
+@@ -2101,7 +2102,7 @@
                  val = 360 - val;
          }
  
@@ -119,7 +172,7 @@
              s = _T("N/A");
          else {
              wxString fmt(_T("%.1f"));
-@@ -2300,7 +2300,7 @@
+@@ -2300,7 +2301,7 @@
          s += _T(" ");



Home | Main Index | Thread Index | Old Index