Mon Oct 28 19:02:35 2019 UTC ()
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騁a-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.


(bouyer)
diff -r1.50 -r1.51 pkgsrc/misc/zyGrib/Makefile
diff -r1.8 -r1.9 pkgsrc/misc/zyGrib/PLIST
diff -r1.21 -r1.22 pkgsrc/misc/zyGrib/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/zyGrib/patches/patch-Terrain.cpp
diff -r1.9 -r1.10 pkgsrc/misc/zyGrib/patches/patch-aa
diff -r0 -r1.1 pkgsrc/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c
cvs diff -r1.50 -r1.51 pkgsrc/misc/zyGrib/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/zyGrib/Makefile 2018/07/04 13:40:25 1.50
+++ pkgsrc/misc/zyGrib/Makefile 2019/10/28 19:02:35 1.51
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.50 2018/07/04 13:40:25 jperkin Exp $ 1# $NetBSD: Makefile,v 1.51 2019/10/28 19:02:35 bouyer Exp $
2# 2#
3 3
4DISTNAME= zyGrib-7.0.0 4DISTNAME= zyGrib-8.0.1
5PKGREVISION= 5 
6CATEGORIES= misc 5CATEGORIES= misc
7MASTER_SITES= http://www.zygrib.org/getfile.php?file= 6MASTER_SITES= https://www.zygrib.org/getfile.php?file=
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= plunky@NetBSD.org 9MAINTAINER= plunky@NetBSD.org
11HOMEPAGE= http://www.zygrib.org/ 10HOMEPAGE= http://www.zygrib.org/
12COMMENT= GRIB file viewer for weather data 11COMMENT= GRIB file viewer for weather data
13LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
14 13
15DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf 14DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf
16 15
17WRKSRC= ${WRKDIR}/${DISTNAME}/src 16WRKSRC= ${WRKDIR}/${DISTNAME}/src
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19USE_TOOLS+= make 18USE_TOOLS+= make
20 19
@@ -24,27 +23,26 @@ SUBST_CLASSES+= paths @@ -24,27 +23,26 @@ SUBST_CLASSES+= paths
24SUBST_STAGE.paths= pre-configure 23SUBST_STAGE.paths= pre-configure
25SUBST_MESSAGE.paths= Fixing shared data paths. 24SUBST_MESSAGE.paths= Fixing shared data paths.
26SUBST_FILES.paths= util/Util.h 25SUBST_FILES.paths= util/Util.h
27SUBST_VARS.paths= PREFIX 26SUBST_VARS.paths= PREFIX
28 27
29INSTALLATION_DIRS+= bin 28INSTALLATION_DIRS+= bin
30INSTALLATION_DIRS+= share/zyGrib/colors 29INSTALLATION_DIRS+= share/zyGrib/colors
31INSTALLATION_DIRS+= share/zyGrib/config 30INSTALLATION_DIRS+= share/zyGrib/config
32INSTALLATION_DIRS+= share/zyGrib/gis 31INSTALLATION_DIRS+= share/zyGrib/gis
33INSTALLATION_DIRS+= share/zyGrib/img 32INSTALLATION_DIRS+= share/zyGrib/img
34INSTALLATION_DIRS+= share/zyGrib/maps/gshhs 33INSTALLATION_DIRS+= share/zyGrib/maps/gshhs
35INSTALLATION_DIRS+= share/zyGrib/stuff 34INSTALLATION_DIRS+= share/zyGrib/stuff
36INSTALLATION_DIRS+= share/zyGrib/tr 35INSTALLATION_DIRS+= share/zyGrib/tr
37 
38INSTALL_FILES+= colors/colors_binary.txt 36INSTALL_FILES+= colors/colors_binary.txt
39INSTALL_FILES+= colors/colors_cape_jkg.txt 37INSTALL_FILES+= colors/colors_cape_jkg.txt
40INSTALL_FILES+= colors/colors_cin_jkg.txt 38INSTALL_FILES+= colors/colors_cin_jkg.txt
41INSTALL_FILES+= colors/colors_clouds_black_pc.txt 39INSTALL_FILES+= colors/colors_clouds_black_pc.txt
42INSTALL_FILES+= colors/colors_clouds_white_pc.txt 40INSTALL_FILES+= colors/colors_clouds_white_pc.txt
43INSTALL_FILES+= colors/colors_current_kts.txt 41INSTALL_FILES+= colors/colors_current_kts.txt
44INSTALL_FILES+= colors/colors_deltatemp_celcius.txt 42INSTALL_FILES+= colors/colors_deltatemp_celcius.txt
45INSTALL_FILES+= colors/colors_humidrel_pc.txt 43INSTALL_FILES+= colors/colors_humidrel_pc.txt
46INSTALL_FILES+= colors/colors_rain_mmh.txt 44INSTALL_FILES+= colors/colors_rain_mmh.txt
47INSTALL_FILES+= colors/colors_snowdepth_m.txt 45INSTALL_FILES+= colors/colors_snowdepth_m.txt
48INSTALL_FILES+= colors/colors_temp_celcius.txt 46INSTALL_FILES+= colors/colors_temp_celcius.txt
49INSTALL_FILES+= colors/colors_thetae_celcius.txt 47INSTALL_FILES+= colors/colors_thetae_celcius.txt
50INSTALL_FILES+= colors/colors_thetae_celcius_1.txt 48INSTALL_FILES+= colors/colors_thetae_celcius_1.txt
@@ -65,26 +63,27 @@ INSTALL_FILES+= img/2leftarrow.png @@ -65,26 +63,27 @@ INSTALL_FILES+= img/2leftarrow.png
65INSTALL_FILES+= img/2rightarrow.png 63INSTALL_FILES+= img/2rightarrow.png
66INSTALL_FILES+= img/airport.png 64INSTALL_FILES+= img/airport.png
67INSTALL_FILES+= img/anim.png 65INSTALL_FILES+= img/anim.png
68INSTALL_FILES+= img/back.png 66INSTALL_FILES+= img/back.png
69INSTALL_FILES+= img/connect_no.png 67INSTALL_FILES+= img/connect_no.png
70INSTALL_FILES+= img/down.png 68INSTALL_FILES+= img/down.png
71INSTALL_FILES+= img/drapeau_ar.png 69INSTALL_FILES+= img/drapeau_ar.png
72INSTALL_FILES+= img/drapeau_cz.png 70INSTALL_FILES+= img/drapeau_cz.png
73INSTALL_FILES+= img/drapeau_de.png 71INSTALL_FILES+= img/drapeau_de.png
74INSTALL_FILES+= img/drapeau_en.png 72INSTALL_FILES+= img/drapeau_en.png
75INSTALL_FILES+= img/drapeau_es.png 73INSTALL_FILES+= img/drapeau_es.png
76INSTALL_FILES+= img/drapeau_fi.png 74INSTALL_FILES+= img/drapeau_fi.png
77INSTALL_FILES+= img/drapeau_fr.png 75INSTALL_FILES+= img/drapeau_fr.png
 76INSTALL_FILES+= img/drapeau_gr.png
78INSTALL_FILES+= img/drapeau_it.png 77INSTALL_FILES+= img/drapeau_it.png
79INSTALL_FILES+= img/drapeau_nl.png 78INSTALL_FILES+= img/drapeau_nl.png
80INSTALL_FILES+= img/drapeau_pt.png 79INSTALL_FILES+= img/drapeau_pt.png
81INSTALL_FILES+= img/drapeau_ru.png 80INSTALL_FILES+= img/drapeau_ru.png
82INSTALL_FILES+= img/exit.png 81INSTALL_FILES+= img/exit.png
83INSTALL_FILES+= img/fileclose.png 82INSTALL_FILES+= img/fileclose.png
84INSTALL_FILES+= img/fileopen.png 83INSTALL_FILES+= img/fileopen.png
85INSTALL_FILES+= img/forward.png 84INSTALL_FILES+= img/forward.png
86INSTALL_FILES+= img/help.png 85INSTALL_FILES+= img/help.png
87INSTALL_FILES+= img/info.png 86INSTALL_FILES+= img/info.png
88INSTALL_FILES+= img/media-floppy.png 87INSTALL_FILES+= img/media-floppy.png
89INSTALL_FILES+= img/meteoblue.png 88INSTALL_FILES+= img/meteoblue.png
90INSTALL_FILES+= img/network.png 89INSTALL_FILES+= img/network.png
@@ -130,40 +129,45 @@ INSTALL_FILES+= maps/gshhs/wdb_rivers_l. @@ -130,40 +129,45 @@ INSTALL_FILES+= maps/gshhs/wdb_rivers_l.
130INSTALL_FILES+= stuff/boat_parameters.csv 129INSTALL_FILES+= stuff/boat_parameters.csv
131INSTALL_FILES+= tr/zyGrib_ar.qm 130INSTALL_FILES+= tr/zyGrib_ar.qm
132INSTALL_FILES+= tr/zyGrib_ar.ts 131INSTALL_FILES+= tr/zyGrib_ar.ts
133INSTALL_FILES+= tr/zyGrib_cz.qm 132INSTALL_FILES+= tr/zyGrib_cz.qm
134INSTALL_FILES+= tr/zyGrib_cz.ts 133INSTALL_FILES+= tr/zyGrib_cz.ts
135INSTALL_FILES+= tr/zyGrib_de.qm 134INSTALL_FILES+= tr/zyGrib_de.qm
136INSTALL_FILES+= tr/zyGrib_de.ts 135INSTALL_FILES+= tr/zyGrib_de.ts
137INSTALL_FILES+= tr/zyGrib_es.qm 136INSTALL_FILES+= tr/zyGrib_es.qm
138INSTALL_FILES+= tr/zyGrib_es.ts 137INSTALL_FILES+= tr/zyGrib_es.ts
139INSTALL_FILES+= tr/zyGrib_fi.qm 138INSTALL_FILES+= tr/zyGrib_fi.qm
140INSTALL_FILES+= tr/zyGrib_fi.ts 139INSTALL_FILES+= tr/zyGrib_fi.ts
141INSTALL_FILES+= tr/zyGrib_fr.qm 140INSTALL_FILES+= tr/zyGrib_fr.qm
142INSTALL_FILES+= tr/zyGrib_fr.ts 141INSTALL_FILES+= tr/zyGrib_fr.ts
 142INSTALL_FILES+= tr/zyGrib_gr.qm
 143INSTALL_FILES+= tr/zyGrib_gr.ts
143INSTALL_FILES+= tr/zyGrib_it.qm 144INSTALL_FILES+= tr/zyGrib_it.qm
144INSTALL_FILES+= tr/zyGrib_it.ts 145INSTALL_FILES+= tr/zyGrib_it.ts
145INSTALL_FILES+= tr/zyGrib_nl.qm 146INSTALL_FILES+= tr/zyGrib_nl.qm
146INSTALL_FILES+= tr/zyGrib_nl.ts 147INSTALL_FILES+= tr/zyGrib_nl.ts
147INSTALL_FILES+= tr/zyGrib_pt.qm 148INSTALL_FILES+= tr/zyGrib_pt.qm
148INSTALL_FILES+= tr/zyGrib_pt.ts 149INSTALL_FILES+= tr/zyGrib_pt.ts
149INSTALL_FILES+= tr/zyGrib_ru.qm 150INSTALL_FILES+= tr/zyGrib_ru.qm
150INSTALL_FILES+= tr/zyGrib_ru.ts 151INSTALL_FILES+= tr/zyGrib_ru.ts
151 152
152do-configure: 153do-configure:
153 cd ${WRKSRC} && ${QTDIR}/bin/qmake 154 cd ${WRKSRC} && ${QTDIR}/bin/qmake "QMAKE_RPATHDIR+=${QWT_DIR}/lib" "QMAKE_LIBDIR+=${QWT_DIR}/lib"
154 155
155do-install: 156do-install:
156 ${INSTALL_PROGRAM} ${WRKSRC}/zyGrib ${DESTDIR}${PREFIX}/bin 157 ${INSTALL_PROGRAM} ${WRKSRC}/zyGrib ${DESTDIR}${PREFIX}/bin
157.for f in ${INSTALL_FILES} 158.for f in ${INSTALL_FILES}
158 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/data/${f} ${DESTDIR}${PREFIX}/share/zyGrib/${f} 159 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/data/${f} ${DESTDIR}${PREFIX}/share/zyGrib/${f}
159.endfor 160.endfor
160 161
161.include "../../archivers/bzip2/buildlink3.mk" 162.include "../../archivers/bzip2/buildlink3.mk"
162.include "../../devel/zlib/buildlink3.mk" 163.include "../../devel/zlib/buildlink3.mk"
 164.include "../../graphics/jpeg/buildlink3.mk"
 165.include "../../graphics/png/buildlink3.mk"
 166.include "../../graphics/jasper/buildlink3.mk"
163.include "../../geography/libnova/buildlink3.mk" 167.include "../../geography/libnova/buildlink3.mk"
164.include "../../geography/proj/buildlink3.mk" 168.include "../../geography/proj/buildlink3.mk"
165.include "../../security/openssl/buildlink3.mk" 169.include "../../security/openssl/buildlink3.mk"
166.include "../../x11/qt4-libs/buildlink3.mk" 170.include "../../x11/qt5-qtbase/buildlink3.mk"
167.include "../../x11/qt4-tools/buildlink3.mk" 171.include "../../x11/qt5-qttools/buildlink3.mk"
168.include "../../x11/qwt6-qt4/buildlink3.mk" 172.include "../../x11/qwt6-qt5/buildlink3.mk"
169.include "../../mk/bsd.pkg.mk" 173.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/misc/zyGrib/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/zyGrib/PLIST 2014/12/30 08:50:55 1.8
+++ pkgsrc/misc/zyGrib/PLIST 2019/10/28 19:02:35 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2014/12/30 08:50:55 plunky Exp $ 1@comment $NetBSD: PLIST,v 1.9 2019/10/28 19:02:35 bouyer Exp $
2bin/zyGrib 2bin/zyGrib
3share/zyGrib/colors/colors_binary.txt 3share/zyGrib/colors/colors_binary.txt
4share/zyGrib/colors/colors_cape_jkg.txt 4share/zyGrib/colors/colors_cape_jkg.txt
5share/zyGrib/colors/colors_cin_jkg.txt 5share/zyGrib/colors/colors_cin_jkg.txt
6share/zyGrib/colors/colors_clouds_black_pc.txt 6share/zyGrib/colors/colors_clouds_black_pc.txt
7share/zyGrib/colors/colors_clouds_white_pc.txt 7share/zyGrib/colors/colors_clouds_white_pc.txt
8share/zyGrib/colors/colors_current_kts.txt 8share/zyGrib/colors/colors_current_kts.txt
9share/zyGrib/colors/colors_deltatemp_celcius.txt 9share/zyGrib/colors/colors_deltatemp_celcius.txt
10share/zyGrib/colors/colors_humidrel_pc.txt 10share/zyGrib/colors/colors_humidrel_pc.txt
11share/zyGrib/colors/colors_rain_mmh.txt 11share/zyGrib/colors/colors_rain_mmh.txt
12share/zyGrib/colors/colors_snowdepth_m.txt 12share/zyGrib/colors/colors_snowdepth_m.txt
13share/zyGrib/colors/colors_temp_celcius.txt 13share/zyGrib/colors/colors_temp_celcius.txt
14share/zyGrib/colors/colors_thetae_celcius.txt 14share/zyGrib/colors/colors_thetae_celcius.txt
@@ -30,26 +30,27 @@ share/zyGrib/img/2leftarrow.png @@ -30,26 +30,27 @@ share/zyGrib/img/2leftarrow.png
30share/zyGrib/img/2rightarrow.png 30share/zyGrib/img/2rightarrow.png
31share/zyGrib/img/airport.png 31share/zyGrib/img/airport.png
32share/zyGrib/img/anim.png 32share/zyGrib/img/anim.png
33share/zyGrib/img/back.png 33share/zyGrib/img/back.png
34share/zyGrib/img/connect_no.png 34share/zyGrib/img/connect_no.png
35share/zyGrib/img/down.png 35share/zyGrib/img/down.png
36share/zyGrib/img/drapeau_ar.png 36share/zyGrib/img/drapeau_ar.png
37share/zyGrib/img/drapeau_cz.png 37share/zyGrib/img/drapeau_cz.png
38share/zyGrib/img/drapeau_de.png 38share/zyGrib/img/drapeau_de.png
39share/zyGrib/img/drapeau_en.png 39share/zyGrib/img/drapeau_en.png
40share/zyGrib/img/drapeau_es.png 40share/zyGrib/img/drapeau_es.png
41share/zyGrib/img/drapeau_fi.png 41share/zyGrib/img/drapeau_fi.png
42share/zyGrib/img/drapeau_fr.png 42share/zyGrib/img/drapeau_fr.png
 43share/zyGrib/img/drapeau_gr.png
43share/zyGrib/img/drapeau_it.png 44share/zyGrib/img/drapeau_it.png
44share/zyGrib/img/drapeau_nl.png 45share/zyGrib/img/drapeau_nl.png
45share/zyGrib/img/drapeau_pt.png 46share/zyGrib/img/drapeau_pt.png
46share/zyGrib/img/drapeau_ru.png 47share/zyGrib/img/drapeau_ru.png
47share/zyGrib/img/exit.png 48share/zyGrib/img/exit.png
48share/zyGrib/img/fileclose.png 49share/zyGrib/img/fileclose.png
49share/zyGrib/img/fileopen.png 50share/zyGrib/img/fileopen.png
50share/zyGrib/img/forward.png 51share/zyGrib/img/forward.png
51share/zyGrib/img/help.png 52share/zyGrib/img/help.png
52share/zyGrib/img/info.png 53share/zyGrib/img/info.png
53share/zyGrib/img/media-floppy.png 54share/zyGrib/img/media-floppy.png
54share/zyGrib/img/meteoblue.png 55share/zyGrib/img/meteoblue.png
55share/zyGrib/img/network.png 56share/zyGrib/img/network.png
@@ -95,21 +96,23 @@ share/zyGrib/maps/gshhs/wdb_rivers_l.b @@ -95,21 +96,23 @@ share/zyGrib/maps/gshhs/wdb_rivers_l.b
95share/zyGrib/stuff/boat_parameters.csv 96share/zyGrib/stuff/boat_parameters.csv
96share/zyGrib/tr/zyGrib_ar.qm 97share/zyGrib/tr/zyGrib_ar.qm
97share/zyGrib/tr/zyGrib_ar.ts 98share/zyGrib/tr/zyGrib_ar.ts
98share/zyGrib/tr/zyGrib_cz.qm 99share/zyGrib/tr/zyGrib_cz.qm
99share/zyGrib/tr/zyGrib_cz.ts 100share/zyGrib/tr/zyGrib_cz.ts
100share/zyGrib/tr/zyGrib_de.qm 101share/zyGrib/tr/zyGrib_de.qm
101share/zyGrib/tr/zyGrib_de.ts 102share/zyGrib/tr/zyGrib_de.ts
102share/zyGrib/tr/zyGrib_es.qm 103share/zyGrib/tr/zyGrib_es.qm
103share/zyGrib/tr/zyGrib_es.ts 104share/zyGrib/tr/zyGrib_es.ts
104share/zyGrib/tr/zyGrib_fi.qm 105share/zyGrib/tr/zyGrib_fi.qm
105share/zyGrib/tr/zyGrib_fi.ts 106share/zyGrib/tr/zyGrib_fi.ts
106share/zyGrib/tr/zyGrib_fr.qm 107share/zyGrib/tr/zyGrib_fr.qm
107share/zyGrib/tr/zyGrib_fr.ts 108share/zyGrib/tr/zyGrib_fr.ts
 109share/zyGrib/tr/zyGrib_gr.qm
 110share/zyGrib/tr/zyGrib_gr.ts
108share/zyGrib/tr/zyGrib_it.qm 111share/zyGrib/tr/zyGrib_it.qm
109share/zyGrib/tr/zyGrib_it.ts 112share/zyGrib/tr/zyGrib_it.ts
110share/zyGrib/tr/zyGrib_nl.qm 113share/zyGrib/tr/zyGrib_nl.qm
111share/zyGrib/tr/zyGrib_nl.ts 114share/zyGrib/tr/zyGrib_nl.ts
112share/zyGrib/tr/zyGrib_pt.qm 115share/zyGrib/tr/zyGrib_pt.qm
113share/zyGrib/tr/zyGrib_pt.ts 116share/zyGrib/tr/zyGrib_pt.ts
114share/zyGrib/tr/zyGrib_ru.qm 117share/zyGrib/tr/zyGrib_ru.qm
115share/zyGrib/tr/zyGrib_ru.ts 118share/zyGrib/tr/zyGrib_ru.ts
cvs diff -r1.21 -r1.22 pkgsrc/misc/zyGrib/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/zyGrib/distinfo 2015/11/03 23:49:55 1.21
+++ pkgsrc/misc/zyGrib/distinfo 2019/10/28 19:02:35 1.22
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.21 2015/11/03 23:49:55 agc Exp $ 1$NetBSD: distinfo,v 1.22 2019/10/28 19:02:35 bouyer Exp $
2 2
3SHA1 (zyGrib-7.0.0.tgz) = 376e7f813ac92f5e70163f90909d96a3912a0c61 3SHA1 (zyGrib-8.0.1.tgz) = 735580325efa3332a75d2ea5b02deaae613265ef
4RMD160 (zyGrib-7.0.0.tgz) = 5df3660963d9227269ccd304c7810e26f93a018c 4RMD160 (zyGrib-8.0.1.tgz) = 13e5233598fe8f3c49efb952cf0a4009c6d7b9f8
5SHA512 (zyGrib-7.0.0.tgz) = ae6e279b874aca510ccf91fecab06ce155427edd6a45844ef1053617512fd81e110f2338c22b10879c8e93dab226cfcdf58bf0270e4ed83931369c51b8869399 5SHA512 (zyGrib-8.0.1.tgz) = bb7146289d0966a174e0d888d6edc2830a2399f9cf51eb439371d90656fb9529fb08eebde8ea74f21f3c2aa7e625a258a318b9388523636815c8348269adb73d
6Size (zyGrib-7.0.0.tgz) = 15287496 bytes 6Size (zyGrib-8.0.1.tgz) = 19759812 bytes
7SHA1 (patch-ColorScale.cpp) = 26255acc30d81aba2abd7f51ef96677446645c78 7SHA1 (patch-ColorScale.cpp) = 26255acc30d81aba2abd7f51ef96677446645c78
8SHA1 (patch-Terrain.cpp) = cda31862011b758aa6b1c3655b9383dd1b38aceb 8SHA1 (patch-Terrain.cpp) = 98aba88e5704cdf0771c757d86d962ee043cecf4
9SHA1 (patch-aa) = 54bb3e7207a722f47667bb4c52d30084e5d5a675 9SHA1 (patch-aa) = 1de327ef2cb5ea601ffbd6e5f3ba760dfe9543b0
10SHA1 (patch-ab) = 1da0e837a68b7942ab8d4a829b92eef6b8e359e8 10SHA1 (patch-ab) = 1da0e837a68b7942ab8d4a829b92eef6b8e359e8
 11SHA1 (patch-g2clib_enc_jpeg2000.c) = e73e6d85850d291c5543aeea748ddeba42c30a51
11SHA1 (patch-util_Util.h) = a7ae101a11de7ca29e8e6e8ccf173c5216ea3ac7 12SHA1 (patch-util_Util.h) = a7ae101a11de7ca29e8e6e8ccf173c5216ea3ac7
cvs diff -r1.3 -r1.4 pkgsrc/misc/zyGrib/patches/patch-Terrain.cpp (expand / switch to unified diff)

--- pkgsrc/misc/zyGrib/patches/patch-Terrain.cpp 2014/12/30 08:50:55 1.3
+++ pkgsrc/misc/zyGrib/patches/patch-Terrain.cpp 2019/10/28 19:02:35 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Terrain.cpp,v 1.3 2014/12/30 08:50:55 plunky Exp $ 1$NetBSD: patch-Terrain.cpp,v 1.4 2019/10/28 19:02:35 bouyer Exp $
2 2
3--- Terrain.cpp.orig 2014-11-02 00:01:52.000000000 +0000 3--- Terrain.cpp.orig 2016-11-09 17:27:38.000000000 +0100
4+++ Terrain.cpp 4+++ Terrain.cpp 2019-10-28 15:49:41.442663233 +0100
5@@ -1109,7 +1109,7 @@ void Terrain::paintEvent(QPaintEvent *) 5@@ -1135,7 +1135,7 @@
6  6
7 if (showOrthodromie) 7 if (showOrthodromie)
8 { 8 {
9- QPen penLine(QColor(Qt::white)); 9- QPen penLine(Qt::white);
10+ QPen penLine = QColor(Qt::white); 10+ QPen penLine = QColor(Qt::white);
11 penLine.setWidthF(1.6); 11 penLine.setWidthF(1.6);
12 pnt.setPen(penLine); 12 pnt.setPen(penLine);
13 draw_Orthodromie(pnt); 13 draw_Orthodromie(pnt);
cvs diff -r1.9 -r1.10 pkgsrc/misc/zyGrib/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/zyGrib/patches/patch-aa 2014/12/30 08:50:55 1.9
+++ pkgsrc/misc/zyGrib/patches/patch-aa 2019/10/28 19:02:35 1.10
@@ -1,25 +1,87 @@ @@ -1,25 +1,87 @@
1$NetBSD: patch-aa,v 1.9 2014/12/30 08:50:55 plunky Exp $ 1$NetBSD: patch-aa,v 1.10 2019/10/28 19:02:35 bouyer Exp $
2 2
3libraries are provided by the buildlink3.mk framework; 3libraries are provided by the buildlink3.mk framework;
4no need to provide paths 4no need to provide paths
5 5
6--- zyGrib.pro.orig 2014-11-02 00:01:52.000000000 +0000 6--- zyGrib.pro.orig 2016-11-09 17:27:38.000000000 +0100
7+++ zyGrib.pro 7+++ zyGrib.pro 2019-10-28 18:15:22.969081317 +0100
8@@ -5,7 +5,7 @@ TEMPLATE = app 8@@ -7,8 +7,8 @@
 9 TEMPLATE = app
9 TARGET = zyGrib 10 TARGET = zyGrib
10  11
11 DEPENDPATH += . util map GUI 12-DEPENDPATH += . util map GUI
12-INCLUDEPATH += . util map GUI curvedrawer qwt-6.0.1/src 13-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
13+INCLUDEPATH += . util map GUI curvedrawer 14+DEPENDPATH += . util map GUI
 15+INCLUDEPATH += . util map GUI curvedrawer g2clib
14  16
15 # ---------------------------------------------------- 17 # ----------------------------------------------------
16 # platform specific 18 # platform specific
17@@ -26,7 +26,7 @@ macx { 19@@ -35,12 +35,13 @@
18 } 
19 else { 
20 DESTDIR = . 
21- LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt 
22+ LIBS += -lbz2 -lz -lproj -lnova -lqwt 
23 } 20 }
24 } 21 }
 22
 23-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
 24-LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order!
 25+LIBS += -lbz2 -lz -lproj -lnova -lqwt
 26+LIBS += -lpng -ljasper # respect order!
 27
25 # ---------------------------------------------------- 28 # ----------------------------------------------------
 29-CFLAGS += -std=c99
 30+CFLAGS += -std=c99 -DUSE_JPEG2000 -DUSE_PNG
 31
 32+QMAKE_CFLAGS += -DUSE_JPEG2000 -DUSE_PNG
 33 QMAKE_CXXFLAGS_RELEASE -= -O2
 34 QMAKE_CXXFLAGS_RELEASE += -O3
 35
 36@@ -240,6 +241,48 @@
 37 Terrain.cpp \
 38 Therm.cpp \
 39 util/Util.cpp \
 40- util/zuFile.cpp
 41-
 42-
 43+ util/zuFile.cpp \
 44+ g2clib/gridtemplates.c \
 45+ g2clib/drstemplates.c \
 46+ g2clib/pdstemplates.c \
 47+ g2clib/gbits.c \
 48+ g2clib/g2_unpack1.c \
 49+ g2clib/g2_unpack2.c \
 50+ g2clib/g2_unpack3.c \
 51+ g2clib/g2_unpack4.c \
 52+ g2clib/g2_unpack5.c \
 53+ g2clib/g2_unpack6.c \
 54+ g2clib/g2_unpack7.c \
 55+ g2clib/g2_free.c \
 56+ g2clib/g2_info.c \
 57+ g2clib/g2_getfld.c \
 58+ g2clib/simunpack.c \
 59+ g2clib/comunpack.c \
 60+ g2clib/pack_gp.c \
 61+ g2clib/reduce.c \
 62+ g2clib/specpack.c \
 63+ g2clib/specunpack.c \
 64+ g2clib/rdieee.c \
 65+ g2clib/mkieee.c \
 66+ g2clib/int_power.c \
 67+ g2clib/simpack.c \
 68+ g2clib/compack.c \
 69+ g2clib/cmplxpack.c \
 70+ g2clib/misspack.c \
 71+ g2clib/jpcpack.c \
 72+ g2clib/jpcunpack.c \
 73+ g2clib/pngpack.c \
 74+ g2clib/pngunpack.c \
 75+ g2clib/dec_jpeg2000.c \
 76+ g2clib/enc_jpeg2000.c \
 77+ g2clib/dec_png.c \
 78+ g2clib/enc_png.c \
 79+ g2clib/g2_create.c \
 80+ g2clib/g2_addlocal.c \
 81+ g2clib/g2_addgrid.c \
 82+ g2clib/g2_addfield.c \
 83+ g2clib/g2_gribend.c \
 84+ g2clib/getdim.c \
 85+ g2clib/g2_miss.c \
 86+ g2clib/getpoly.c \
 87+ g2clib/seekgb.c
File Added: pkgsrc/misc/zyGrib/patches/patch-g2clib_enc_jpeg2000.c
$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;