pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xplanet Update to 1.3.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/93d4c87f448b
branches: trunk
changeset: 375506:93d4c87f448b
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Tue Feb 13 12:45:02 2018 +0000
description:
Update to 1.3.0
* Fix build with GCC 6 with patches from Debian
Changelog:
Version 1.3.0 (released 18 Feb 2012)
* add "outlined" keyword to marker files
* update JPL ephemeris code for 64 bit machines
* add bump_shade config file parameter
* add opacity keyword for markers
* implement Rayleigh scattering
diffstat:
x11/xplanet/Makefile | 5 +-
x11/xplanet/PLIST | 4 +-
x11/xplanet/distinfo | 16 ++-
x11/xplanet/patches/patch-src_libannotate_addArcs.cpp | 40 ++++++++
x11/xplanet/patches/patch-src_libannotate_addMarkers.cpp | 43 ++++++++
x11/xplanet/patches/patch-src_libannotate_addSatellites.cpp | 50 ++++++++++
x11/xplanet/patches/patch-src_libmultiple_RayleighScattering.cpp | 46 +++++++++
x11/xplanet/patches/patch-src_libmultiple_drawStars.cpp | 18 +++
x11/xplanet/patches/patch-src_readConfig.cpp | 20 ++++
9 files changed, 233 insertions(+), 9 deletions(-)
diffs (294 lines):
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/Makefile
--- a/x11/xplanet/Makefile Tue Feb 13 11:57:29 2018 +0000
+++ b/x11/xplanet/Makefile Tue Feb 13 12:45:02 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2017/02/12 06:26:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2018/02/13 12:45:02 ryoon Exp $
-DISTNAME= xplanet-1.2.2
-PKGREVISION= 27
+DISTNAME= xplanet-1.3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xplanet/}
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/PLIST
--- a/x11/xplanet/PLIST Tue Feb 13 11:57:29 2018 +0000
+++ b/x11/xplanet/PLIST Tue Feb 13 12:45:02 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/04/04 11:41:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/02/13 12:45:02 ryoon Exp $
bin/xplanet
man/man1/xplanet.1
share/xplanet/arcs/README
@@ -35,6 +35,8 @@
share/xplanet/satellites/README
share/xplanet/satellites/iss
share/xplanet/satellites/iss.tle
+share/xplanet/scattering/README
+share/xplanet/scattering/earthRayleigh
share/xplanet/spice/README
share/xplanet/spice/asteroids
share/xplanet/spice/asteroids.krn
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/distinfo
--- a/x11/xplanet/distinfo Tue Feb 13 11:57:29 2018 +0000
+++ b/x11/xplanet/distinfo Tue Feb 13 12:45:02 2018 +0000
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.20 2015/11/04 03:29:10 agc Exp $
+$NetBSD: distinfo,v 1.21 2018/02/13 12:45:02 ryoon Exp $
-SHA1 (xplanet-1.2.2.tar.gz) = 3c9cc4be7cd87121884162204eff376af2fc03e3
-RMD160 (xplanet-1.2.2.tar.gz) = 431c9223b2b122599a8c4bdca18c17fea0dcd5ab
-SHA512 (xplanet-1.2.2.tar.gz) = 1a5dbad62b79adce28239615e3a2fd00300fca085f9400f2735c5dc015f06c63e182ed0d78399324bf6049374f2c034e6026a4054f26c34e11024b956695a53f
-Size (xplanet-1.2.2.tar.gz) = 1217169 bytes
+SHA1 (xplanet-1.3.0.tar.gz) = 7c5208b501b441a0184cbb334a5658d0309d7dac
+RMD160 (xplanet-1.3.0.tar.gz) = b5ba6239019669668aeb7f63391aa850cc3dd8b7
+SHA512 (xplanet-1.3.0.tar.gz) = c9f0db21c457d0702f8b1fb6d632838f45e80ea45b9cade80d6ab0ae956fdca03cfeed9582548c69b349a354afc27308309656d7e06ac46bc416c3e1038f8efd
+Size (xplanet-1.3.0.tar.gz) = 1227385 bytes
+SHA1 (patch-src_libannotate_addArcs.cpp) = 5d2ba7c0df6989e0b0b838fccbc73fe7a17ba91c
+SHA1 (patch-src_libannotate_addMarkers.cpp) = 9c05d3b308b6a957b8af7f8a05ba49a608f5120e
+SHA1 (patch-src_libannotate_addSatellites.cpp) = 7c8976a3e88ebac7e4d9b59a38f98f87b9d04f57
SHA1 (patch-src_libimage_gif.c) = 6c107bd1f733fe82f2b88af8ad778e0fe5aea5bd
+SHA1 (patch-src_libmultiple_RayleighScattering.cpp) = 3a64033dc0c6915c9cd2eed2e506dd4c802138c9
+SHA1 (patch-src_libmultiple_drawStars.cpp) = b6a3f3995f4f1ac77660fdad64524ef6a48c4d50
+SHA1 (patch-src_readConfig.cpp) = c1a46209dfcbb6a37b6c7ff90f633a6450fbd5d9
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/patches/patch-src_libannotate_addArcs.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xplanet/patches/patch-src_libannotate_addArcs.cpp Tue Feb 13 12:45:02 2018 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_libannotate_addArcs.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $
+
+--- src/libannotate/addArcs.cpp.orig 2008-11-13 23:43:42.000000000 +0000
++++ src/libannotate/addArcs.cpp
+@@ -258,10 +258,14 @@ addArcs(PlanetProperties *planetProperti
+ {
+ ifstream inFile(arcFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+- readArcFile(line, planet, view, projection,
+- planetProperties, annotationMap);
+-
++ while (1)
++ {
++ inFile.getline (line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
++ readArcFile(line, planet, view, projection,
++ planetProperties, annotationMap);
++ }
+ inFile.close();
+ delete [] line;
+ }
+@@ -292,9 +296,13 @@ addArcs(View *view, multimap<double, Ann
+ {
+ ifstream inFile(arcFile.c_str());
+ char *line = new char[256];
+- while (inFile.getline (line, 256, '\n') != NULL)
+- readArcFile(line, NULL, view, NULL, NULL, annotationMap);
+-
++ while (1)
++ {
++ inFile.getline (line, 256, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
++ readArcFile(line, NULL, view, NULL, NULL, annotationMap);
++ }
+ inFile.close();
+ delete [] line;
+ }
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/patches/patch-src_libannotate_addMarkers.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xplanet/patches/patch-src_libannotate_addMarkers.cpp Tue Feb 13 12:45:02 2018 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_libannotate_addMarkers.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $
+
+--- src/libannotate/addMarkers.cpp.orig 2011-11-15 01:44:24.000000000 +0000
++++ src/libannotate/addMarkers.cpp
+@@ -423,13 +423,16 @@ addMarkers(PlanetProperties *planetPrope
+ {
+ ifstream inFile(markerFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++ while (1)
+ {
+ unsigned char color[3];
+ memcpy(color, planetProperties->MarkerColor(), 3);
+ string font(planetProperties->MarkerFont());
+ int fontSize(planetProperties->MarkerFontSize());
+
++ inFile.getline (line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
+ readMarkerFile(line, planet, pixel_radius, X, Y, Z,
+ view, projection, width, height,
+ color, font, fontSize,
+@@ -469,13 +472,18 @@ addMarkers(View *view, const int width,
+ {
+ ifstream inFile(markerFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+- {
++ while (1)
++ {
++ inFile.getline (line, MAX_LINE_LENGTH, '\n');
++
+ unsigned char color[3];
+ memcpy(color, options->Color(), 3);
+ string font(options->Font());
+ int fontSize(options->FontSize());
+
++ if (inFile.eof() || inFile.fail())
++ break;
++
+ readMarkerFile(line, NULL, 0, 0, 0, 0,
+ view, NULL, width, height,
+ color, font, fontSize, 1.0,
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/patches/patch-src_libannotate_addSatellites.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xplanet/patches/patch-src_libannotate_addSatellites.cpp Tue Feb 13 12:45:02 2018 +0000
@@ -0,0 +1,50 @@
+$NetBSD: patch-src_libannotate_addSatellites.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $
+
+--- src/libannotate/addSatellites.cpp.orig 2010-07-30 21:49:06.000000000 +0000
++++ src/libannotate/addSatellites.cpp
+@@ -488,11 +488,23 @@ loadSatelliteVector(PlanetProperties *pl
+ {
+ ifstream inFile(tleFile.c_str());
+ char lines[3][80];
+- while (inFile.getline(lines[0], 80) != NULL)
+- {
+- if ((inFile.getline(lines[1], 80) == NULL)
+- || (inFile.getline(lines[2], 80) == NULL))
+- {
++ bool malformed_file = false;
++ while (1)
++ {
++ inFile.getline(lines[0], 80);
++ if (inFile.eof() || inFile.fail())
++ break;
++ inFile.getline(lines[1], 80);
++ if (inFile.eof() || inFile.fail())
++ malformed_file = true;
++ else
++ {
++ inFile.getline(lines[2], 80);
++ if (inFile.eof() || inFile.fail())
++ malformed_file = true;
++ }
++ if (malformed_file)
++ {
+ ostringstream errStr;
+ errStr << "Malformed TLE file (" << tleFile << ")?\n";
+ xpWarn(errStr.str(), __FILE__, __LINE__);
+@@ -542,10 +554,14 @@ addSatellites(PlanetProperties *planetPr
+ {
+ ifstream inFile(satFile.c_str());
+ char *line = new char[MAX_LINE_LENGTH];
+- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
++ while (1)
++ {
++ inFile.getline (line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
+ readSatelliteFile(line, planet, view, projection,
+ planetProperties, annotationMap);
+-
++ }
+ inFile.close();
+ delete [] line;
+ }
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/patches/patch-src_libmultiple_RayleighScattering.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xplanet/patches/patch-src_libmultiple_RayleighScattering.cpp Tue Feb 13 12:45:02 2018 +0000
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_libmultiple_RayleighScattering.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $
+
+--- src/libmultiple/RayleighScattering.cpp.orig 2012-02-25 16:32:59.000000000 +0000
++++ src/libmultiple/RayleighScattering.cpp
+@@ -369,8 +369,12 @@ RayleighScattering::readConfigFile(strin
+
+ diskTemplate_.clear();
+ limbTemplate_.clear();
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++ while (1)
+ {
++ inFile.getline(line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
++
+ int i = 0;
+ while (isDelimiter(line[i]))
+ {
+@@ -439,8 +443,12 @@ RayleighScattering::readBlock(ifstream &
+ values.clear();
+
+ char line[MAX_LINE_LENGTH];
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++ while (1)
+ {
++ inFile.getline(line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
++
+ int i = 0;
+ while (isDelimiter(line[i]))
+ {
+@@ -470,8 +478,12 @@ RayleighScattering::readValue(ifstream &
+ double &value)
+ {
+ char line[MAX_LINE_LENGTH];
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++ while (1)
+ {
++ inFile.getline(line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
++
+ int i = 0;
+ while (isDelimiter(line[i]))
+ {
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/patches/patch-src_libmultiple_drawStars.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xplanet/patches/patch-src_libmultiple_drawStars.cpp Tue Feb 13 12:45:02 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_libmultiple_drawStars.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $
+
+--- src/libmultiple/drawStars.cpp.orig 2006-03-26 04:55:59.000000000 +0000
++++ src/libmultiple/drawStars.cpp
+@@ -41,8 +41,12 @@ drawStars(DisplayBase *display, View *vi
+ ifstream inFile(starMap.c_str());
+
+ char line[MAX_LINE_LENGTH];
+- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
++ while (1)
+ {
++ inFile.getline(line, MAX_LINE_LENGTH, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
++
+ if (line[0] == '#') continue;
+
+ double Vmag, RA, Dec;
diff -r eb73d024adbf -r 93d4c87f448b x11/xplanet/patches/patch-src_readConfig.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xplanet/patches/patch-src_readConfig.cpp Tue Feb 13 12:45:02 2018 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_readConfig.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $
+
+--- src/readConfig.cpp.orig 2012-03-03 03:20:05.000000000 +0000
++++ src/readConfig.cpp
+@@ -550,9 +550,13 @@ readConfigFile(string configFile, Planet
+
+ ifstream inFile(configFile.c_str());
+ char *line = new char[256];
+- while (inFile.getline(line, 256, '\n') != NULL)
++ while (1)
++ {
++ inFile.getline(line, 256, '\n');
++ if (inFile.eof() || inFile.fail())
++ break;
+ readConfig(line, planetProperties);
+-
++ }
+ // This condition will only be true if [default] is the only
+ // section in the config file. In this case, set all planet
+ // properties to the default values.
Home |
Main Index |
Thread Index |
Old Index