summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorfredb <fredb@pkgsrc.org>1999-11-10 18:41:45 +0000
committerfredb <fredb@pkgsrc.org>1999-11-10 18:41:45 +0000
commit6c58a47f51251ac9aa8677cf8115500c1e1f08a7 (patch)
treecb4b208744b23dc67cfdc5889bfac9d4c5a221b3 /x11
parent66752c34395c4b775d670534efc144e671385ff0 (diff)
downloadpkgsrc-6c58a47f51251ac9aa8677cf8115500c1e1f08a7.tar.gz
Update xearth to 1.1. From the HISTORY file:
xearth version 1.1 (6 November 1999) Finalize some changes that I've been sitting on for a few years; integrate some contributed code. New features: - new position specifier (moon) - new rotation specifier (galactic) - cylindrical projections (-proj cyl) - support for "real" 24-bit displays - support for running xearth it its own top-level window (-noroot, -geometry) Plus miscellaneous code cleanup. "moon" and "galactic" changes are courtesy of Frank T. Solensky <solensky@TopLayer.com>.
Diffstat (limited to 'x11')
-rw-r--r--x11/xearth/Makefile7
-rw-r--r--x11/xearth/files/md54
-rw-r--r--x11/xearth/files/patch-sum7
-rw-r--r--x11/xearth/patches/patch-aa164
4 files changed, 11 insertions, 171 deletions
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index fa2627d74b3..fc3f6def1d7 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1998/08/20 15:17:39 tsarna Exp $
+# $NetBSD: Makefile,v 1.6 1999/11/10 18:41:45 fredb Exp $
#
-DISTNAME= xearth-1.0
+DISTNAME= xearth-1.1
CATEGORIES= x11
-MASTER_SITES= ftp://cag.lcs.mit.edu/pub/tuna/
+MASTER_SITES= ftp://cag.lcs.mit.edu/pub/tuna/ \
+ ftp://ftp.cs.colorado.edu/users/tuna/
MAINTAINER= agc@netbsd.org
HOMEPAGE= http://www.cs.colorado.edu/~tuna/xearth/index.html
diff --git a/x11/xearth/files/md5 b/x11/xearth/files/md5
index a4f6d6f8f30..80c71f77217 100644
--- a/x11/xearth/files/md5
+++ b/x11/xearth/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:29:09 agc Exp $
+$NetBSD: md5,v 1.3 1999/11/10 18:41:46 fredb Exp $
-MD5 (xearth-1.0.tar.gz) = 241bb88b946631a9b0de91602a1bb639
+MD5 (xearth-1.1.tar.gz) = 6e409dffaa8dc5fae1064e38935ab61f
diff --git a/x11/xearth/files/patch-sum b/x11/xearth/files/patch-sum
index 4c98f5b2ebf..2b14df04bcc 100644
--- a/x11/xearth/files/patch-sum
+++ b/x11/xearth/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:34 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/10 18:41:46 fredb Exp $
-MD5 (patch-aa) = 201e7e853699560b9fe069a6f8129452
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/x11/xearth/patches/patch-aa b/x11/xearth/patches/patch-aa
deleted file mode 100644
index fc68877597b..00000000000
--- a/x11/xearth/patches/patch-aa
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/06/04 21:59:01 tron Exp $
-
---- x11.c.orig Fri Jun 4 23:55:15 1999
-+++ x11.c Fri Jun 4 23:55:18 1999
-@@ -59,8 +59,10 @@
- #define COLOR_8 (2)
- #define MONO_16 (3)
- #define COLOR_16 (4)
--#define MONO_32 (5)
--#define COLOR_32 (6)
-+#define MONO_24 (5)
-+#define COLOR_24 (6)
-+#define MONO_32 (7)
-+#define COLOR_32 (8)
-
- #define LABEL_LEFT_FLUSH (1<<0)
- #define LABEL_TOP_FLUSH (1<<1)
-@@ -76,6 +78,7 @@
- static void pack_mono_1 _P((u16or32 *, u_char *));
- static void pack_8 _P((u16or32 *, Pixel *, u_char *));
- static void pack_16 _P((u16or32 *, Pixel *, u_char *));
-+static void pack_24 _P((u16or32 *, Pixel *, u_char *));
- static void pack_32 _P((u16or32 *, Pixel *, u_char *));
- static void x11_row _P((u_char *));
- static void x11_cleanup _P((void));
-@@ -376,6 +379,7 @@
- case MONO_1:
- case MONO_8:
- case MONO_16:
-+ case MONO_24:
- case MONO_32:
- mono_dither_setup();
- pels = (Pixel *) malloc((unsigned) sizeof(Pixel) * 2);
-@@ -386,6 +390,7 @@
-
- case COLOR_8:
- case COLOR_16:
-+ case COLOR_24:
- case COLOR_32:
- if (XAllocNamedColor(dsply, cmap, "red", &xc, &junk) != 0)
- hlight = xc.pixel;
-@@ -689,6 +694,14 @@
- bits_per_pixel = 16;
- break;
-
-+ /* added this. -wsr */
-+ case MONO_24:
-+ case COLOR_24:
-+ dith_size = wdth;
-+ xbuf_size = dith_size * 3;
-+ bits_per_pixel = 24;
-+ break;
-+
- case MONO_32:
- case COLOR_32:
- dith_size = wdth;
-@@ -715,16 +728,29 @@
- xbuf_size);
-
- if (xim->bits_per_pixel != bits_per_pixel)
-- {
-- fflush(stdout);
-- fprintf(stderr,
-- "xearth %s: fatal - unexpected bits/pixel for depth %d\n",
-- VersionString, dpth);
-- fprintf(stderr,
-- " (expected %d bits/pixel, actual value is %d)\n",
-- bits_per_pixel, xim->bits_per_pixel);
-- exit(1);
-- }
-+ if ((xim->bits_per_pixel == 24) && (bits_per_pixel == 32))
-+ {
-+ x_type = mono ? MONO_24 : COLOR_24;
-+
-+ xbuf_size = dith_size * 3;
-+ bits_per_pixel = 24;
-+
-+ XDestroyImage(xim);
-+ xim = XCreateImage(dsply, visl, (unsigned) dpth, ZPixmap, 0,
-+ (char *) xbuf, (unsigned) wdth, 1, 8,
-+ xbuf_size);
-+ }
-+ else
-+ {
-+ fflush(stdout);
-+ fprintf(stderr,
-+ "xearth %s: fatal - unexpected bits/pixel for depth %d\n",
-+ VersionString, dpth);
-+ fprintf(stderr,
-+ " (expected %d bits/pixel, actual value is %d)\n",
-+ bits_per_pixel, xim->bits_per_pixel);
-+ exit(1);
-+ }
-
- if (x_type == MONO_1)
- {
-@@ -817,6 +843,43 @@
- }
-
-
-+/* pack pixels into ximage format (assuming bits_per_pixel == 24)
-+ */
-+static void pack_24(src, map, dst)
-+ u16or32 *src;
-+ Pixel *map;
-+ u_char *dst;
-+{
-+ int i, i_lim;
-+ unsigned val;
-+
-+ i_lim = wdth;
-+
-+ if (xim->byte_order == MSBFirst)
-+ {
-+ for (i=0; i<i_lim; i++)
-+ {
-+ val = map[src[i]];
-+ dst[0] = (val >> 16) & 0xff;
-+ dst[1] = (val >> 8) & 0xff;
-+ dst[2] = val & 0xff;
-+ dst += 3;
-+ }
-+ }
-+ else /* (xim->byte_order == LSBFirst) */
-+ {
-+ for (i=0; i<i_lim; i++)
-+ {
-+ val = map[src[i]];
-+ dst[0] = val & 0xff;
-+ dst[1] = (val >> 8) & 0xff;
-+ dst[2] = (val >> 16) & 0xff;
-+ dst += 3;
-+ }
-+ }
-+}
-+
-+
- /* pack pixels into ximage format (assuming bits_per_pixel == 32)
- */
- static void pack_32(src, map, dst)
-@@ -876,6 +939,11 @@
- pack_16(dith, pels, xbuf);
- break;
-
-+ case MONO_24:
-+ mono_dither_row(row, dith);
-+ pack_24(dith, pels, xbuf);
-+ break;
-+
- case MONO_32:
- mono_dither_row(row, dith);
- pack_32(dith, pels, xbuf);
-@@ -889,6 +957,11 @@
- case COLOR_16:
- dither_row(row, dith);
- pack_16(dith, pels, xbuf);
-+ break;
-+
-+ case COLOR_24:
-+ dither_row(row, dith);
-+ pack_24(dith, pels, xbuf);
- break;
-
- case COLOR_32: