--- ./checkfuncs.h Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./checkfuncs.h Wed Dec 12 11:59:04 2001 @@ -24,7 +24,7 @@ #define HAVE_ANIMATION_LIB 1 /* #undef HAVE_AQUA */ #define HAVE_LIBFREETYPE 1 -/* #undef HAVE_LIBMAGICK */ +#define HAVE_LIBMAGICK 1 #define HAVE_STRPTIME 1 #define HAVE_LIBX11 /* #undef __WIN32__ */ --- ./libannotate/Makefile.in Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libannotate/Makefile.in Wed Dec 12 14:47:35 2001 @@ -1,5 +1,7 @@ prefix = @prefix@ +AR = ar +ARFLAGS = @ARFLAGS@ CC = @CC@ CPPFLAGS += -I@includedir@ @OTHER_CPPFLAGS@ -I.. CXX = @CXX@ @@ -17,7 +19,7 @@ $(CXX) -c $(CXXFLAGS) $< libannotate.a: $(OBJS) - ar @ARFLAGS@ $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) @RANLIB@ .PHONY : clean --- ./xplanetbg.h Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./xplanetbg.h Mon Dec 17 10:14:47 2001 @@ -22,5 +22,5 @@ using namespace std; const string defaultmapext = ".jpg"; -const string nicecmd = "/usr/bin/nice "; +const string nicecmd = "/bin/nice "; const string versionstring = "Xplanetbg 0.90"; --- ./orbit.h Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./orbit.h Wed Dec 12 14:08:38 2001 @@ -25,7 +25,7 @@ // Sorry folks, most of this code is inline. Don't think I like it. -#include +#include #include #define DEG2RAD(Phi) (M_PI/180.0*Phi) @@ -45,7 +45,7 @@ for (int j=0; j<4; j++) el[i][j]=0.0; } - void Matrix::operator=(const Matrix& a) { + void operator=(const Matrix& a) { for (int i=0; i<4; i++) for (int j=0; j<4; j++) el[i][j]=a.el[i][j]; @@ -91,7 +91,7 @@ for (int i=0; i<3; i++) el[i]=0.0; el[3]=1.0; } - Vector Vector::operator=(const Vector& a) { + Vector operator=(const Vector& a) { for (int i=0; i<4; i++) el[i]=a.el[i]; return a; } --- ./auxfiles.h Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./auxfiles.h Mon Dec 17 10:14:47 2001 @@ -23,7 +23,7 @@ #include using namespace std; -const string prefix = "/usr/local/share/xplanet"; +const string prefix = "/usr/freeware/share/xplanet"; const string defaultmapext = ".jpg"; const string separator = "/"; const string versionstring = "Xplanet 0.90"; --- ./libprojection/Makefile.in Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libprojection/Makefile.in Wed Dec 12 14:48:49 2001 @@ -1,5 +1,7 @@ prefix = @prefix@ +AR = ar +ARFLAGS = @ARFLAGS@ CC = @CC@ CPPFLAGS += -I@includedir@ @OTHER_CPPFLAGS@ -I.. CXX = @CXX@ @@ -23,7 +25,7 @@ $(CXX) -c $(CXXFLAGS) $< libprojection.a: $(OBJS) - ar @ARFLAGS@ $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) @RANLIB@ clean : --- ./tzcoord.pl Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./tzcoord.pl Mon Dec 17 10:14:48 2001 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/freeware/bin/perl # This script prints coordinates of a named timezone in the same # format that xplanet (see http://xplanet.sourceforge.net) uses in the --- ./libdisplay/Makefile.in Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libdisplay/Makefile.in Wed Dec 12 14:49:10 2001 @@ -1,5 +1,7 @@ prefix = @prefix@ +AR = ar +ARFLAGS = @ARFLAGS@ CC = @CC@ CPPFLAGS += -I@includedir@ @OTHER_CPPFLAGS@ -I.. CXX = @CXX@ @@ -20,7 +22,7 @@ $(CXX) -c $(CXXFLAGS) $< libdisplay.a: $(OBJS) - ar @ARFLAGS@ $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) @RANLIB@ clean: --- ./libdisplay/DisplayX11Base.cc Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libdisplay/DisplayX11Base.cc Mon Dec 17 10:20:12 2001 @@ -499,18 +499,27 @@ { case PseudoColor: { - XColor xc; - + int num_pixels = window_width; + XColor *xc = (XColor *) malloc(sizeof(XColor) * num_pixels); + for (j = 0; j < window_height; j++) + { for (i = 0; i < window_width; i++) { - xc.pixel = XGetPixel(ximage, i, j); - XQueryColor(display, colormap, &xc); + xc[i].pixel = XGetPixel(ximage, i, j); + } + + XQueryColors(display, colormap, xc, num_pixels); - rgb_data[ipos++] = (unsigned char) (xc.red >> 8); - rgb_data[ipos++] = (unsigned char) (xc.green >> 8); - rgb_data[ipos++] = (unsigned char) (xc.blue >> 8); + for (i = 0; i < window_width; i++) + { + rgb_data[ipos++] = (unsigned char) (xc[i].red >> 8); + rgb_data[ipos++] = (unsigned char) (xc[i].green >> 8); + rgb_data[ipos++] = (unsigned char) (xc[i].blue >> 8); } + } + + free(xc); } break; case TrueColor: --- ./libdisplay/DisplayMagickpp.cc Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libdisplay/DisplayMagickpp.cc Wed Dec 12 13:30:56 2001 @@ -24,6 +24,8 @@ #include "Options.h" #include "util.h" +#include "libprojection/ProjectionBase.h" + #include "libannotate/libannotate.h" using namespace Magick; @@ -76,7 +78,7 @@ if (opts.markers) drawMarkers(image, this); if (opts.label) createLabel(); } - drawSatelliteTracks(image, this); + // drawSatelliteTracks(image, this); // undefined? try { --- ./xplanet.1 Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./xplanet.1 Wed Dec 12 12:40:18 2001 @@ -613,8 +613,8 @@ $PREFIX/satellites. The value of $PREFIX is set at compilation time in auxfiles.h. On a -Unix system it is usually /usr/local/share/xplanet, and on Windows it -is usually C:\WINDOWS\Desktop. See the INSTALL file for more details +Unix system it is usually /usr/freeware/share/xplanet, and on Windows it +is usually C:\\WINDOWS\\Desktop. See the INSTALL file for more details on the configuration options. Xplanetbg runs Xplanet every five minutes or other specified interval @@ -673,23 +673,23 @@ .SH FILES .nf .sp -/usr/local/bin/xplanet -/usr/local/bin/xplanetbg -/usr/local/bin/tkxplanet -/usr/local/bin/tzcoord.pl -/usr/local/man/man1/xplanet.1 -/usr/local/man/man1/xplanetbg.1 -/usr/local/man/man1/tkxplanet.1 -/usr/local/man/man1/tzcoord.pl.1 -/usr/local/share/xplanet/rgb.txt -/usr/local/share/xplanet/fonts/helr____.ttf -/usr/local/share/xplanet/images/body.jpg -/usr/local/share/xplanet/markers/body +/usr/freeware/bin/xplanet +/usr/freeware/bin/xplanetbg +/usr/freeware/bin/tkxplanet +/usr/freeware/bin/tzcoord.pl +/usr/freeware/man/man1/xplanet.1 +/usr/freeware/man/man1/xplanetbg.1 +/usr/freeware/man/man1/tkxplanet.1 +/usr/freeware/man/man1/tzcoord.pl.1 +/usr/freeware/share/xplanet/rgb.txt +/usr/freeware/share/xplanet/fonts/helr____.ttf +/usr/freeware/share/xplanet/images/body.jpg +/usr/freeware/share/xplanet/markers/body where body is the name of the appropriate body, specified in the -body option. .sp .fi -The default prefix /usr/local/share/xplanet is set in auxfiles.h and +The default prefix /usr/freeware/share/xplanet is set in auxfiles.h and may be changed if desired. .SH AUTHOR xplanet was written by --- ./libimage/Makefile.in Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libimage/Makefile.in Wed Dec 12 14:49:01 2001 @@ -1,5 +1,7 @@ prefix = @prefix@ +AR = ar +ARFLAGS = @ARFLAGS@ CC = @CC@ CPPFLAGS += -I@includedir@ @OTHER_CPPFLAGS@ @@ -16,7 +18,7 @@ all: libimage.a libimage.a: $(OBJS) - ar @ARFLAGS@ $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) @RANLIB@ clean: --- ./util.cc Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./util.cc Wed Dec 12 13:18:08 2001 @@ -57,7 +57,7 @@ { ImageInfo image_info; DrawInfo draw_info; - FontMetric metrics; + TypeMetric metrics; GetImageInfo(&image_info); GetDrawInfo(&image_info, &draw_info); @@ -65,7 +65,7 @@ draw_info.text = (char *) text.c_str(); draw_info.font = (char *) font.c_str(); - if (GetFontMetrics(NULL, &draw_info, &metrics)) + if (GetTypeMetrics(NULL, &draw_info, &metrics)) { width = metrics.width; ascent = metrics.ascent; --- ./xp_getopt.h Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./xp_getopt.h Wed Dec 12 12:39:37 2001 @@ -24,6 +24,7 @@ extern char *optarg; extern int optind; +#ifdef __need_getopt struct option { # if defined __STDC__ && __STDC__ @@ -41,6 +42,7 @@ # define no_argument 0 # define required_argument 1 # define optional_argument 2 +#endif extern int xp_getopt_long_only(int __argc, char *const *__argv, const char *__shortopts, --- ./libsgp4sdp4/Makefile.in Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libsgp4sdp4/Makefile.in Wed Dec 12 14:48:33 2001 @@ -1,3 +1,5 @@ +AR = ar +ARFLAGS = @ARFLAGS@ CC = @CC@ CPPFLAGS += @OTHER_CPPFLAGS@ @@ -15,7 +17,7 @@ $(CC) -c $(CPPFLAGS) $< libsgp4sdp4.a: $(OBJS) - ar @ARFLAGS@ $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) @RANLIB@ ephem : main.o libsgp4sdp4.a --- ./libsgp4sdp4/sgp4sdp4.h Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./libsgp4sdp4/sgp4sdp4.h Wed Dec 12 14:21:43 2001 @@ -16,7 +16,9 @@ #include #include #include +#define select duplicate_select #include +#undef select /** Type definitions **/ @@ -150,7 +152,7 @@ /** Funtion prototypes **/ /* main.c */ -int main(void); +// int main(void); /* sgp4sdp4.c */ void SGP4(double tsince, tle_t *tle, vector_t *pos, vector_t *vel); void SDP4(double tsince, tle_t *tle, vector_t *pos, vector_t *vel); --- ./tkxplanet Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./tkxplanet Mon Dec 17 10:14:48 2001 @@ -1,6 +1,6 @@ -#!/usr/bin/wish +#!/usr/freeware/bin/wish -set opts(day.1) /usr/local/share/xplanet/earth.jpg +set opts(day.1) /usr/freeware/share/xplanet/earth.jpg proc set_rect {} { for {set i 0} {$i < 3} {incr i} { --- ./configure Sun Oct 14 21:56:00 2001 +++ ../xplanet-0.90/./configure Wed Dec 12 14:32:26 2001 @@ -9,7 +9,7 @@ # Defaults: ac_help= -ac_default_prefix=/usr/local +ac_default_prefix=/usr/freeware # Any additions from configure.in: ac_help="$ac_help --with-x use the X Window System" @@ -3249,7 +3249,7 @@ if test "$have_libpnm" != 'no'; then GRAPHICS_SOURCE="$GRAPHICS_SOURCE pnm.c" - GRAPHICS_LIBS="$GRAPHICS_LIBS -lpnm" + GRAPHICS_LIBS="$GRAPHICS_LIBS -lpnm -lpbm" cat >> confdefs.h <<\EOF #define HAVE_LIBPNM EOF @@ -4077,7 +4077,7 @@ if test "$use_mswin" = yes; then OPENGL_LIBS="-lglut32 -lopengl32 -lglu32" else - OPENGL_LIBS="-lXmu -lXi -lglut -lGL -lGLU" + OPENGL_LIBS="-lXi -lglut -lGL -lGLU -lXmu" fi else