[pkgsrc/trunk]: pkgsrc/misc/zyGrib Update to 8.0.1. Changes since 7.0.0:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc/zyGrib Update to 8.0.1. Changes since 7.0.0:
From: bouyer <bouyer%pkgsrc.org@localhost>
Date: Mon, 28 Oct 2019 19:57:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb0b26b083b2
branches:  trunk
changeset: 343024:eb0b26b083b2
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Mon Oct 28 19:02:35 2019 +0000

description:
Update to 8.0.1. Changes since 7.0.0:
2016-11-09 : zyGrib Version 8.0.1

    Bug fixed: inverted sea current arrows (one more time).
    There was a problem with some dll in the Windows archive of the previous
      version.

2016-11-08 : zyGrib Version 8.0.0

    Read GRIB 2 files.
    Bug fixed: inverted sea current arrows.
    Display equivalent potential temperature th?ta-e at the surface and in
      altitude (calculated from the temperature, pressure and moisture if it
      is not present in the file).
    Faster calculation of the level lines.
    Ability to interrupt before the opening of a large file.
    Use QT version 5.
    Use g2clib NOAA's g2clib library for decoding the GRIB2 format.

diffstat:

 misc/zyGrib/Makefile                            |  22 +++--
 misc/zyGrib/PLIST                               |   5 +-
 misc/zyGrib/distinfo                            |  15 ++-
 misc/zyGrib/patches/patch-Terrain.cpp           |  10 +-
 misc/zyGrib/patches/patch-aa                    |  88 +++++++++++++++++++++---
 misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c |  13 +++
 6 files changed, 118 insertions(+), 35 deletions(-)

diffs (259 lines):

diff -r 48859f81b878 -r eb0b26b083b2 misc/zyGrib/Makefile
--- a/misc/zyGrib/Makefile      Mon Oct 28 19:00:37 2019 +0000
+++ b/misc/zyGrib/Makefile      Mon Oct 28 19:02:35 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2018/07/04 13:40:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2019/10/28 19:02:35 bouyer Exp $
 #
 
-DISTNAME=      zyGrib-7.0.0
-PKGREVISION=   5
+DISTNAME=      zyGrib-8.0.1
 CATEGORIES=    misc
-MASTER_SITES=  http://www.zygrib.org/getfile.php?file=
+MASTER_SITES=  https://www.zygrib.org/getfile.php?file=
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    plunky%NetBSD.org@localhost
@@ -34,7 +33,6 @@
 INSTALLATION_DIRS+=    share/zyGrib/maps/gshhs
 INSTALLATION_DIRS+=    share/zyGrib/stuff
 INSTALLATION_DIRS+=    share/zyGrib/tr
-
 INSTALL_FILES+=        colors/colors_binary.txt
 INSTALL_FILES+=        colors/colors_cape_jkg.txt
 INSTALL_FILES+=        colors/colors_cin_jkg.txt
@@ -75,6 +73,7 @@
 INSTALL_FILES+=        img/drapeau_es.png
 INSTALL_FILES+=        img/drapeau_fi.png
 INSTALL_FILES+=        img/drapeau_fr.png
+INSTALL_FILES+=        img/drapeau_gr.png
 INSTALL_FILES+=        img/drapeau_it.png
 INSTALL_FILES+=        img/drapeau_nl.png
 INSTALL_FILES+=        img/drapeau_pt.png
@@ -140,6 +139,8 @@
 INSTALL_FILES+=        tr/zyGrib_fi.ts
 INSTALL_FILES+=        tr/zyGrib_fr.qm
 INSTALL_FILES+=        tr/zyGrib_fr.ts
+INSTALL_FILES+=        tr/zyGrib_gr.qm
+INSTALL_FILES+=        tr/zyGrib_gr.ts
 INSTALL_FILES+=        tr/zyGrib_it.qm
 INSTALL_FILES+=        tr/zyGrib_it.ts
 INSTALL_FILES+=        tr/zyGrib_nl.qm
@@ -150,7 +151,7 @@
 INSTALL_FILES+=        tr/zyGrib_ru.ts
 
 do-configure:
-       cd ${WRKSRC} && ${QTDIR}/bin/qmake
+       cd ${WRKSRC} && ${QTDIR}/bin/qmake "QMAKE_RPATHDIR+=${QWT_DIR}/lib" "QMAKE_LIBDIR+=${QWT_DIR}/lib"
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/zyGrib ${DESTDIR}${PREFIX}/bin
@@ -160,10 +161,13 @@
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
 .include "../../geography/libnova/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qwt6-qt4/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qwt6-qt5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 48859f81b878 -r eb0b26b083b2 misc/zyGrib/PLIST
--- a/misc/zyGrib/PLIST Mon Oct 28 19:00:37 2019 +0000
+++ b/misc/zyGrib/PLIST Mon Oct 28 19:02:35 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/12/30 08:50:55 plunky Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/10/28 19:02:35 bouyer Exp $
 bin/zyGrib
 share/zyGrib/colors/colors_binary.txt
 share/zyGrib/colors/colors_cape_jkg.txt
@@ -40,6 +40,7 @@
 share/zyGrib/img/drapeau_es.png
 share/zyGrib/img/drapeau_fi.png
 share/zyGrib/img/drapeau_fr.png
+share/zyGrib/img/drapeau_gr.png
 share/zyGrib/img/drapeau_it.png
 share/zyGrib/img/drapeau_nl.png
 share/zyGrib/img/drapeau_pt.png
@@ -105,6 +106,8 @@
 share/zyGrib/tr/zyGrib_fi.ts
 share/zyGrib/tr/zyGrib_fr.qm
 share/zyGrib/tr/zyGrib_fr.ts
+share/zyGrib/tr/zyGrib_gr.qm
+share/zyGrib/tr/zyGrib_gr.ts
 share/zyGrib/tr/zyGrib_it.qm
 share/zyGrib/tr/zyGrib_it.ts
 share/zyGrib/tr/zyGrib_nl.qm
diff -r 48859f81b878 -r eb0b26b083b2 misc/zyGrib/distinfo
--- a/misc/zyGrib/distinfo      Mon Oct 28 19:00:37 2019 +0000
+++ b/misc/zyGrib/distinfo      Mon Oct 28 19:02:35 2019 +0000
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.21 2015/11/03 23:49:55 agc Exp $
+$NetBSD: distinfo,v 1.22 2019/10/28 19:02:35 bouyer Exp $
 
-SHA1 (zyGrib-7.0.0.tgz) = 376e7f813ac92f5e70163f90909d96a3912a0c61
-RMD160 (zyGrib-7.0.0.tgz) = 5df3660963d9227269ccd304c7810e26f93a018c
-SHA512 (zyGrib-7.0.0.tgz) = ae6e279b874aca510ccf91fecab06ce155427edd6a45844ef1053617512fd81e110f2338c22b10879c8e93dab226cfcdf58bf0270e4ed83931369c51b8869399
-Size (zyGrib-7.0.0.tgz) = 15287496 bytes
+SHA1 (zyGrib-8.0.1.tgz) = 735580325efa3332a75d2ea5b02deaae613265ef
+RMD160 (zyGrib-8.0.1.tgz) = 13e5233598fe8f3c49efb952cf0a4009c6d7b9f8
+SHA512 (zyGrib-8.0.1.tgz) = bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
+Size (zyGrib-8.0.1.tgz) = 19759812 bytes
 SHA1 (patch-ColorScale.cpp) = 26255acc30d81aba2abd7f51ef96677446645c78
-SHA1 (patch-Terrain.cpp) = cda31862011b758aa6b1c3655b9383dd1b38aceb
-SHA1 (patch-aa) = 54bb3e7207a722f47667bb4c52d30084e5d5a675
+SHA1 (patch-Terrain.cpp) = 98aba88e5704cdf0771c757d86d962ee043cecf4
+SHA1 (patch-aa) = 1de327ef2cb5ea601ffbd6e5f3ba760dfe9543b0
 SHA1 (patch-ab) = 1da0e837a68b7942ab8d4a829b92eef6b8e359e8
+SHA1 (patch-g2clib_enc_jpeg2000.c) = e73e6d85850d291c5543aeea748ddeba42c30a51
 SHA1 (patch-util_Util.h) = a7ae101a11de7ca29e8e6e8ccf173c5216ea3ac7
diff -r 48859f81b878 -r eb0b26b083b2 misc/zyGrib/patches/patch-Terrain.cpp
--- a/misc/zyGrib/patches/patch-Terrain.cpp     Mon Oct 28 19:00:37 2019 +0000
+++ b/misc/zyGrib/patches/patch-Terrain.cpp     Mon Oct 28 19:02:35 2019 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-Terrain.cpp,v 1.3 2014/12/30 08:50:55 plunky Exp $
+$NetBSD: patch-Terrain.cpp,v 1.4 2019/10/28 19:02:35 bouyer Exp $
 
---- Terrain.cpp.orig   2014-11-02 00:01:52.000000000 +0000
-+++ Terrain.cpp
-@@ -1109,7 +1109,7 @@ void Terrain::paintEvent(QPaintEvent *)
+--- Terrain.cpp.orig   2016-11-09 17:27:38.000000000 +0100
++++ Terrain.cpp        2019-10-28 15:49:41.442663233 +0100
+@@ -1135,7 +1135,7 @@
              
              if (showOrthodromie)
              {
--                QPen penLine(QColor(Qt::white));
+-                QPen penLine(Qt::white);
 +                QPen penLine = QColor(Qt::white);
                  penLine.setWidthF(1.6);
                  pnt.setPen(penLine);
diff -r 48859f81b878 -r eb0b26b083b2 misc/zyGrib/patches/patch-aa
--- a/misc/zyGrib/patches/patch-aa      Mon Oct 28 19:00:37 2019 +0000
+++ b/misc/zyGrib/patches/patch-aa      Mon Oct 28 19:02:35 2019 +0000
@@ -1,25 +1,87 @@
-$NetBSD: patch-aa,v 1.9 2014/12/30 08:50:55 plunky Exp $
+$NetBSD: patch-aa,v 1.10 2019/10/28 19:02:35 bouyer Exp $
 
 libraries are provided by the buildlink3.mk framework;
 no need to provide paths
 
---- zyGrib.pro.orig    2014-11-02 00:01:52.000000000 +0000
-+++ zyGrib.pro
-@@ -5,7 +5,7 @@ TEMPLATE = app
+--- zyGrib.pro.orig    2016-11-09 17:27:38.000000000 +0100
++++ zyGrib.pro 2019-10-28 18:15:22.969081317 +0100
+@@ -7,8 +7,8 @@
+ TEMPLATE = app
  TARGET   = zyGrib
  
- DEPENDPATH  += . util map GUI
--INCLUDEPATH += . util map GUI curvedrawer qwt-6.0.1/src
-+INCLUDEPATH += . util map GUI curvedrawer
+-DEPENDPATH  += . util map GUI
+-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
++DEPENDPATH  += . util map GUI 
++INCLUDEPATH += . util map GUI curvedrawer g2clib
  
  # ----------------------------------------------------
  # platform specific
-@@ -26,7 +26,7 @@ macx {
- }
- else {
-       DESTDIR = .
--      LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt
-+      LIBS += -lbz2 -lz -lproj -lnova -lqwt
+@@ -35,12 +35,13 @@
  }
  }
+ 
+-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
+-LIBS +=  -Lg2clib -lg2c -lpng -ljasper  # respect order!
++LIBS += -lbz2 -lz -lproj -lnova -lqwt
++LIBS +=  -lpng -ljasper  # respect order!
+ 
  # ----------------------------------------------------
+-CFLAGS += -std=c99 
++CFLAGS += -std=c99 -DUSE_JPEG2000 -DUSE_PNG
+ 
++QMAKE_CFLAGS += -DUSE_JPEG2000 -DUSE_PNG
+ QMAKE_CXXFLAGS_RELEASE -= -O2
+ QMAKE_CXXFLAGS_RELEASE += -O3
+       
+@@ -240,6 +241,48 @@
+            Terrain.cpp \
+            Therm.cpp \
+            util/Util.cpp \
+-           util/zuFile.cpp
+-
+-
++           util/zuFile.cpp \
++      g2clib/gridtemplates.c \
++      g2clib/drstemplates.c \
++      g2clib/pdstemplates.c \
++      g2clib/gbits.c \
++      g2clib/g2_unpack1.c \
++      g2clib/g2_unpack2.c \
++      g2clib/g2_unpack3.c \
++      g2clib/g2_unpack4.c \
++      g2clib/g2_unpack5.c \
++      g2clib/g2_unpack6.c \
++      g2clib/g2_unpack7.c \
++      g2clib/g2_free.c \
++      g2clib/g2_info.c \
++      g2clib/g2_getfld.c \
++      g2clib/simunpack.c \
++      g2clib/comunpack.c \
++        g2clib/pack_gp.c \
++        g2clib/reduce.c \
++      g2clib/specpack.c \
++      g2clib/specunpack.c \
++      g2clib/rdieee.c \
++      g2clib/mkieee.c \
++      g2clib/int_power.c \
++      g2clib/simpack.c \
++      g2clib/compack.c \
++        g2clib/cmplxpack.c \
++      g2clib/misspack.c \
++      g2clib/jpcpack.c \
++      g2clib/jpcunpack.c \
++      g2clib/pngpack.c \
++      g2clib/pngunpack.c \
++      g2clib/dec_jpeg2000.c \
++      g2clib/enc_jpeg2000.c \
++      g2clib/dec_png.c \
++      g2clib/enc_png.c \
++      g2clib/g2_create.c \
++      g2clib/g2_addlocal.c \
++      g2clib/g2_addgrid.c \
++      g2clib/g2_addfield.c \
++      g2clib/g2_gribend.c \
++      g2clib/getdim.c \
++      g2clib/g2_miss.c \
++      g2clib/getpoly.c \
++      g2clib/seekgb.c
diff -r 48859f81b878 -r eb0b26b083b2 misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c   Mon Oct 28 19:02:35 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-g2clib_enc_jpeg2000.c,v 1.1 2019/10/28 19:02:35 bouyer Exp $
+https://github.com/cloudruninc/wps/issues/5
+
+--- g2clib/enc_jpeg2000.c.orig 2019-10-28 18:40:41.262350843 +0100
++++ g2clib/enc_jpeg2000.c      2019-10-28 18:40:52.446238823 +0100
+@@ -121,7 +121,6 @@
+     image.clrspc_=JAS_CLRSPC_SGRAY;         /* grayscale Image */
+     image.cmprof_=0; 
+ #endif
+-    image.inmem_=1;
+ 
+     cmpt.tlx_=0;
+     cmpt.tly_=0;
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11 Add qwt6-qt5 version 6.1.4. Based on qwt6-qt4 pack...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Added x11/qwt6-qt5 version 6.1.4
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11 Add qwt6-qt5 version 6.1.4. Based on qwt6-qt4 pack...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Added x11/qwt6-qt5 version 6.1.4
Indexes:
Home | Main Index | Thread Index | Old Index