CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sat Dec 25 11:37:25 UTC 2021

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Use a white on black terminal regardless of whether we're COLOR or not


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sat Dec 25 11:37:25 UTC 2021

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Use a white on black terminal regardless of whether we're COLOR or not


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.9 xsrc/external/mit/xdm/dist/config/Xsession.in:1.10
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.9	Sat Dec 25 11:32:46 2021
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sat Dec 25 11:37:25 2021
@@ -73,9 +73,9 @@ else
 		BINDIR/xrdb -load - <

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  9 09:05:35 UTC 2022

Modified Files:
xsrc/external/mit/libXi/dist/src: XIPassiveGrab.c
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/libdrm/include: generated_static_table_fourcc.h

Log Message:
merge libXi 1.8 and libdrm 2.4.109.

updated generated_static_table_fourcc.h generated with:

   python3.9 gen_table_fourcc.py include/drm/drm_fourcc.h 
../include/generated_static_table_fourcc.h


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
cvs rdiff -u -r1.29 -r1.30 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  9 09:05:35 UTC 2022

Modified Files:
xsrc/external/mit/libXi/dist/src: XIPassiveGrab.c
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/libdrm/include: generated_static_table_fourcc.h

Log Message:
merge libXi 1.8 and libdrm 2.4.109.

updated generated_static_table_fourcc.h generated with:

   python3.9 gen_table_fourcc.py include/drm/drm_fourcc.h 
../include/generated_static_table_fourcc.h


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
cvs rdiff -u -r1.29 -r1.30 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
diff -u xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.6 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.7
--- xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.6	Mon Jul  8 22:59:17 2019
+++ xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c	Sun Jan  9 09:05:34 2022
@@ -177,6 +177,37 @@ XIGrabTouchBegin(Display *dpy, int devic
 num_modifiers, modifiers_inout, CurrentTime);
 }
 
+int XIGrabPinchGestureBegin(Display* dpy, int deviceid, Window grab_window, int grab_mode,
+int paired_device_mode, int owner_events,
+XIEventMask *mask, int num_modifiers, XIGrabModifiers *modifiers_inout)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(dpy);
+
+LockDisplay(dpy);
+if (_XiCheckExtInit(dpy, XInput_2_4, extinfo) == -1)
+return -1;
+UnlockDisplay(dpy);
+
+return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeGesturePinchBegin, 0,
+grab_window, None, grab_mode, paired_device_mode,
+owner_events, mask, num_modifiers, modifiers_inout, CurrentTime);
+}
+
+int XIGrabSwipeGestureBegin(Display* dpy, int deviceid, Window grab_window, int grab_mode,
+int paired_device_mode, int owner_events,
+XIEventMask *mask, int num_modifiers, XIGrabModifiers *modifiers_inout)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(dpy);
+
+LockDisplay(dpy);
+if (_XiCheckExtInit(dpy, XInput_2_4, extinfo) == -1)
+return -1;
+UnlockDisplay(dpy);
+
+return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeGestureSwipeBegin, 0,
+grab_window, None, grab_mode, paired_device_mode,
+owner_events, mask, num_modifiers, modifiers_inout, CurrentTime);
+}
 
 static int
 _XIPassiveUngrabDevice(Display* dpy, int deviceid, int grabtype, int detail,
@@ -256,3 +287,31 @@ XIUngrabTouchBegin(Display* display, int
 return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeTouchBegin, 0,
   grab_window, num_modifiers, modifiers);
 }
+
+int XIUngrabPinchGestureBegin(Display* display, int deviceid, Window grab_window,
+  int num_modifiers, XIGrabModifiers *modifiers)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(display);
+
+LockDisplay(display);
+if (_XiCheckExtInit(display, XInput_2_4, extinfo) == -1)
+return -1;
+UnlockDisplay(display);
+
+return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeGesturePinchBegin, 0,
+  grab_window, num_modifiers, modifiers);
+}
+
+int XIUngrabSwipeGestureBegin(Display* display, int deviceid, Window grab_window,
+  int num_modifiers, XIGrabModifiers *modifiers)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(display);
+
+LockDisplay(display);
+if (_XiCheckExtInit(

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  9 09:17:32 UTC 2022

Modified Files:
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xterm/dist: fontutils.c linedata.c misc.c ptyx.h
xterm.h xterm.man
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
merge xauth 1.1.1 and xterm 370.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/include/xtermcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  9 09:17:32 UTC 2022

Modified Files:
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xterm/dist: fontutils.c linedata.c misc.c ptyx.h
xterm.h xterm.man
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
merge xauth 1.1.1 and xterm 370.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/include/xtermcfg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.7 xsrc/external/mit/xauth/dist/process.c:1.8
--- xsrc/external/mit/xauth/dist/process.c:1.7	Mon Jul 15 06:01:53 2019
+++ xsrc/external/mit/xauth/dist/process.c	Sun Jan  9 09:17:31 2022
@@ -37,6 +37,7 @@ from The Open Group.
 #include "xauth.h"
 #include 
 #include 
+#include 
 #include 
 #ifndef WIN32
 #include 
@@ -251,6 +252,18 @@ skip_nonspace(register char *s)
 return s;
 }
 
+#ifndef HAVE_REALLOCARRAY
+static inline void *
+reallocarray(void *optr, size_t nmemb, size_t size)
+{
+if ((nmemb > 0) && (SIZE_MAX / nmemb < size)) {
+errno = ENOMEM;
+return NULL;
+}
+return realloc(optr, size * nmemb);
+}
+#endif
+
 static const char **
 split_into_words(char *src, int *argcp)  /* argvify string */
 {
@@ -278,9 +291,15 @@ split_into_words(char *src, int *argcp) 
 	savec = *src;
 	*src = '\0';
 	if (cur == total) {
+	const char **new_argv;
 	total += WORDSTOALLOC;
-	argv = realloc (argv, total * sizeof (char *));
-	if (!argv) return NULL;
+	new_argv = reallocarray (argv, total, sizeof (char *));
+	if (new_argv != NULL) {
+		argv = new_argv;
+	} else {
+		free(argv);
+		return NULL;
+	}
 	}
 	argv[cur++] = jword;
 	if (savec) src++;		/* if not last on line advance */
@@ -633,7 +652,7 @@ static Bool xauth_modified = False;	/* i
 static Bool xauth_allowed = True;	/* if allowed to write auth file */
 static Bool xauth_locked = False; /* if has been locked */
 static const char *xauth_filename = NULL;
-static volatile Bool dieing = False;
+static volatile Bool dying = False;
 
 
 /* poor man's puts(), for under signal handlers, 
@@ -645,7 +664,7 @@ _X_NORETURN
 static void
 die(int sig)
 {
-dieing = True;
+dying = True;
 _exit (auth_finalize ());
 /* NOTREACHED */
 }
@@ -697,6 +716,10 @@ auth_initialize(const char *authfilename
 FILE *authfp;
 Bool exists;
 
+if (strlen(authfilename) > 1022) {
+	fprintf (stderr, "%s: authority file name \"%s\" too long\n",
+		 ProgramName, authfilename);
+}
 xauth_filename = authfilename;/* used in cleanup, prevent race with
  signals */
 register_signals ();
@@ -854,10 +877,10 @@ write_auth_file(char *tmp_nam)
 int
 auth_finalize(void)
 {
-char temp_name[1024];	/* large filename size */
+char temp_name[1025];	/* large filename size */
 
 if (xauth_modified) {
-	if (dieing) {
+	if (dying) {
 	if (verbose) {
 		/*
 		 * called from a signal handler -- printf is *not* reentrant; also
@@ -1614,13 +1637,22 @@ do_add(const char *inputfilename, int li
 hexkey = argv[3];
 
 len = strlen(hexkey);
-if (hexkey[0] == '"' && hexkey[len-1] == '"') {
+if (len > 1 && hexkey[0] == '"' && hexkey[len-1] == '"') {
 	key = malloc(len-1);
+	if (!key) {
+	fprintf(stderr, "unable to allocate memory\n");
+	return 1;
+	}
 	strncpy(key, hexkey+1, len-2);
+	key[len-1] = '\0';
 	len -= 2;
 } else if (!strcmp(protoname, SECURERPC) ||
 	   !strcmp(protoname, K5AUTH)) {
 	key = malloc(len+1);
+	if (!key) {
+	fprintf(stderr, "unable to allocate memory\n");
+	return 1;
+	}
 	strcpy(key, hexkey);
 } else {
 	len = cvthexkey (hexkey, &key);
@@ -1859,10 +1891,10 @@ do_generate(const char *inputfilename, i
 const char *displayname;
 int major_version, minor_version;
 XSecurityAuthorization id_return;
-Xauth *auth_in, *auth_return;
+Xauth *auth_in = NULL, *auth_return = NULL;
 XSecurityAuthorizationAttributes attributes;
 unsigned long attrmask = 0;
-Display *dpy;
+Display *dpy = NULL;
 int status;
 const char *args[4];
 const char *protoname = ".";
@@ -1870,7 +1902,7 @@ do_generate(const char *inputfilename, i
 int authdatalen = 0;
 const char *hexdata;
 char *authdata = NULL;
-char *hex;
+char *hex = NULL;
 
 if (argc < 2

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May  8 08:17:06 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
want more default xorg font resource definitions,
and a clock on ctwm startup


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.10 xsrc/external/mit/xdm/dist/config/Xsession.in:1.11
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.10	Sat Dec 25 11:37:25 2021
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sun May  8 08:17:06 2022
@@ -1,5 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
+XHASH $NetBSD: Xsession.in,v 1.11 2022/05/08 08:17:06 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -93,10 +94,17 @@ Xgc*font:   -*-spleen-medium-r-*-*-$
 Xmag*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xmessage*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*font:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontBold:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontItalic:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*directoryFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 	fi
 	BINDIR/xsetroot -cursor_name left_ptr
 	BINDIR/xsetroot -solid 'rgb:00/22/44'
 	BINDIR/uxterm &
+	BINDIR/xclock -digital -strftime '%a %Y-%m-%d %H:%M' \
+		-face "spleen:pixelsize=$fontsize" -g +0+0 &
 	exec BINDIR/ctwm -W
 fi

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13	Wed Dec 29 16:01:58 2021
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Sun May  8 08:17:06 2022
@@ -1,4 +1,5 @@
 XCOMM!SHELL_CMD
+XHASH $NetBSD: xinitrc.cpp,v 1.14 2022/05/08 08:17:06 nia Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -62,6 +63,11 @@ Xgc*font:   -*-spleen-medium-r-*-*-$
 Xmag*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xmessage*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*font:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontBold:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontItalic:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*directoryFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 fi
 
@@ -80,5 +86,7 @@ fi
 
 XSETROOT -cursor_name left_ptr
 XSETROOT -solid 'rgb:00/22/44'
+XCLOCK -digital -strftime '%a %Y-%m-%d %H:%M' \
+	-face "spleen:pixelsize=$fontsize" -g +0+0 &
 UXTERM &
 exec CTWM -W

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May  8 08:17:06 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
want more default xorg font resource definitions,
and a clock on ctwm startup


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May  8 09:09:58 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Make the xterm font size selection menu work in a reasonably expected way


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.11 xsrc/external/mit/xdm/dist/config/Xsession.in:1.12
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.11	Sun May  8 08:17:06 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sun May  8 09:09:58 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.11 2022/05/08 08:17:06 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.12 2022/05/08 09:09:58 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -79,7 +79,23 @@ else
 *VT100.background: black
 *VT100.allowBoldFonts:  false
 *VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.fontdefault:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 *VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.fontdefault:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.font1:	-*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.font2:	-*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.font3:	-*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.font4:	-*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.font5:	-*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.font6:	-*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.font7:	-*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font1:	-*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font2:	-*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font3:	-*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font4:	-*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font5:	-*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font6:	-*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font7:	-*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
 Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.15
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14	Sun May  8 08:17:06 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Sun May  8 09:09:58 2022
@@ -1,5 +1,5 @@
 XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.14 2022/05/08 08:17:06 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.15 2022/05/08 09:09:58 nia Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -48,7 +48,25 @@ XHASH endif
 *VT100.background: black
 *VT100.allowBoldFonts:  false
 *VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.fontdefault:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 *VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.fontdefault:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.font1:	-*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.font2:	-*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.font3:	-*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.font4:	-*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.font5:	-*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.font6:	-*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.font7:	-*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font1:	-*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font2:	-*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font3:	-*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font4:	-*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font5:	-*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font6:	-*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font7:	-*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
+*SimpleMenu*font:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*SimpleMenu*menuLabel.font:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May  8 09:09:58 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Make the xterm font size selection menu work in a reasonably expected way


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Mon May  9 07:00:15 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Default X session: In xterm and xman at lower DPIs, use misc-fixed
instead of spleen for greater readability.  Reasoning: misc-fixed
has native bold variants.

At higher DPIs, xterm can suitably 'enbolden' spleen without losing
significant aspects of the letter shape, so the text remains readable.

Requested by uwe and jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.12 xsrc/external/mit/xdm/dist/config/Xsession.in:1.13
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.12	Sun May  8 09:09:58 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Mon May  9 07:00:15 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.12 2022/05/08 09:09:58 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.13 2022/05/09 07:00:15 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -77,25 +77,6 @@ else
 #endif
 *VT100.foreground: grey90
 *VT100.background: black
-*VT100.allowBoldFonts:  false
-*VT100.font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-*VT100.fontdefault:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-*VT100.utf8Fonts.fontdefault:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-*VT100.font1:	-*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
-*VT100.font2:	-*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
-*VT100.font3:	-*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
-*VT100.font4:	-*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
-*VT100.font5:	-*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
-*VT100.font6:	-*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
-*VT100.font7:	-*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font1:	-*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font2:	-*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font3:	-*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font4:	-*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font5:	-*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font6:	-*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
-*VT100.utf8Fonts.font7:	-*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
 Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
@@ -116,6 +97,55 @@ Xman*manualFontBold:	-*-spleen-medium-r-
 Xman*manualFontItalic:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xman*directoryFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
+if [ $fontsize -gt 18 ]; then
+BINDIR/xrdb -merge - <

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Mon May  9 07:00:15 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Default X session: In xterm and xman at lower DPIs, use misc-fixed
instead of spleen for greater readability.  Reasoning: misc-fixed
has native bold variants.

At higher DPIs, xterm can suitably 'enbolden' spleen without losing
significant aspects of the letter shape, so the text remains readable.

Requested by uwe and jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri May 27 14:23:23 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
In xterm, use TrueType fonts rather than Spleen at higher DPIs.

Requested by jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri May 27 14:23:23 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
In xterm, use TrueType fonts rather than Spleen at higher DPIs.

Requested by jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.14 xsrc/external/mit/xdm/dist/config/Xsession.in:1.15
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.14	Mon May  9 09:00:20 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Fri May 27 14:23:23 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.14 2022/05/09 09:00:20 uwe Exp $
+XHASH $NetBSD: Xsession.in,v 1.15 2022/05/27 14:23:23 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -91,35 +91,10 @@ Xgc*font:   -*-spleen-medium-r-*-*-$
 Xmag*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xmessage*font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*font:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*manualFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*manualFontBold:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*manualFontItalic:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*directoryFontNormal:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 if [ $fontsize -gt 18 ]; then
 BINDIR/xrdb -merge - <

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri May 27 17:58:54 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
More DPI magic... allow most modern GTK and Qt apps to automatically scale


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri May 27 17:58:54 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
More DPI magic... allow most modern GTK and Qt apps to automatically scale


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.15 xsrc/external/mit/xdm/dist/config/Xsession.in:1.16
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.15	Fri May 27 14:23:23 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Fri May 27 17:58:54 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.15 2022/05/27 14:23:23 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.16 2022/05/27 17:58:54 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -75,6 +75,7 @@ else
 #ifdef COLOR
 *customization: -color
 #endif
+Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
 *VT100.foreground: grey90
 *VT100.background: black
 Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*

Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.17 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.18
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.17	Fri May 27 14:23:23 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp	Fri May 27 17:58:54 2022
@@ -1,5 +1,5 @@
 XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.17 2022/05/27 14:23:23 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.18 2022/05/27 17:58:54 nia Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -44,6 +44,7 @@ else
 XHASH ifdef COLOR
 *customization: -color
 XHASH endif
+Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
 *VT100.foreground: grey90
 *VT100.background: black
 *SimpleMenu*font:	-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri May 27 19:05:29 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Only set dpi when necessary to avoid divide by zero on very small screens


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Fri May 27 19:05:29 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Only set dpi when necessary to avoid divide by zero on very small screens


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.16 xsrc/external/mit/xdm/dist/config/Xsession.in:1.17
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.16	Fri May 27 17:58:54 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Fri May 27 19:05:28 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.16 2022/05/27 17:58:54 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.17 2022/05/27 19:05:28 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -75,7 +75,6 @@ else
 #ifdef COLOR
 *customization: -color
 #endif
-Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
 *VT100.foreground: grey90
 *VT100.background: black
 Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
@@ -95,6 +94,7 @@ Xmh*font:   -*-spleen-medium-r-*-*-$
 EOF
 if [ $fontsize -gt 18 ]; then
 BINDIR/xrdb -merge - <

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May 29 05:53:02 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Explanations requested by uwe...


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May 29 05:53:02 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Explanations requested by uwe...


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.17 xsrc/external/mit/xdm/dist/config/Xsession.in:1.18
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.17	Fri May 27 19:05:28 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sun May 29 05:53:02 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.17 2022/05/27 19:05:28 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.18 2022/05/29 05:53:02 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -93,11 +93,23 @@ Xmessage*font:  -*-spleen-medium-r-*-*-$
 Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 if [ $fontsize -gt 18 ]; then
+#
+# For HiDPI displays, the font size returned by ctwm_font_size will
+# generally be a multiple of 16.  96 is our standard DPI, and many
+# applications want to scale by integer increments or don't handle
+# non-integer scaling gracefully, so we want to scale by multiples
+# of 96.
+# 
 BINDIR/xrdb -merge - <

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May 29 06:06:14 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Avoid exec'ing bc. Pointed out by uwe.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May 29 06:06:14 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Avoid exec'ing bc. Pointed out by uwe.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.18 xsrc/external/mit/xdm/dist/config/Xsession.in:1.19
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.18	Sun May 29 05:53:02 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sun May 29 06:06:14 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.18 2022/05/29 05:53:02 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.19 2022/05/29 06:06:14 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -101,7 +101,7 @@ if [ $fontsize -gt 18 ]; then
 # of 96.
 # 
 BINDIR/xrdb -merge - <

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May 29 12:40:36 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Expand and escape comments. One minor change to variable expansion
as requested by uwe.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Sun May 29 12:40:36 UTC 2022

Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp

Log Message:
Expand and escape comments. One minor change to variable expansion
as requested by uwe.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xinit/dist/xinitrc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.19 xsrc/external/mit/xdm/dist/config/Xsession.in:1.20
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.19	Sun May 29 06:06:14 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in	Sun May 29 12:40:36 2022
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.19 2022/05/29 06:06:14 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.20 2022/05/29 12:40:36 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -93,23 +93,26 @@ Xmessage*font:  -*-spleen-medium-r-*-*-$
 Xmh*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 EOF
 if [ $fontsize -gt 18 ]; then
-#
-# For HiDPI displays, the font size returned by ctwm_font_size will
-# generally be a multiple of 16.  96 is our standard DPI, and many
-# applications want to scale by integer increments or don't handle
-# non-integer scaling gracefully, so we want to scale by multiples
-# of 96.
-# 
+XCOMM
+XCOMM For HiDPI displays, the font size returned by ctwm_font_size will
+XCOMM generally be a multiple of 16.  96 is our standard DPI, and many
+XCOMM applications want to scale by integer increments or don't handle
+XCOMM non-integer scaling gracefully, so we want to scale by multiples
+XCOMM of 96.
+XCOMM 
 BINDIR/xrdb -merge - <

CVS commit: xsrc/external/mit

[Taylor R Campbell]

Module Name:xsrc
Committed By:   riastradh
Date:   Sun Jun  4 11:36:50 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/glx: glxcurrent.c
xsrc/external/mit/MesaLib/dist/src/glx: glxcurrent.c

Log Message:
mesa: Remove massive kludge that worked around PR toolchain/50277.

Now that the underlying bug in ld.elf_so is fixed, the workaround is
causing harm.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Taylor R Campbell]

Module Name:xsrc
Committed By:   riastradh
Date:   Sun Jun  4 11:36:50 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/glx: glxcurrent.c
xsrc/external/mit/MesaLib/dist/src/glx: glxcurrent.c

Log Message:
mesa: Remove massive kludge that worked around PR toolchain/50277.

Now that the underlying bug in ld.elf_so is fixed, the workaround is
causing harm.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c
diff -u xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c:1.1.1.2 xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c:1.1.1.2	Sun Jul 11 20:36:29 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/glx/glxcurrent.c	Sun Jun  4 11:36:50 2023
@@ -40,18 +40,6 @@
 #include "glx_error.h"
 
 /*
- * MASSIVE KLUDGE!
- * We need these to not be extern in libGL.so because of
- * PR toolchain/50277
- */
-#if defined(GLX_USE_TLS) && defined(__NetBSD__)
-_X_EXPORT __thread struct _glapi_table * _glapi_tls_Dispatch
-__attribute__((tls_model("initial-exec"))) = NULL;
-_X_EXPORT __thread void * _glapi_tls_Context
-__attribute__((tls_model("initial-exec")));
-#endif
-
-/*
 ** We setup some dummy structures here so that the API can be used
 ** even if no context is current.
 */

Index: xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c
diff -u xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c:1.3 xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c:1.3	Mon May  9 01:27:33 2022
+++ xsrc/external/mit/MesaLib/dist/src/glx/glxcurrent.c	Sun Jun  4 11:36:50 2023
@@ -40,18 +40,6 @@
 #include "glx_error.h"
 
 /*
- * MASSIVE KLUDGE!
- * We need these to not be extern in libGL.so because of
- * PR toolchain/50277
- */
-#if defined(GLX_USE_TLS) && defined(__NetBSD__)
-_X_EXPORT __thread struct _glapi_table * _glapi_tls_Dispatch
-__attribute__((tls_model("initial-exec"))) = NULL;
-_X_EXPORT __thread void * _glapi_tls_Context
-__attribute__((tls_model("initial-exec")));
-#endif
-
-/*
 ** We setup some dummy structures here so that the API can be used
 ** even if no context is current.
 */

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 06:44:24 UTC 2023

Modified Files:
xsrc/external/mit/libXft/dist/src: xftglyphs.c
xsrc/external/mit/libXi/dist/man: XGetDeviceKeyMapping.man
xsrc/external/mit/libXpm/dist/src: create.c
xsrc/external/mit/libXt/dist: compile
xsrc/external/mit/libXt/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libXt/dist/src: Convert.c NextEvent.c ResConfig.c
TMparse.c
xsrc/external/mit/libXt/dist/util: makestrs.c
xsrc/external/mit/xtrans/dist: Xtranssock.c

Log Message:
merge libXfixes 6.0.1, libXft 2.3.8, libXi 1.8.1, libXpm 3.5.16,
libXt 1.3.0, and xtrans 1.5.0.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXft/dist/src/xftglyphs.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXpm/dist/src/create.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/compile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXt/dist/m4/libtool.m4
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXt/dist/m4/ltoptions.m4 \
xsrc/external/mit/libXt/dist/m4/ltsugar.m4 \
xsrc/external/mit/libXt/dist/m4/ltversion.m4 \
xsrc/external/mit/libXt/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXt/dist/src/Convert.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libXt/dist/src/NextEvent.c \
xsrc/external/mit/libXt/dist/src/TMparse.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXt/dist/src/ResConfig.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/util/makestrs.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xtrans/dist/Xtranssock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 06:44:24 UTC 2023

Modified Files:
xsrc/external/mit/libXft/dist/src: xftglyphs.c
xsrc/external/mit/libXi/dist/man: XGetDeviceKeyMapping.man
xsrc/external/mit/libXpm/dist/src: create.c
xsrc/external/mit/libXt/dist: compile
xsrc/external/mit/libXt/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libXt/dist/src: Convert.c NextEvent.c ResConfig.c
TMparse.c
xsrc/external/mit/libXt/dist/util: makestrs.c
xsrc/external/mit/xtrans/dist: Xtranssock.c

Log Message:
merge libXfixes 6.0.1, libXft 2.3.8, libXi 1.8.1, libXpm 3.5.16,
libXt 1.3.0, and xtrans 1.5.0.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXft/dist/src/xftglyphs.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXpm/dist/src/create.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/compile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXt/dist/m4/libtool.m4
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXt/dist/m4/ltoptions.m4 \
xsrc/external/mit/libXt/dist/m4/ltsugar.m4 \
xsrc/external/mit/libXt/dist/m4/ltversion.m4 \
xsrc/external/mit/libXt/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXt/dist/src/Convert.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libXt/dist/src/NextEvent.c \
xsrc/external/mit/libXt/dist/src/TMparse.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXt/dist/src/ResConfig.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/util/makestrs.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xtrans/dist/Xtranssock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXft/dist/src/xftglyphs.c
diff -u xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.6 xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.7
--- xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.6	Sun Jan  8 06:03:45 2023
+++ xsrc/external/mit/libXft/dist/src/xftglyphs.c	Mon Jun 19 06:44:23 2023
@@ -840,18 +840,22 @@ XftFontLoadGlyphs (Display	*dpy,
 		}
 		FT_Vector_Transform(&vector, &font->info.matrix);
 		xftg->metrics.xOff = (short)(TRUNC(ROUND(vector.x)));
-		xftg->metrics.yOff = (short)(TRUNC(ROUND(vector.y)));
+		xftg->metrics.yOff = (short)(-TRUNC(ROUND(vector.y)));
 	}
 	else
 	{
+		short maximum_x = (short)(font->public.max_advance_width);
+		short maximum_y = (short)(-font->public.max_advance_width);
+		short trimmed_x = (short)(TRUNC(ROUND(glyphslot->advance.x)));
+		short trimmed_y = (short)(-TRUNC(ROUND(glyphslot->advance.y)));
 		if (font->info.load_flags & FT_LOAD_VERTICAL_LAYOUT)
 		{
 		xftg->metrics.xOff = 0;
-		xftg->metrics.yOff = (short)(-TRUNC(ROUND(glyphslot->advance.y)));
+		xftg->metrics.yOff = min(maximum_y,trimmed_y);
 		}
 		else
 		{
-		xftg->metrics.xOff = (short)(TRUNC(ROUND(glyphslot->advance.x)));
+		xftg->metrics.xOff = min(maximum_x,trimmed_x);
 		xftg->metrics.yOff = 0;
 		}
 	}
@@ -1245,8 +1249,11 @@ XftFontCheckGlyph (Display	*dpy,
 /*
  * Make unloading faster by moving newly-referenced glyphs to the front
  * of the list, leaving the less-used glyphs on the end.
+ *
+ * If the glyph is zero, the older/newer data may not have been set.
  */
-if (font->track_mem_usage
+if (glyph != 0
+ && font->track_mem_usage
  && font->total_inuse > 10
  && font->newest != FT_UINT_MAX
  && font->newest != glyph)

Index: xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man
diff -u xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man:1.2 xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man:1.3
--- xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man:1.2	Sun May  1 23:12:54 2022
+++ xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man	Mon Jun 19 06:44:23 2023
@@ -1,13 +1,13 @@
 '\" t
 .\" Title: xgetdevicekeymapping
-.\"Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.79.1 
-.\"  Date: 09/15/2021
+.\"Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
+.\" Generator: DocBook XSL Stylesheets vsnapshot 
+.\"  Date: 05/04/2023
 .\"Manual: \ \&
 .\"Source: \ \&
 .\"  Language: English
 .\"
-.TH "XGETDEVICEKEYMAPPING" "libmansuffix" "09/15/2021" "\ \&" "\ \&"
+.TH "XGETDEVICEKEYMAPPING" "libmansuffix" "05/04/2023" "\ \&" "\ \&"
 .\" -
 .\" * Define some portability stuff
 .\" -

Index: xsrc/external/mit/libXpm/dist/src/create.c
diff -u xsrc/external/mit/libXpm/dist/src/create.c:1.5 xsrc/external/mit/libXpm/dist/src/create.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 08:02:08 UTC 2023

Modified Files:
xsrc/external/mit/xinput/dist/src: xinput.c
xsrc/external/mit/xrdb/dist: xrdb.c
xsrc/external/mit/xwininfo/dist: xwininfo.c
xsrc/external/mit/xwininfo/include: config.h

Log Message:
merge xinput 1.6.4, xrdb 1.2.2, xwd 1.0.9, and xwininfo 1.1.6


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xinput/dist/src/xinput.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xwininfo/dist/xwininfo.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xwininfo/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 08:02:08 UTC 2023

Modified Files:
xsrc/external/mit/xinput/dist/src: xinput.c
xsrc/external/mit/xrdb/dist: xrdb.c
xsrc/external/mit/xwininfo/dist: xwininfo.c
xsrc/external/mit/xwininfo/include: config.h

Log Message:
merge xinput 1.6.4, xrdb 1.2.2, xwd 1.0.9, and xwininfo 1.1.6


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xinput/dist/src/xinput.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xwininfo/dist/xwininfo.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xwininfo/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xinput/dist/src/xinput.c
diff -u xsrc/external/mit/xinput/dist/src/xinput.c:1.5 xsrc/external/mit/xinput/dist/src/xinput.c:1.6
--- xsrc/external/mit/xinput/dist/src/xinput.c:1.5	Fri Jul 19 07:29:35 2019
+++ xsrc/external/mit/xinput/dist/src/xinput.c	Mon Jun 19 08:02:08 2023
@@ -105,7 +105,7 @@ static entry drivers[] =
   test_xi2,
 },
 { "map-to-output",
-  " ",
+  " |all",
   map_to_output,
 },
 #endif
@@ -352,7 +352,7 @@ usage(void)
 {
 entry	*pdriver = drivers;
 
-fprintf(stderr, "usage :\n");
+fprintf(stderr, "usage:\n");
 
 while(pdriver->func_name) {
 	fprintf(stderr, "\txinput %s %s\n", pdriver->func_name,
@@ -388,6 +388,7 @@ main(int argc, char * argv[])
 entry	*driver = drivers;
 char*func;
 int event, error;
+int xwl_op, xwl_ev, xwl_err;
 
 if (argc > 1) {
 	func = argv[1];
@@ -422,7 +423,7 @@ main(int argc, char * argv[])
 	goto out;
 }
 
-if (is_xwayland(display))
+if (XQueryExtension(display, "XWAYLAND", &xwl_op, &xwl_ev, &xwl_err) || is_xwayland(display))
 fprintf(stderr, "WARNING: running xinput against an Xwayland server. See the xinput man page for details.\n");
 
 while(driver->func_name) {

Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.11 xsrc/external/mit/xrdb/dist/xrdb.c:1.12
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.11	Mon Aug 23 21:28:58 2021
+++ xsrc/external/mit/xrdb/dist/xrdb.c	Mon Jun 19 08:02:08 2023
@@ -168,25 +168,24 @@ asprintf(char **ret, const char *format,
 if (len < 0)
 return -1;
 
+*ret = malloc(len + 1); /* snprintf doesn't count trailing '\0' */
+if (*ret == NULL)
+return -1;
+
 if (len < sizeof(buf)) {
-*ret = strdup(buf);
+memcpy(*ret, buf, len + 1);
 }
 else {
-*ret = malloc(len + 1); /* snprintf doesn't count trailing '\0' */
-if (*ret != NULL) {
-va_start(ap, format);
-len = vsnprintf(*ret, len + 1, format, ap);
-va_end(ap);
-if (len < 0) {
-free(*ret);
-*ret = NULL;
-}
+va_start(ap, format);
+len = vsnprintf(*ret, len + 1, format, ap);
+va_end(ap);
+if (len < 0) {
+free(*ret);
+*ret = NULL;
+return -1;
 }
 }
 
-if (*ret == NULL)
-return -1;
-
 return len;
 }
 #endif  /* HAVE_ASPRINTF */
@@ -249,9 +248,7 @@ InitEntries(Entries *e)
 static void
 FreeEntries(Entries *e)
 {
-size_t i;
-
-for (i = 0; i < e->used; i++) {
+for (size_t i = 0; i < e->used; i++) {
 if (e->entry[i].usable) {
 free(e->entry[i].tag);
 free(e->entry[i].value);
@@ -263,9 +260,7 @@ FreeEntries(Entries *e)
 static void
 AddEntry(Entries *e, Entry *entry)
 {
-size_t n;
-
-for (n = 0; n < e->used; n++) {
+for (size_t n = 0; n < e->used; n++) {
 if (!strcmp(e->entry[n].tag, entry->tag)) {
 /* overwrite old entry */
 if (e->entry[n].lineno && !quiet) {
@@ -403,11 +398,12 @@ GetEntries(Entries *entries, Buffer *buf
 static void
 GetEntriesString(Entries *entries, char *str)
 {
-Buffer buff;
-
 if (str && *str) {
-buff.buff = str;
-buff.used = strlen(str);
+Buffer buff = {
+.buff = str,
+.used = strlen(str)
+};
+
 GetEntries(entries, &buff, 1);
 }
 }
@@ -512,13 +508,12 @@ AddDefTok(String *buff, const char *pref
 static void
 AddDefHostname(String *buff, const char *title, const char *value)
 {
-char *s;
 char name[512];
 char c;
 
 strncpy(name, value, sizeof(name) - 1);
 name[sizeof(name) - 1] = '\0';
-for (s = name; (c = *s); s++) {
+for (char *s = name; (c = *s); s++) {
 if (!isalpha(c) && !isdigit(c) &&
 c != '_' && c != '.' && c != ':' && c != '-')
 *s = '_';
@@ -550,13 +545,10 @@ AddUndef(String *buff, const char *title
 static void
 DoCmdDefines(String *buff)
 {
-int i;
-char *arg, *val;
-
-for (i = 0; i < num_cmd_defines; i++)

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 09:06:01 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-geode/dist/src: geode.h geode_driver.c
gx_accel.c gx_cursor.c gx_driver.c gx_video.c lx_display.c
lx_driver.c lx_exa.c lx_memory.c
xsrc/external/mit/xf86-video-i128/dist/src: i128_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dga.c savage_dri.c
savage_driver.c savage_driver.h
Removed Files:
xsrc/external/mit/xf86-video-savage/dist: README

Log Message:
merge xf86-video-geode 2.11.21, xf86-video-i128 1.4.1,
xf86-video-neomagic 1.3.1, and xf86-video-savage 2.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-geode/dist/src/geode.h \
xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c \
xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c \
xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c \
xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-savage/dist/README
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 09:06:01 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-geode/dist/src: geode.h geode_driver.c
gx_accel.c gx_cursor.c gx_driver.c gx_video.c lx_display.c
lx_driver.c lx_exa.c lx_memory.c
xsrc/external/mit/xf86-video-i128/dist/src: i128_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dga.c savage_dri.c
savage_driver.c savage_driver.h
Removed Files:
xsrc/external/mit/xf86-video-savage/dist: README

Log Message:
merge xf86-video-geode 2.11.21, xf86-video-i128 1.4.1,
xf86-video-neomagic 1.3.1, and xf86-video-savage 2.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-geode/dist/src/geode.h \
xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c \
xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c \
xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c \
xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-savage/dist/README
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-geode/dist/src/geode.h
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.7 xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.8
--- xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.7	Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode.h	Mon Jun 19 09:06:01 2023
@@ -215,7 +215,7 @@ typedef struct _geodeRec {
 unsigned long CursorStartOffset;
 
 int Pitch;  /* display FB pitch */
-int displaySize;/* The size of the visibile area */
+int displaySize;/* The size of the visible area */
 
 ExaOffscreenArea *shadowArea;
 
@@ -285,7 +285,7 @@ typedef struct _geodeRec {
 int PanelX;
 int PanelY;
 
-int displayPitch;   /* The pitch ofthe visible area */
+int displayPitch;   /* The pitch of the visible area */
 int displayOffset;  /* The offset of the visible area */
 
 DisplayModePtr curMode;
@@ -361,7 +361,7 @@ enum LX_GeodeOpts {
 #endif
 
 #ifdef HAVE_GX
-typedef enum {
+enum GX_GeodeOpts {
 GX_OPTION_SW_CURSOR,
 GX_OPTION_HW_CURSOR,
 GX_OPTION_NOCOMPRESSION,
@@ -378,7 +378,7 @@ typedef enum {
 GX_OPTION_FBSIZE,
 GX_OPTION_PANEL_GEOMETRY,
 GX_OPTION_DONT_PROGRAM
-} GX_GeodeOpts;
+};
 #endif
 
 /* geode_dcon.c */
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.7 xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.8
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.7	Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c	Mon Jun 19 09:06:01 2023
@@ -427,7 +427,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
   (int *) &(pGeode->FBAvail)))
 pGeode->FBAvail = 0;
 
-/* For compatability - allow SWCursor too */
+/* For compatibility - allow SWCursor too */
 
 if (xf86ReturnOptValBool(GeodeOptions, LX_OPTION_SW_CURSOR, FALSE))
 pGeode->tryHWCursor = FALSE;

Index: xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c:1.2 xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c:1.3
--- xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c:1.2	Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c	Mon Jun 19 09:06:01 2023
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 Avanced Micro Devices, Inc.
+ * Copyright (c) 2006 Advanced Micro Devices, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -416,7 +416,7 @@ AmdPciProbe(DriverPtr driver,
  *
  * Comments :This should be minimal probe and it should under no
  * 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 06:03:45 UTC 2023

Modified Files:
xsrc/external/mit/libXft/dist/src: xftglyphs.c
xsrc/external/mit/libXpm/dist/src: create.c
xsrc/external/mit/libXrandr/dist: compile
xsrc/external/mit/libXrandr/dist/src: XrrProvider.c

Log Message:
merge libXft 2.3.7, libXpm 3.5.14, and libXrandr 1.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXft/dist/src/xftglyphs.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXpm/dist/src/create.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrandr/dist/compile
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXft/dist/src/xftglyphs.c
diff -u xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.5 xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.6
--- xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.5	Fri Sep  9 23:18:56 2022
+++ xsrc/external/mit/libXft/dist/src/xftglyphs.c	Sun Jan  8 06:03:45 2023
@@ -847,11 +847,11 @@ XftFontLoadGlyphs (Display	*dpy,
 		if (font->info.load_flags & FT_LOAD_VERTICAL_LAYOUT)
 		{
 		xftg->metrics.xOff = 0;
-		xftg->metrics.yOff = (short)(-font->public.max_advance_width);
+		xftg->metrics.yOff = (short)(-TRUNC(ROUND(glyphslot->advance.y)));
 		}
 		else
 		{
-		xftg->metrics.xOff = (short)(font->public.max_advance_width);
+		xftg->metrics.xOff = (short)(TRUNC(ROUND(glyphslot->advance.x)));
 		xftg->metrics.yOff = 0;
 		}
 	}

Index: xsrc/external/mit/libXpm/dist/src/create.c
diff -u xsrc/external/mit/libXpm/dist/src/create.c:1.3 xsrc/external/mit/libXpm/dist/src/create.c:1.4
--- xsrc/external/mit/libXpm/dist/src/create.c:1.3	Sat Mar  4 21:48:03 2017
+++ xsrc/external/mit/libXpm/dist/src/create.c	Sun Jan  8 06:03:45 2023
@@ -2231,7 +2231,7 @@ xpmParseDataAndCreate(
 	}
 }
 /*
- * store found informations in the XpmImage structure
+ * store found information in the XpmImage structure
  */
 image->width = width;
 image->height = height;

Index: xsrc/external/mit/libXrandr/dist/compile
diff -u xsrc/external/mit/libXrandr/dist/compile:1.4 xsrc/external/mit/libXrandr/dist/compile:1.5
--- xsrc/external/mit/libXrandr/dist/compile:1.4	Mon Mar 18 02:33:03 2019
+++ xsrc/external/mit/libXrandr/dist/compile	Sun Jan  8 06:03:45 2023
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.9 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.10
--- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.9	Mon Oct 10 02:52:02 2016
+++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c	Sun Jan  8 06:03:45 2023
@@ -67,7 +67,7 @@ XRRGetProviderResources(Display *dpy, Wi
 
 	rbytes = (sizeof(XRRProviderResources) + rep.nProviders *
 		  sizeof(RRProvider));
-	xrpr = (XRRProviderResources *) Xmalloc(rbytes);
+	xrpr = Xmalloc(rbytes);
 } else {
 	nbytes = 0;
 	nbytesRead = 0;
@@ -104,8 +104,6 @@ XRRFreeProviderResources(X

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 06:03:45 UTC 2023

Modified Files:
xsrc/external/mit/libXft/dist/src: xftglyphs.c
xsrc/external/mit/libXpm/dist/src: create.c
xsrc/external/mit/libXrandr/dist: compile
xsrc/external/mit/libXrandr/dist/src: XrrProvider.c

Log Message:
merge libXft 2.3.7, libXpm 3.5.14, and libXrandr 1.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXft/dist/src/xftglyphs.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXpm/dist/src/create.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrandr/dist/compile
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 08:52:49 UTC 2023

Modified Files:
xsrc/external/mit/libXScrnSaver/dist/src: XScrnSaver.c
xsrc/external/mit/libXcomposite/dist/man: Xcomposite.man
xsrc/external/mit/libXres/dist/src: XRes.c
Removed Files:
xsrc/external/mit/libXScrnSaver/dist: README
xsrc/external/mit/libXdamage/dist: README
xsrc/external/mit/libXv/dist: README

Log Message:
merge libXScrnSaver 1.2.4, libXcomposite 0.4.6, libXdamage 1.1.6,
libXres 1.2.2, and libXv 1.0.12.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXScrnSaver/dist/README
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXdamage/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXres/dist/src/XRes.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXv/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 08:52:49 UTC 2023

Modified Files:
xsrc/external/mit/libXScrnSaver/dist/src: XScrnSaver.c
xsrc/external/mit/libXcomposite/dist/man: Xcomposite.man
xsrc/external/mit/libXres/dist/src: XRes.c
Removed Files:
xsrc/external/mit/libXScrnSaver/dist: README
xsrc/external/mit/libXdamage/dist: README
xsrc/external/mit/libXv/dist: README

Log Message:
merge libXScrnSaver 1.2.4, libXcomposite 0.4.6, libXdamage 1.1.6,
libXres 1.2.2, and libXv 1.0.12.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXScrnSaver/dist/README
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libXcomposite/dist/man/Xcomposite.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXdamage/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXres/dist/src/XRes.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXv/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
diff -u xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.4 xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.5
--- xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.4	Fri Dec 28 22:16:48 2018
+++ xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c	Sun Jan  8 08:52:48 2023
@@ -95,21 +95,21 @@ static Bool wire_to_event (
 
 switch ((event->u.u.type & 0x7f) - info->codes->first_event) {
 case ScreenSaverNotify:
-	se = (XScreenSaverNotifyEvent *) re;
+	se = (XScreenSaverNotifyEvent *) re;
 	sevent = (xScreenSaverNotifyEvent *) event;
-	se->type = sevent->type & 0x7f;
-	se->serial = _XSetLastRequestRead(dpy,(xGenericReply *) event);
-	se->send_event = (sevent->type & 0x80) != 0;
-	se->display = dpy;
-	se->window = sevent->window;
+	se->type = sevent->type & 0x7f;
+	se->serial = _XSetLastRequestRead(dpy,(xGenericReply *) event);
+	se->send_event = (sevent->type & 0x80) != 0;
+	se->display = dpy;
+	se->window = sevent->window;
 	se->root = sevent->root;
-	se->state = sevent->state;
+	se->state = sevent->state;
 	se->kind = sevent->kind;
 	se->forced = True;
 	if (sevent->forced == xFalse)
 	se->forced = False;
 	se->time = sevent->timestamp;
-	return True;
+	return True;
 }
 return False;
 }
@@ -127,27 +127,27 @@ static Status event_to_wire (
 
 switch ((re->type & 0x7f) - info->codes->first_event) {
 case ScreenSaverNotify:
-	se = (XScreenSaverNotifyEvent *) re;
+	se = (XScreenSaverNotifyEvent *) re;
 	sevent = (xScreenSaverNotifyEvent *) event;
-	sevent->type = se->type | (se->send_event ? 0x80 : 0);
-	sevent->sequenceNumber = se->serial & 0x;
-	sevent->root = se->root;
-	sevent->window = se->window;
-	sevent->state = se->state;
-	sevent->kind = se->kind;
+	sevent->type = (CARD8) (se->type | (se->send_event ? 0x80 : 0));
+	sevent->sequenceNumber = se->serial & 0x;
+	sevent->root = (CARD32) se->root;
+	sevent->window = (CARD32) se->window;
+	sevent->state = (BYTE) se->state;
+	sevent->kind = (BYTE) se->kind;
 	sevent->forced = xFalse;
 	if (se->forced == True)
 	sevent->forced = xTrue;
-	sevent->timestamp = se->time;
-	return 1;
+	sevent->timestamp = (CARD32) se->time;
+	return 1;
 }
 return 0;
 }
 
 /
- *  *
- *			ScreenSaver public interfaces *
- *  *
+ *	*
+ *			ScreenSaver public interfaces		*
+ *	*
  /
 
 Bool XScreenSaverQueryExtension (
@@ -180,7 +180,7 @@ Status XScreenSaverQueryVersion(
 
 LockDisplay (dpy);
 GetReq (ScreenSaverQueryVersion, req);
-req->reqType = info->codes->major_opcode;
+req->reqType = (CARD8) info->codes->major_opcode;
 req->saverReqType = X_ScreenSaverQueryVersion;
 req->clientMajor = ScreenSaverMajorVersion;
 req->clientMinor = ScreenSaverMinorVersion;
@@ -214,9 +214,9 @@ Status XScreenSaverQueryInfo (
 
 LockDisplay (dpy);
 GetReq (ScreenSaverQueryInfo, req);
-req->reqType = info->codes->major_opcode;
+req->reqType = (CARD8) info->codes->major_opcode;
 req->saverReqType = X_ScreenSaverQueryInfo;
-req->drawable = drawable;
+req->drawable = (CARD32) drawable;
 if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
 	UnlockDisplay (dpy);
 	SyncHandle ();
@@ -239,16 +239,16 @@ void XScreenSaverSelectInput (
 unsigned long	 mask)
 {
 XExtDisplayInfo *info = find_display (dpy);
-register xScreenSaverSelectInputReq   *req;
+register xScree

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 09:09:45 UTC 2023

Modified Files:
xsrc/external/mit/libXxf86dga/dist/src: XF86DGA.c
Removed Files:
xsrc/external/mit/libSM/dist: README

Log Message:
merge libSM 1.2.4, and libXxf86dga 1.1.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libSM/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 09:09:45 UTC 2023

Modified Files:
xsrc/external/mit/libXxf86dga/dist/src: XF86DGA.c
Removed Files:
xsrc/external/mit/libSM/dist: README

Log Message:
merge libSM 1.2.4, and libXxf86dga 1.1.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libSM/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c
diff -u xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c:1.3 xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c:1.4
--- xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c:1.3	Sat Jan 23 14:41:04 2021
+++ xsrc/external/mit/libXxf86dga/dist/src/XF86DGA.c	Sun Jan  8 09:09:45 2023
@@ -8,12 +8,6 @@ Copyright (c) 1995,1996  The XFree86 Pro
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
-#ifdef __UNIXOS2__ /* needed here to override certain constants in X headers */
-#define INCL_DOS
-#define INCL_DOSIOCTL
-#define I_NEED_OS2_H
-#include 
-#endif
 
 #if defined(linux)
 #define HAS_MMAP_ANON
@@ -32,27 +26,12 @@ Copyright (c) 1995,1996  The XFree86 Pro
 #include 
 #endif /* CSRG_BASED */
 
-#if defined(DGUX)
-#define HAS_GETPAGESIZE
-#define MMAP_DEV_ZERO
-#include 
-#include 
-#include 
-#endif /* DGUX */
-
-#if defined(SVR4) && !defined(DGUX)
+#if defined(SVR4)
 #define MMAP_DEV_ZERO
 #include 
 #include 
 #include 
-#endif /* SVR4 && !DGUX */
-
-#if defined(sun) && !defined(SVR4) /* SunOS */
-#define MMAP_DEV_ZERO   /* doesn't SunOS have MAP_ANON ?? */
-#define HAS_GETPAGESIZE
-#include 
-#include 
-#endif /* sun && !SVR4 */
+#endif /* SVR4 */
 
 #ifdef XNO_SYSCONF
 #undef _SC_PAGESIZE
@@ -342,30 +321,7 @@ Bool XF86DGAViewPortChanged(
 #include 
 #include 
 #include 
-#if defined(ISC)
-# define HAS_SVR3_MMAP
-# include 
-# include 
-
-# include 
-# include 
-
-# include 
-# include 
-# include 
-
-# include 
-#else
-# if defined(Lynx) && defined(NO_MMAP)
-#  include 
-#  include 
-#  include 
-# else
-#  if !defined(__UNIXOS2__)
-#   include 
-#  endif
-# endif
-#endif
+#include 
 #include 
 #include 
 #include 
@@ -467,13 +423,6 @@ MapPhysAddress(unsigned long address, un
 int pagesize = -1;
 void *vaddr;
 MapPtr mp;
-#if defined(ISC) && defined(HAS_SVR3_MMAP)
-struct kd_memloc mloc;
-#elif defined(__UNIXOS2__)
-APIRET rc;
-ULONG action;
-HFILE hfd;
-#endif
 
 if ((mp = FindMap(address, size))) {
 	mp->refcount++;
@@ -500,57 +449,6 @@ MapPhysAddress(unsigned long address, un
 
delta = address % pagesize;
offset = address - delta;
-
-#if defined(ISC) && defined(HAS_SVR3_MMAP)
-if (mapFd < 0) {
-	if ((mapFd = open("/dev/mmap", O_RDWR)) < 0)
-	return NULL;
-}
-mloc.vaddr = (char *)0;
-mloc.physaddr = (char *)offset;
-mloc.length = size + delta;
-mloc.ioflg=1;
-
-if ((vaddr = (void *)ioctl(mapFd, MAP, &mloc)) == (void *)-1)
-	return NULL;
-#elif defined (__UNIXOS2__)
-/*
- * Dragon warning here! /dev/pmap$ is never closed, except on progam exit.
- * Consecutive calling of this routine will make PMAP$ driver run out
- * of memory handles. Some umap/close mechanism should be provided
- */
-
-rc = DosOpen("/dev/pmap$", &hfd, &action, 0, FILE_NORMAL, FILE_OPEN,
-		 OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE, (PEAOP2)NULL);
-if (rc != 0)
-	return NULL;
-{
-	struct map_ioctl {
-		union {
-			ULONG phys;
-			void* user;
-		} a;
-		ULONG size;
-	} pmap,dmap;
-	ULONG plen,dlen;
-#define XFREE86_PMAP	0x76
-#define PMAP_MAP	0x44
-
-	pmap.a.phys = offset;
-	pmap.size = size + delta;
-	rc = DosDevIOCtl(hfd, XFREE86_PMAP, PMAP_MAP,
-			 (PULONG)&pmap, sizeof(pmap), &plen,
-			 (PULONG)&dmap, sizeof(dmap), &dlen);
-	if (rc == 0) {
-		vaddr = dmap.a.user;
-	}
-   }
-   if (rc != 0)
-	return NULL;
-#elif defined(Lynx) && defined(NO_MMAP)
-vaddr = (void *)smem_create("XF86DGA", (char *)offset,
-size + delta, SM_READ|SM_WRITE);
-#else
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
@@ -559,10 +457,9 @@ MapPhysAddress(unsigned long address, un
 	return NULL;
 }
 vaddr = (void *)mmap(NULL, size + delta, PROT_READ | PROT_WRITE,
-MAP_FILE | MAP_SHARED, mapFd, (off_t)offset);
+			 MAP_FILE | MAP_SHARED, mapFd, (off_t)offset);
 if (vaddr == (void *)-1)
 	return NULL;
-#endif
 
 if (!vaddr) {
 	if (!(mp = AddMap()))
@@ -622,23 +519,11 @@ XF86DGADirectVideo(
 	mp = sp->map;
 
 if (enable & XF86DGADirectGraphics) {
-#if !defined(ISC) && !defined(HAS_SVR3_MMAP) \
-	&& !(defined(Lynx) && defined(NO_MMAP)) \
-	&& !defined(__UNIXOS2__)
 	if (mp && mp->vaddr)
 	mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ | PROT_WRITE);
-#endif
 } else {
-#if !defined(ISC) && !defined(HAS_SVR3_MMAP) \
-	&& !(defined(Lynx) && defined(NO_MMAP)) \
-	&& !defined(__UNIXOS2__)
 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 09:19:55 UTC 2023

Modified Files:
xsrc/external/mit/xdm/dist/xdm: session.c xdmauth.c
xsrc/external/mit/xfd/dist: compile
Removed Files:
xsrc/external/mit/lndir/dist: README
xsrc/external/mit/transset/dist: README
xsrc/external/mit/xgamma/dist: README

Log Message:
merge lndir 1.0.4, transset 1.0.3, xdm 1.1.14, xfd 1.1.4, and xgamma 1.0.7


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/lndir/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/transset/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/xdm/session.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/xdm/xdmauth.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfd/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgamma/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 09:19:55 UTC 2023

Modified Files:
xsrc/external/mit/xdm/dist/xdm: session.c xdmauth.c
xsrc/external/mit/xfd/dist: compile
Removed Files:
xsrc/external/mit/lndir/dist: README
xsrc/external/mit/transset/dist: README
xsrc/external/mit/xgamma/dist: README

Log Message:
merge lndir 1.0.4, transset 1.0.3, xdm 1.1.14, xfd 1.1.4, and xgamma 1.0.7


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/lndir/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/transset/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/xdm/session.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/xdm/xdmauth.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfd/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgamma/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/xdm/session.c
diff -u xsrc/external/mit/xdm/dist/xdm/session.c:1.3 xsrc/external/mit/xdm/dist/xdm/session.c:1.4
--- xsrc/external/mit/xdm/dist/xdm/session.c:1.3	Tue Mar  5 08:34:27 2019
+++ xsrc/external/mit/xdm/dist/xdm/session.c	Sun Jan  8 09:19:54 2023
@@ -53,11 +53,7 @@ from The Open Group.
 
 # ifdef HAVE_SETPROCTITLE
 #  include 
-#  ifdef __linux__
-#   include 
-#  else
-#   include 
-#  endif
+#  include 
 # endif
 
 #ifndef USE_PAM/* PAM modules should handle these */

Index: xsrc/external/mit/xdm/dist/xdm/xdmauth.c
diff -u xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.5 xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.6
--- xsrc/external/mit/xdm/dist/xdm/xdmauth.c:1.5	Tue Mar  5 08:34:27 2019
+++ xsrc/external/mit/xdm/dist/xdm/xdmauth.c	Sun Jan  8 09:19:54 2023
@@ -111,7 +111,7 @@ XdmGetAuthHelper (unsigned short namelen
 	free (new);
 	return (Xauth *) 0;
 }
-memmove( (char *)new->name, name, namelen);
+memcpy(new->name, name, namelen);
 new->name_length = namelen;
 if (!GenerateAuthData ((char *)new->data, new->data_length))
 {
@@ -172,9 +172,9 @@ XdmGetXdmcpAuth (struct protoDisplay *pd
  * which is simply the number we've been passing back and
  * forth via XDMCP
  */
-memmove( fileauth->name, xdmcpauth->name, xdmcpauth->name_length);
-memmove( fileauth->data, pdpy->authenticationData.data, 8);
-memmove( fileauth->data + 8, xdmcpauth->data, 8);
+memcpy(fileauth->name, xdmcpauth->name, xdmcpauth->name_length);
+memcpy(fileauth->data, pdpy->authenticationData.data, 8);
+memcpy(fileauth->data + 8, xdmcpauth->data, 8);
 XdmPrintDataHex ("Accept packet auth", xdmcpauth->data, xdmcpauth->data_length);
 XdmPrintDataHex ("Auth file auth", fileauth->data, fileauth->data_length);
 /* encrypt the session key for its trip back to the server */
@@ -245,7 +245,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARR
 	while (keylen < 7)
 		key[keylen++] = '\0';
 	pdpy->key.data[0] = '\0';
-	memmove( pdpy->key.data + 1, key, 7);
+	memcpy(pdpy->key.data + 1, key, 7);
 	bzero(key, sizeof(key));
 	fclose (keys);
 	return TRUE;

Index: xsrc/external/mit/xfd/dist/compile
diff -u xsrc/external/mit/xfd/dist/compile:1.4 xsrc/external/mit/xfd/dist/compile:1.5
--- xsrc/external/mit/xfd/dist/compile:1.4	Mon Mar 11 06:45:03 2019
+++ xsrc/external/mit/xfd/dist/compile	Sun Jan  8 09:19:54 2023
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 09:59:52 UTC 2023

Modified Files:
xsrc/external/mit/xinit/dist: compile startx.cpp xinit.c
xsrc/external/mit/xinit/dist/man: startx.man
xsrc/external/mit/xprop/include: config.h
xsrc/external/mit/xrandr/dist: compile xrandr.c
xsrc/external/mit/xstdcmap/dist: compile
Removed Files:
xsrc/external/mit/xinit/dist/launchd: console_redirect.c
console_redirect.h
xsrc/external/mit/xrandr/dist: README
xsrc/external/mit/xset/dist: README

Log Message:
merge xinit 1.4.2, xprop 1.2.6, xrandr 1.5.2, xset 1.2.5, and xstdcmap 1.0.5


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xinit/dist/compile
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xinit/dist/startx.cpp
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xinit/dist/xinit.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xinit/dist/launchd/console_redirect.c \
xsrc/external/mit/xinit/dist/launchd/console_redirect.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinit/dist/man/startx.man
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xprop/include/config.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xrandr/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xrandr/dist/compile
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xrandr/dist/xrandr.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xset/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xstdcmap/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 09:59:52 UTC 2023

Modified Files:
xsrc/external/mit/xinit/dist: compile startx.cpp xinit.c
xsrc/external/mit/xinit/dist/man: startx.man
xsrc/external/mit/xprop/include: config.h
xsrc/external/mit/xrandr/dist: compile xrandr.c
xsrc/external/mit/xstdcmap/dist: compile
Removed Files:
xsrc/external/mit/xinit/dist/launchd: console_redirect.c
console_redirect.h
xsrc/external/mit/xrandr/dist: README
xsrc/external/mit/xset/dist: README

Log Message:
merge xinit 1.4.2, xprop 1.2.6, xrandr 1.5.2, xset 1.2.5, and xstdcmap 1.0.5


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xinit/dist/compile
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xinit/dist/startx.cpp
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xinit/dist/xinit.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xinit/dist/launchd/console_redirect.c \
xsrc/external/mit/xinit/dist/launchd/console_redirect.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xinit/dist/man/startx.man
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xprop/include/config.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xrandr/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xrandr/dist/compile
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xrandr/dist/xrandr.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xset/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xstdcmap/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xinit/dist/compile
diff -u xsrc/external/mit/xinit/dist/compile:1.4 xsrc/external/mit/xinit/dist/compile:1.5
--- xsrc/external/mit/xinit/dist/compile:1.4	Sun Mar 11 10:46:02 2018
+++ xsrc/external/mit/xinit/dist/compile	Sun Jan  8 09:59:51 2023
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.9 xsrc/external/mit/xinit/dist/startx.cpp:1.10
--- xsrc/external/mit/xinit/dist/startx.cpp:1.9	Thu Apr  7 20:28:49 2022
+++ xsrc/external/mit/xinit/dist/startx.cpp	Sun Jan  8 09:59:51 2023
@@ -2,16 +2,16 @@ XCOMM!SHELL_CMD
 
 XCOMM
 XCOMM This is just a sample implementation of a slightly less primitive
-XCOMM interface than xinit.  It looks for user .xinitrc and .xserverrc
-XCOMM files, then system xinitrc and xserverrc files, else lets xinit choose
-XCOMM its default.  The system xinitrc should probably do things like check
-XCOMM for .Xresources files and merge them in, start up a window manager,
-XCOMM and pop a clock and several xterms.
+XCOMM interface than xinit.  It looks for XINITRC and XSERVERRC environment
+XCOMM variables, then user .xinitrc and .xserverrc files, and then system
+XCOMM xinitrc and xserverrc files, else lets xinit choose its default.
+XCOMM The system xinitrc should probably do things like check for
+XCOMM .Xresources files and merge them in, start up a window manager, and
+XCOMM pop a clock and several xterms.
 XCOMM
 XCOMM Site administrators are STRONGLY urged to write nicer versions.
 XCOMM
 
-unset D

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 21:34:50 UTC 2023

Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
xsrc/external/mit/xf86-input-elographics/include: config.h
xsrc/external/mit/xf86-video-ast/dist/src: ast_driver.c ast_vgatool.c
xsrc/external/mit/xf86-video-r128/dist/src: r128.h r128_driver.c
r128_probe.h r128_reg.h
xsrc/external/mit/xf86-video-vesa/dist: Makefile.in aclocal.m4
config.guess config.h.in config.sub configure configure.ac depcomp
install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-vesa/dist/man: Makefile.in
xsrc/external/mit/xf86-video-vesa/dist/src: Makefile.in vesa.c
Removed Files:
xsrc/external/mit/xf86-video-ast/dist: README

Log Message:
merge xf86-input-elographics 1.4.3, xf86-video-ast 1.1.6,
xf86-video-r128 6.12.1, and xf86-video-vesa 2.6.0.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-input-elographics/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-ast/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_driver.c
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-vesa/dist/Makefile.in \
xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-vesa/dist/configure \
xsrc/external/mit/xf86-video-vesa/dist/configure.ac \
xsrc/external/mit/xf86-video-vesa/dist/depcomp \
xsrc/external/mit/xf86-video-vesa/dist/install-sh \
xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh \
xsrc/external/mit/xf86-video-vesa/dist/missing
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-vesa/dist/config.guess \
xsrc/external/mit/xf86-video-vesa/dist/config.h.in \
xsrc/external/mit/xf86-video-vesa/dist/config.sub
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 21:34:50 UTC 2023

Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
xsrc/external/mit/xf86-input-elographics/include: config.h
xsrc/external/mit/xf86-video-ast/dist/src: ast_driver.c ast_vgatool.c
xsrc/external/mit/xf86-video-r128/dist/src: r128.h r128_driver.c
r128_probe.h r128_reg.h
xsrc/external/mit/xf86-video-vesa/dist: Makefile.in aclocal.m4
config.guess config.h.in config.sub configure configure.ac depcomp
install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-vesa/dist/man: Makefile.in
xsrc/external/mit/xf86-video-vesa/dist/src: Makefile.in vesa.c
Removed Files:
xsrc/external/mit/xf86-video-ast/dist: README

Log Message:
merge xf86-input-elographics 1.4.3, xf86-video-ast 1.1.6,
xf86-video-r128 6.12.1, and xf86-video-vesa 2.6.0.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-input-elographics/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-ast/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_driver.c
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-vesa/dist/Makefile.in \
xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-vesa/dist/configure \
xsrc/external/mit/xf86-video-vesa/dist/configure.ac \
xsrc/external/mit/xf86-video-vesa/dist/depcomp \
xsrc/external/mit/xf86-video-vesa/dist/install-sh \
xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh \
xsrc/external/mit/xf86-video-vesa/dist/missing
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-vesa/dist/config.guess \
xsrc/external/mit/xf86-video-vesa/dist/config.h.in \
xsrc/external/mit/xf86-video-vesa/dist/config.sub
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 22:03:04 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h cg14_driver.c
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h ffb_driver.c
ffb_regs.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h leo_accel.c
xsrc/external/mit/xf86-video-suntcx/dist: ChangeLog Makefile.am
Makefile.in aclocal.m4 config.guess config.h.in config.sub
configure configure.ac depcomp install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-suntcx/dist/man: Makefile.in suntcx.man
xsrc/external/mit/xf86-video-suntcx/dist/src: Makefile.in tcx.h
Removed Files:
xsrc/external/mit/xf86-video-suncg14/dist: README
xsrc/external/mit/xf86-video-suncg6/dist: README
xsrc/external/mit/xf86-video-sunffb/dist: README
xsrc/external/mit/xf86-video-sunleo/dist: README
xsrc/external/mit/xf86-video-suntcx/dist: README

Log Message:
merge xf86-video-suncg14 1.1.3, xf86-video-suncg6 1.1.3,
xf86-video-sunffb 1.2.3, xf86-video-sunleo 1.2.3,
and xf86-video-suntcx 1.1.3.

ffb_driver.c probably needs explicit testing that the EXA/XAA
code still works properly.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-suncg14/dist/README
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-suncg6/dist/README
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-sunffb/dist/README
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_regs.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-sunleo/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-suntcx/dist/ChangeLog \
xsrc/external/mit/xf86-video-suntcx/dist/Makefile.am \
xsrc/external/mit/xf86-video-suntcx/dist/Makefile.in \
xsrc/external/mit/xf86-video-suntcx/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-suntcx/dist/config.guess \
xsrc/external/mit/xf86-video-suntcx/dist/config.h.in \
xsrc/external/mit/xf86-video-suntcx/dist/config.sub \
xsrc/external/mit/xf86-video-suntcx/dist/configure \
xsrc/external/mit/xf86-video-suntcx/dist/configure.ac \
xsrc/external/mit/xf86-video-suntcx/dist/depcomp \
xsrc/external/mit/xf86-video-suntcx/dist/install-sh \
xsrc/external/mit/xf86-video-suntcx/dist/ltmain.sh \
xsrc/external/mit/xf86-video-suntcx/dist/missing
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xf86-video-suntcx/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-suntcx/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-suntcx/dist/man/suntcx.man
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-suntcx/dist/src/Makefile.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 22:03:04 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h cg14_driver.c
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h ffb_driver.c
ffb_regs.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h leo_accel.c
xsrc/external/mit/xf86-video-suntcx/dist: ChangeLog Makefile.am
Makefile.in aclocal.m4 config.guess config.h.in config.sub
configure configure.ac depcomp install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-suntcx/dist/man: Makefile.in suntcx.man
xsrc/external/mit/xf86-video-suntcx/dist/src: Makefile.in tcx.h
Removed Files:
xsrc/external/mit/xf86-video-suncg14/dist: README
xsrc/external/mit/xf86-video-suncg6/dist: README
xsrc/external/mit/xf86-video-sunffb/dist: README
xsrc/external/mit/xf86-video-sunleo/dist: README
xsrc/external/mit/xf86-video-suntcx/dist: README

Log Message:
merge xf86-video-suncg14 1.1.3, xf86-video-suncg6 1.1.3,
xf86-video-sunffb 1.2.3, xf86-video-sunleo 1.2.3,
and xf86-video-suntcx 1.1.3.

ffb_driver.c probably needs explicit testing that the EXA/XAA
code still works properly.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-suncg14/dist/README
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-suncg6/dist/README
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-sunffb/dist/README
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_regs.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-sunleo/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-suntcx/dist/ChangeLog \
xsrc/external/mit/xf86-video-suntcx/dist/Makefile.am \
xsrc/external/mit/xf86-video-suntcx/dist/Makefile.in \
xsrc/external/mit/xf86-video-suntcx/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-suntcx/dist/config.guess \
xsrc/external/mit/xf86-video-suntcx/dist/config.h.in \
xsrc/external/mit/xf86-video-suntcx/dist/config.sub \
xsrc/external/mit/xf86-video-suntcx/dist/configure \
xsrc/external/mit/xf86-video-suntcx/dist/configure.ac \
xsrc/external/mit/xf86-video-suntcx/dist/depcomp \
xsrc/external/mit/xf86-video-suntcx/dist/install-sh \
xsrc/external/mit/xf86-video-suntcx/dist/ltmain.sh \
xsrc/external/mit/xf86-video-suntcx/dist/missing
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xf86-video-suntcx/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-suntcx/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-suntcx/dist/man/suntcx.man
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-suntcx/dist/src/Makefile.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Feb 26 19:59:32 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-ark/dist/src: ark_driver.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_accel.c s3v_driver.c
xsrc/external/mit/xf86-video-trident/dist/src: trident.h
trident_driver.c
xsrc/external/mit/xf86-video-vmware/dist/src: vmware.c vmwaremodes.c
Removed Files:
xsrc/external/mit/xf86-video-ark/dist: README
xsrc/external/mit/xf86-video-trident/dist: README
xsrc/external/mit/xf86-video-trident/dist/src: blade_accel.c
blade_accel_exa.c image_accel.c trident_accel.c tridenthelper.c
tridentpcirename.h xp4_accel.c xp4_accel_exa.c xp_accel.c
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx: vmwgfx_hosted_priv.h
vmwgfx_xmir.c vmwgfx_xwayland.c

Log Message:
merge xf86-video-ark 0.7.6, xf86-video-s3virge 1.11.1,
xf86-video-trident 1.4.0, and xf86-video-vmware 13.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-ark/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-trident/dist/README
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-video-trident/dist/src/blade_accel.c \
xsrc/external/mit/xf86-video-trident/dist/src/image_accel.c \
xsrc/external/mit/xf86-video-trident/dist/src/trident_accel.c \
xsrc/external/mit/xf86-video-trident/dist/src/tridenthelper.c \
xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel.c \
xsrc/external/mit/xf86-video-trident/dist/src/xp_accel.c
cvs rdiff -u -r1.3 -r0 \
xsrc/external/mit/xf86-video-trident/dist/src/blade_accel_exa.c \
xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel_exa.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-trident/dist/src/trident.h \
xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-trident/dist/src/tridentpcirename.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_hosted_priv.h
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xmir.c \
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xwayland.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 19 23:07:25 UTC 2023

Removed Files:
xsrc/external/mit/encodings/dist: compile
xsrc/external/mit/font-adobe-100dpi/dist: README
xsrc/external/mit/font-adobe-75dpi/dist: README
xsrc/external/mit/font-adobe-utopia-100dpi/dist: README
xsrc/external/mit/font-adobe-utopia-type1/dist: README
xsrc/external/mit/font-alias/dist: compile
xsrc/external/mit/font-bh-100dpi/dist: README
xsrc/external/mit/font-bh-75dpi/dist: README
xsrc/external/mit/font-bh-lucidatypewriter-100dpi/dist: README
xsrc/external/mit/font-bh-lucidatypewriter-75dpi/dist: README
xsrc/external/mit/font-bh-ttf/dist: README
xsrc/external/mit/font-bh-type1/dist: README
xsrc/external/mit/font-bitstream-100dpi/dist: README
xsrc/external/mit/font-bitstream-75dpi/dist: README
xsrc/external/mit/font-bitstream-type1/dist: README
xsrc/external/mit/font-cursor-misc/dist: README
xsrc/external/mit/font-daewoo-misc/dist: README
xsrc/external/mit/font-dec-misc/dist: README
xsrc/external/mit/font-ibm-type1/dist: README
xsrc/external/mit/font-isas-misc/dist: README
xsrc/external/mit/font-jis-misc/dist: README
xsrc/external/mit/font-misc-misc/dist: README
xsrc/external/mit/font-mutt-misc/dist: README
xsrc/external/mit/font-sony-misc/dist: README

Log Message:
merge new font packages.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/encodings/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-adobe-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-adobe-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-adobe-utopia-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-adobe-utopia-type1/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/font-alias/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-bh-lucidatypewriter-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-bh-lucidatypewriter-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-ttf/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-type1/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-bitstream-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bitstream-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bitstream-type1/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-cursor-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-daewoo-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-dec-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-ibm-type1/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-isas-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-jis-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-misc-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-mutt-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-sony-misc/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 19 23:07:25 UTC 2023

Removed Files:
xsrc/external/mit/encodings/dist: compile
xsrc/external/mit/font-adobe-100dpi/dist: README
xsrc/external/mit/font-adobe-75dpi/dist: README
xsrc/external/mit/font-adobe-utopia-100dpi/dist: README
xsrc/external/mit/font-adobe-utopia-type1/dist: README
xsrc/external/mit/font-alias/dist: compile
xsrc/external/mit/font-bh-100dpi/dist: README
xsrc/external/mit/font-bh-75dpi/dist: README
xsrc/external/mit/font-bh-lucidatypewriter-100dpi/dist: README
xsrc/external/mit/font-bh-lucidatypewriter-75dpi/dist: README
xsrc/external/mit/font-bh-ttf/dist: README
xsrc/external/mit/font-bh-type1/dist: README
xsrc/external/mit/font-bitstream-100dpi/dist: README
xsrc/external/mit/font-bitstream-75dpi/dist: README
xsrc/external/mit/font-bitstream-type1/dist: README
xsrc/external/mit/font-cursor-misc/dist: README
xsrc/external/mit/font-daewoo-misc/dist: README
xsrc/external/mit/font-dec-misc/dist: README
xsrc/external/mit/font-ibm-type1/dist: README
xsrc/external/mit/font-isas-misc/dist: README
xsrc/external/mit/font-jis-misc/dist: README
xsrc/external/mit/font-misc-misc/dist: README
xsrc/external/mit/font-mutt-misc/dist: README
xsrc/external/mit/font-sony-misc/dist: README

Log Message:
merge new font packages.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/encodings/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-adobe-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-adobe-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-adobe-utopia-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-adobe-utopia-type1/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/font-alias/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-bh-lucidatypewriter-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-bh-lucidatypewriter-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-ttf/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bh-type1/dist/README
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/font-bitstream-100dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bitstream-75dpi/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-bitstream-type1/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-cursor-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-daewoo-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-dec-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-ibm-type1/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-isas-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-jis-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-misc-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-mutt-misc/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-sony-misc/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 20 05:58:56 UTC 2023

Modified Files:
xsrc/external/mit/xorg-cf-files/dist: Imake.cf Imake.tmpl NetBSD.cf
X11.tmpl linux.cf site.def
Removed Files:
xsrc/external/mit/xbitmaps/dist: compile
xsrc/external/mit/xorg-cf-files/dist: compile

Log Message:
merge xbitmaps 1.1.3 and xorg-cf-files 1.0.8.

also, fix riscv64 on netbsd to define _XSERVER64.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xbitmaps/dist/compile
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-cf-files/dist/Imake.cf
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xorg-cf-files/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-cf-files/dist/linux.cf \
xsrc/external/mit/xorg-cf-files/dist/site.def

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Mar 20 05:58:56 UTC 2023

Modified Files:
xsrc/external/mit/xorg-cf-files/dist: Imake.cf Imake.tmpl NetBSD.cf
X11.tmpl linux.cf site.def
Removed Files:
xsrc/external/mit/xbitmaps/dist: compile
xsrc/external/mit/xorg-cf-files/dist: compile

Log Message:
merge xbitmaps 1.1.3 and xorg-cf-files 1.0.8.

also, fix riscv64 on netbsd to define _XSERVER64.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xbitmaps/dist/compile
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-cf-files/dist/Imake.cf
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xorg-cf-files/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-cf-files/dist/linux.cf \
xsrc/external/mit/xorg-cf-files/dist/site.def

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.7 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.8
--- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.7	Sun Mar  5 00:59:48 2017
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf	Mon Mar 20 05:58:56 2023
@@ -37,6 +37,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
 #  define x86_64DarwinArchitecture
 #  undef __x86_64__
 # endif
+# ifdef __aarch64__
+#  define aarch64DarwinArchitecture
+#  undef __aarch64__
+# endif
 #endif
 
 #if defined(clipper) || defined(__clipper__)
@@ -259,6 +263,14 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
 #  define ia64Architecture
 #  undef __ia64__
 # endif
+# if defined(__riscv)
+#   undef __riscv
+#   ifdef _LP64
+# define RV64Architecture
+#   else
+# define RV32Architecture
+#   endif
+# endif
 #endif /* NetBSD */
 
 /* Systems based on kernel of NetBSD */
@@ -1041,6 +1053,29 @@ XCOMM Keep cpp from replacing path eleme
 #   define AArch64Architecture
 #   undef __aarch64__
 # endif
+# if defined(__loongarch__)
+#   undef __loongarch__
+#   if __loongarch_grlen == 64
+# undef __loongarch_grlen
+# undef __loongarch_lp64
+# define LoongArch64Architecture
+#   endif
+#   if __loongarch_grlen == 32
+# undef __loongarch_grlen
+# define LoongArch32Architecture
+#   endif
+# endif
+# if defined(__riscv)
+#   undef __riscv
+#   if __riscv_xlen == 64
+# undef __riscv_xlen
+# define RV64Architecture
+#   endif
+#   if __riscv_xlen == 32
+# undef __riscv_xlen
+# define RV32Architecture
+#   endif
+# endif
 #endif /* linux || __GLIBC__ */
 
 #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))

Index: xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.3 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.4
--- xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.3	Fri Jan 20 22:47:37 2023
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl	Mon Mar 20 05:58:56 2023
@@ -1834,7 +1834,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraInclud
 #else
   CPP = CppCmd $(STD_CPP_DEFINES)		/* simple filters */
RAWCPP = RawCppCmd $(STD_CPP_OPTIONS)
-PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES)	/* prefered; mdep */
+PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES)	/* preferred; mdep */
 #endif
   INSTALL = InstallCmd
  INSTALLFLAGS = InstallFlags

Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.9 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.10
--- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.9	Fri Jan 20 22:47:37 2023
+++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf	Mon Mar 20 05:58:56 2023
@@ -284,7 +284,7 @@ XCOMM operating system:  OSName (OSMajor
 #  ifndef XFree86ConsoleDefines
 #define XFree86ConsoleDefines	-DWSCONS_SUPPORT
 #  endif
-#elif defined(ia64Architecture) || defined(AMD64Architecture)
+#elif defined(ia64Architecture) || defined(AMD64Architecture) || defined(RV64Architecture)
 #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
 #else
 #  define ServerExtraDefines GccGasOption
@@ -595,7 +595,7 @@ InstallManPageAliasesBase(file,destdir,a
 #include 
 #endif /* HasSharedLibraries */
 
-/* Always build the XInput library, regardless of server support on this plattform */
+/* Always build the XInput library, regardless of server support on this platform */
 #if !defined(BuildXInputLib) && !defined(BuildServersOnly)
 # define BuildXInputLib  YES
 #endif
@@ -698,6 +698,6 @@ sed 's/\.[0-9]*$$//'`
 
 /*
  * Always include xorg.cf for GccAliasingArgs,
- * regardless of server support on this plattfor

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  3 19:17:42 UTC 2023

Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md configure
configure.ac
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: OpenDis.c
xsrc/external/mit/libXpm/dist/src: create.c
Removed Files:
xsrc/external/mit/libX11/dist/man/xkb: XkbAllocDeviceLedInfo.man
XkbChangeIndicators.man XkbGetAccessXTimeout.man
XkbGetBounceKeysDelay.man XkbGetIndicatorChanges.man
XkbGetNameChanges.man XkbGetSlowKeysDelay.man
XkbGetStickyKeysOptions.man XkbKeySymsOffset.man XkbKeyType.man
XkbKeyTypeIndex.man XkbNoteIndicatorChanges.man
XkbSAActionSetCtrls.man XkbSetAccessXTimeout.man
XkbSetBounceKeysDelay.man

Log Message:
merge libX11 1.8.7 and libXpm 3.5.17.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.1.1.5 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbAllocDeviceLedInfo.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbChangeIndicators.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetStickyKeysOptions.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyType.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbNoteIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetAccessXTimeout.man
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetAccessXTimeout.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSAActionSetCtrls.man
cvs rdiff -u -r1.1.1.7 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetBounceKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetSlowKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetBounceKeysDelay.man
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetNameChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeySymsOffset.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyTypeIndex.man
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/OpenDis.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXpm/dist/src/create.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  3 19:17:42 UTC 2023

Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md configure
configure.ac
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: OpenDis.c
xsrc/external/mit/libXpm/dist/src: create.c
Removed Files:
xsrc/external/mit/libX11/dist/man/xkb: XkbAllocDeviceLedInfo.man
XkbChangeIndicators.man XkbGetAccessXTimeout.man
XkbGetBounceKeysDelay.man XkbGetIndicatorChanges.man
XkbGetNameChanges.man XkbGetSlowKeysDelay.man
XkbGetStickyKeysOptions.man XkbKeySymsOffset.man XkbKeyType.man
XkbKeyTypeIndex.man XkbNoteIndicatorChanges.man
XkbSAActionSetCtrls.man XkbSetAccessXTimeout.man
XkbSetBounceKeysDelay.man

Log Message:
merge libX11 1.8.7 and libXpm 3.5.17.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.1.1.5 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbAllocDeviceLedInfo.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbChangeIndicators.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetStickyKeysOptions.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyType.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbNoteIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetAccessXTimeout.man
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetAccessXTimeout.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSAActionSetCtrls.man
cvs rdiff -u -r1.1.1.7 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetBounceKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetSlowKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetBounceKeysDelay.man
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetNameChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeySymsOffset.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyTypeIndex.man
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/OpenDis.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXpm/dist/src/create.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/ChangeLog
diff -u xsrc/external/mit/libX11/dist/ChangeLog:1.5 xsrc/external/mit/libX11/dist/ChangeLog:1.6
--- xsrc/external/mit/libX11/dist/ChangeLog:1.5	Mon Jun 19 04:46:11 2023
+++ xsrc/external/mit/libX11/dist/ChangeLog	Tue Oct  3 19:17:41 2023
@@ -1,3 +1,408 @@
+commit c745719e23af44a4b40ab4508447637b35d91a1e
+Author: Alan Coopersmith 
+Date:   Tue Oct 3 09:00:01 2023 -0700
+
+libX11 1.8.7
+
+Signed-off-by: Alan Coopersmith 
+
+commit 7916869d16bdd115ac5be30a67c3749907aea6a0
+Author: Yair Mizrahi 
+Date:   Thu Sep 7 16:15:32 2023 -0700
+
+CVE-2023-43787: Integer overflow in XCreateImage() leading to a heap overflow
+
+When the format is `Pixmap` it calculates the size of the image data as:
+ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
+There is no validation on the `width` of the image, and so this
+calculation exceeds the capacity of a 4-byte integer, causing an overflow.
+
+Signed-off-by: Alan Coopersmith 
+
+commit b4031fc023816aca07fbd592ed97010b9b48784b
+Author: Alan Coopersmith 
+Date:   Thu Sep 7 16:12:27 2023 -0700
+
+XCreatePixmap: trigger BadValue error for out-of-range dimensions
+
+The CreatePixmap request specifies height & width of the image as CARD16
+(unsigned 16-bit integer), so if either is larger than that, set it to 0
+so the X server returns a BadValue error as the protocol requires.
+
+Signed-off-by: Alan Coopersmith 
+
+commit 73a37d5f2fcadd6540159b432a70d80f442ddf4a
+Author: Alan Coopersmith 
+Date:   Thu Sep 7 15:55:04 2023 -0700
+
+XPutImage: clip images to maximum height & width allowed by protocol
+
+The PutImage request specifies height & width of the image as CARD16
+(unsigned 16-bit integer), same as the maximum dimensions of an X11
+Drawable, which the image is being copied to.
+
+Signed-off-by: Alan Coopersmith 
+
+commit 204c3393c4c90a29ed6bef64e43849536e863a86
+Author: Alan Coopersmith 
+Date:   Thu Sep 7 15:54:30 2023 -0700
+
+CVE-2023-43786: stack exhaustion from infinite recursion in PutSubImage()
+
+When splitting a single line of pixels into chunks to send to the
+X server, be sure to take into account the number of bits per pixel,
+so we don't just loop forever trying to

CVS commit: xsrc/external/mit

[Jukka Andberg]

Module Name:xsrc
Committed By:   jandberg
Date:   Mon Mar 25 14:11:39 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
xsrc/external/mit/xorg-server/dist/miext/shadow: shadow.h shafb4.c

Log Message:
xf86-video-wsfb: Add support for 16 color mode on Amiga

- Sets up 8bpp shadow framebuffer with depth 4
- Bitplane conversion done in shadow update function
- Adds new shadow update function shadowUpdateAfb4x8,
  which is a slightly modified version of existing shadowUpdateAfb4/8.

Discussion on tech-x11: 
http://mail-index.netbsd.org/tech-x11/2024/02/29/msg002447.html


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Jukka Andberg]

Module Name:xsrc
Committed By:   jandberg
Date:   Mon Mar 25 14:11:39 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
xsrc/external/mit/xorg-server/dist/miext/shadow: shadow.h shafb4.c

Log Message:
xf86-video-wsfb: Add support for 16 color mode on Amiga

- Sets up 8bpp shadow framebuffer with depth 4
- Bitplane conversion done in shadow update function
- Adds new shadow update function shadowUpdateAfb4x8,
  which is a slightly modified version of existing shadowUpdateAfb4/8.

Discussion on tech-x11: 
http://mail-index.netbsd.org/tech-x11/2024/02/29/msg002447.html


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.49 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.50
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.49	Fri Jan 26 13:37:21 2024
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c	Mon Mar 25 14:11:39 2024
@@ -554,14 +554,20 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
 	if (wstype == WSDISPLAY_TYPE_AMIGACC) {
 		/*
 		 * Video memory is organized in bitplanes.
-		 * 8bpp or 1bpp supported in this driver.
-		 * With 8bpp conversion to bitplane format
-		 * is done in shadow update proc.
+		 * 8bpp, 4bpp, and 1bpp supported in this driver.
+		 * With 8bpp/4bpp conversion to bitplane format
+		 * is done in shadow update proc. In both cases
+		 * shadow fb uses 8bpp memory layout and shadow
+		 * update proc ignores the possible extra bits.
 		 * With 1bpp no conversion needed.
 		 */
 #ifdef HAVE_SHADOW_AFB
 		if (bitsperpixel == 8) {
 			fPtr->planarAfb = TRUE;
+		} else if (bitsperpixel == 4) {
+			fPtr->planarAfb = TRUE;
+			default_depth = 4;
+			bitsperpixel = 8;
 		} else
 #endif
 		{
@@ -643,6 +649,16 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
 		fPtr->fbi.fbi_pixeltype = WSFB_RGB;
 	}
 #endif
+#ifdef HAVE_SHADOW_AFB
+	if (fPtr->planarAfb)
+	{
+		if (!fPtr->shadowFB) {
+			xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+   "Shadow FB forced on for planar framebuffer\n");
+			fPtr->shadowFB = TRUE;
+		}
+	}
+#endif
 	/* Rotation */
 	fPtr->rotate = WSFB_ROTATE_NONE;
 	if ((s = xf86GetOptValString(fPtr->Options, OPTION_ROTATE))) {
@@ -891,9 +907,12 @@ WsfbCreateScreenResources(ScreenPtr pScr
 		shadowproc = wsfbUpdateRotatePacked;
 	} else
 #ifdef HAVE_SHADOW_AFB
-	if (fPtr->planarAfb) {
+	if (fPtr->planarAfb && fPtr->fbi.fbi_bitsperpixel == 8) {
 		shadowproc = shadowUpdateAfb8;
 		windowproc = WsfbWindowAfb;
+	} else if (fPtr->planarAfb && fPtr->fbi.fbi_bitsperpixel == 4) {
+		shadowproc = shadowUpdateAfb4x8;
+		windowproc = WsfbWindowAfb;
 	} else
 #endif
 	{

Index: xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h
diff -u xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h:1.1.1.5 xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h:1.2
--- xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h:1.1.1.5	Mon Dec 31 09:36:07 2018
+++ xsrc/external/mit/xorg-server/dist/miext/shadow/shadow.h	Mon Mar 25 14:11:39 2024
@@ -88,6 +88,9 @@ extern _X_EXPORT void
  shadowUpdateAfb8(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 extern _X_EXPORT void
+ shadowUpdateAfb4x8(ScreenPtr pScreen, shadowBufPtr pBuf);
+
+extern _X_EXPORT void
  shadowUpdateIplan2p4(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 extern _X_EXPORT void

Index: xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c
diff -u xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c:1.2
--- xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c:1.1.1.2	Mon Dec 31 09:36:07 2018
+++ xsrc/external/mit/xorg-server/dist/miext/shadow/shafb4.c	Mon Mar 25 14:11:39 2024
@@ -137,3 +137,70 @@ shadowUpdateAfb4(ScreenPtr pScreen, shad
 pbox++;
 }
 }
+
+/*
+ * Like above, except input is 8-bit chunky pixels (upper 4 bits zero)
+ */
+void
+shadowUpdateAfb4x8(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+RegionPtr damage = DamageRegion(pBuf->pDamage);
+PixmapPtr pShadow = pBuf->pPixmap;
+int nbox = RegionNumRects(damage);
+BoxPtr pbox = RegionRects(damage);
+FbBits *shaBase;
+CARD32 *shaLine, *sha;
+FbStride shaStride;
+int scrLine;
+_X_UNUSED int shaBpp, shaXoff, shaYoff;
+int x, y, w, h;
+int i, n;
+CARD32 *win;
+CARD32 off, winStride;
+CARD32 dwords[4];
+
+fbGetDrawable(&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff,
+  shaYoff);
+if (sizeof(FbBits) != sizeof

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:32:19 UTC 2022

Modified Files:
xsrc/external/mit/appres/dist: compile
xsrc/external/mit/listres/dist: compile
Removed Files:
xsrc/external/mit/appres/dist: README
xsrc/external/mit/editres/dist: README
xsrc/external/mit/listres/dist: README

Log Message:
merge appres 1.0.6, editres 1.0.8, and listres 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/appres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/appres/dist/compile
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/editres/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/listres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/listres/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 07:32:19 UTC 2022

Modified Files:
xsrc/external/mit/appres/dist: compile
xsrc/external/mit/listres/dist: compile
Removed Files:
xsrc/external/mit/appres/dist: README
xsrc/external/mit/editres/dist: README
xsrc/external/mit/listres/dist: README

Log Message:
merge appres 1.0.6, editres 1.0.8, and listres 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/appres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/appres/dist/compile
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/editres/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/listres/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/listres/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/appres/dist/compile
diff -u xsrc/external/mit/appres/dist/compile:1.3 xsrc/external/mit/appres/dist/compile:1.4
--- xsrc/external/mit/appres/dist/compile:1.3	Sun Mar 11 07:23:59 2018
+++ xsrc/external/mit/appres/dist/compile	Mon Jul 11 07:32:18 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/listres/dist/compile
diff -u xsrc/external/mit/listres/dist/compile:1.3 xsrc/external/mit/listres/dist/compile:1.4
--- xsrc/external/mit/listres/dist/compile:1.3	Sun Mar 11 07:23:59 2018
+++ xsrc/external/mit/listres/dist/compile	Mon Jul 11 07:32:19 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-s

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:03:31 UTC 2022

Modified Files:
xsrc/external/mit/xclipboard/dist: compile
xsrc/external/mit/xclock/dist: Clock.c
Removed Files:
xsrc/external/mit/bitmap/dist: Dashes Down Excl FlipHoriz FlipVert Fold
Left Right RotateLeft RotateRight Stipple Term Up
xsrc/external/mit/iceauth/dist: README
xsrc/external/mit/xclipboard/dist: README

Log Message:
merge bitmap 1.1.0, iceauth 1.0.9, xclipboard 1.1.4, and xclock 1.1.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bitmap/dist/Dashes \
xsrc/external/mit/bitmap/dist/Down xsrc/external/mit/bitmap/dist/Excl \
xsrc/external/mit/bitmap/dist/FlipHoriz \
xsrc/external/mit/bitmap/dist/FlipVert xsrc/external/mit/bitmap/dist/Fold \
xsrc/external/mit/bitmap/dist/Left xsrc/external/mit/bitmap/dist/Right \
xsrc/external/mit/bitmap/dist/RotateLeft \
xsrc/external/mit/bitmap/dist/RotateRight \
xsrc/external/mit/bitmap/dist/Stipple xsrc/external/mit/bitmap/dist/Term \
xsrc/external/mit/bitmap/dist/Up
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/iceauth/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclipboard/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclipboard/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclock/dist/Clock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:03:31 UTC 2022

Modified Files:
xsrc/external/mit/xclipboard/dist: compile
xsrc/external/mit/xclock/dist: Clock.c
Removed Files:
xsrc/external/mit/bitmap/dist: Dashes Down Excl FlipHoriz FlipVert Fold
Left Right RotateLeft RotateRight Stipple Term Up
xsrc/external/mit/iceauth/dist: README
xsrc/external/mit/xclipboard/dist: README

Log Message:
merge bitmap 1.1.0, iceauth 1.0.9, xclipboard 1.1.4, and xclock 1.1.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bitmap/dist/Dashes \
xsrc/external/mit/bitmap/dist/Down xsrc/external/mit/bitmap/dist/Excl \
xsrc/external/mit/bitmap/dist/FlipHoriz \
xsrc/external/mit/bitmap/dist/FlipVert xsrc/external/mit/bitmap/dist/Fold \
xsrc/external/mit/bitmap/dist/Left xsrc/external/mit/bitmap/dist/Right \
xsrc/external/mit/bitmap/dist/RotateLeft \
xsrc/external/mit/bitmap/dist/RotateRight \
xsrc/external/mit/bitmap/dist/Stipple xsrc/external/mit/bitmap/dist/Term \
xsrc/external/mit/bitmap/dist/Up
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/iceauth/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclipboard/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclipboard/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xclock/dist/Clock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xclipboard/dist/compile
diff -u xsrc/external/mit/xclipboard/dist/compile:1.3 xsrc/external/mit/xclipboard/dist/compile:1.4
--- xsrc/external/mit/xclipboard/dist/compile:1.3	Mon Mar 17 09:20:46 2014
+++ xsrc/external/mit/xclipboard/dist/compile	Mon Jul 11 08:03:31 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/xclock/dist/Clock.c
diff -u xsrc/external/mit/xclock/dist/Clock.c:1.3 xsrc/external/mit/xclock/dist/Clock.c:1.4
--- xsrc/external/mit/xclock/dist/Clock.c:1.3	Mon Jul 15 04:54:47 2019
+++ xsrc/external/mit/xclock/dist/Clock.c	Mon Jul 11 08:03:31 2022
@@ -25,7 +25,6 @@ Except as contained in this notice, the 
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
 All Rights Reserved
@@ -76,9 +75,10 @@ SOFTWARE.
 /* $XFree86: xc/programs/xclock/Clock.c,v 3.25 2003/07/04 16:24:30 eich Exp $ */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
+#define _GNU_SOURCE
 #include 
 #include 
 #include 
@@ -87,6 +87,7 @@ SOFTWARE.
 #include 
 #include 
 #include 
+#include 
 #if !defined(NO_I18N) && defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
 #include 
 #include 
@@ -108,15 +109,14 @@ SOFTWARE.
 #endif
 
 #ifndef NO_I18N
-#include  /* for getenv() */
+#include  /* for getenv() */
 #include 
-extern Boolean no_locale; /* if True, use old (unlocalized) behaviour */
+extern Boolean no_locale;   /* if True, use old (unlocalized) behaviour */
 #e

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:42:43 UTC 2022

Modified Files:
xsrc/external/mit/xfontsel/dist: compile
xsrc/external/mit/xfs/dist/os: connection.c
xsrc/external/mit/xload/dist: compile
xsrc/external/mit/xlsfonts/dist: compile xlsfonts.c
Added Files:
xsrc/external/mit/xedit/dist: compile
Removed Files:
xsrc/external/mit/xdpyinfo/dist: README
xsrc/external/mit/xfontsel/dist: README
xsrc/external/mit/xfs/dist: README
xsrc/external/mit/xload/dist: README
xsrc/external/mit/xlsfonts/dist: README

Log Message:
merge xdpyinfo 1.3.3, xedit 1.2.3, xfontsel 1.1.0, xfs 1.2.1, xload 1.1.4,
and xlsfonts 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xdpyinfo/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xedit/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfontsel/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfontsel/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfs/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfs/dist/os/connection.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xload/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xload/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlsfonts/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlsfonts/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xlsfonts/dist/xlsfonts.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:42:43 UTC 2022

Modified Files:
xsrc/external/mit/xfontsel/dist: compile
xsrc/external/mit/xfs/dist/os: connection.c
xsrc/external/mit/xload/dist: compile
xsrc/external/mit/xlsfonts/dist: compile xlsfonts.c
Added Files:
xsrc/external/mit/xedit/dist: compile
Removed Files:
xsrc/external/mit/xdpyinfo/dist: README
xsrc/external/mit/xfontsel/dist: README
xsrc/external/mit/xfs/dist: README
xsrc/external/mit/xload/dist: README
xsrc/external/mit/xlsfonts/dist: README

Log Message:
merge xdpyinfo 1.3.3, xedit 1.2.3, xfontsel 1.1.0, xfs 1.2.1, xload 1.1.4,
and xlsfonts 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xdpyinfo/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xedit/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfontsel/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfontsel/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfs/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfs/dist/os/connection.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xload/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xload/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlsfonts/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlsfonts/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xlsfonts/dist/xlsfonts.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xfontsel/dist/compile
diff -u xsrc/external/mit/xfontsel/dist/compile:1.3 xsrc/external/mit/xfontsel/dist/compile:1.4
--- xsrc/external/mit/xfontsel/dist/compile:1.3	Sun Mar 11 08:15:23 2018
+++ xsrc/external/mit/xfontsel/dist/compile	Mon Jul 11 08:42:42 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/xfs/dist/os/connection.c
diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.3 xsrc/external/mit/xfs/dist/os/connection.c:1.4
--- xsrc/external/mit/xfs/dist/os/connection.c:1.3	Sun Mar 11 10:08:03 2018
+++ xsrc/external/mit/xfs/dist/os/connection.c	Mon Jul 11 08:42:42 2022
@@ -480,7 +480,7 @@ CloseDownConnection(ClientPtr client)
 /
  * IgnoreClient
  *Removes one client from input masks.
- *Must have cooresponding call to AttendClient.
+ *Must have corresponding call to AttendClient.
  /
 
 static fd_set IgnoredClientsWithInput;

Index: xsrc/external/mit/xload/dist/compile
diff -u xsrc/external/mit/xload/dist/compile:1.4 xsrc/external/mit/xload/dist/compile:1.5
--- xsrc/external/mit/xload/dist/compile:1.4	Sun Mar 11 08:35:14 2018
+++ xsrc/external/mit/xload/dist/compile	Mon Jul 11 08:42:43 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:49:36 UTC 2022

Modified Files:
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xmodmap/dist: handle.c
Removed Files:
xsrc/external/mit/xcmsdb/dist: README
xsrc/external/mit/xconsole/dist: README
xsrc/external/mit/xwud/dist: README

Log Message:
merge xcmsdb 1.0.6, xconsole 1.0.8, xmodmap 1.0.11, and xwud 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcmsdb/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xconsole/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmodmap/dist/handle.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwud/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 08:49:36 UTC 2022

Modified Files:
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xmodmap/dist: handle.c
Removed Files:
xsrc/external/mit/xcmsdb/dist: README
xsrc/external/mit/xconsole/dist: README
xsrc/external/mit/xwud/dist: README

Log Message:
merge xcmsdb 1.0.6, xconsole 1.0.8, xmodmap 1.0.11, and xwud 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcmsdb/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xconsole/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmodmap/dist/handle.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwud/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xconsole/dist/xconsole.c
diff -u xsrc/external/mit/xconsole/dist/xconsole.c:1.5 xsrc/external/mit/xconsole/dist/xconsole.c:1.6
--- xsrc/external/mit/xconsole/dist/xconsole.c:1.5	Mon Mar 17 09:20:46 2014
+++ xsrc/external/mit/xconsole/dist/xconsole.c	Mon Jul 11 08:49:36 2022
@@ -178,7 +178,6 @@ static XrmOptionDescRec options[] = {
 # if defined(TIOCCONS) || defined(SRIOCSREDIR)
 #  define USE_PTY
 static int  tty_fd, pty_fd;
-static char ttydev[64], ptydev[64];
 # endif
 #endif
 
@@ -188,7 +187,7 @@ static char ttydev[64], ptydev[64];
 #endif
 
 #ifdef USE_PTY
-static int get_pty(int *pty, int *tty, char *ttydev, char *ptydev);
+static int get_pty(int *pty, int *tty);
 #endif
 
 #ifdef USE_OSM
@@ -243,7 +242,7 @@ OpenConsole(void)
 #endif
 
 #ifdef USE_PTY
-		if (!input && get_pty (&pty_fd, &tty_fd, ttydev, ptydev) == 0)
+		if (!input && get_pty (&pty_fd, &tty_fd) == 0)
 		{
 # ifdef TIOCCONS
 		int on = 1;
@@ -789,14 +788,17 @@ ScrollLine(Widget w)
  */
 
 static int
-get_pty(int *pty, int *tty, char *ttydev, char *ptydev)
+get_pty(int *pty, int *tty)
 {
 #ifdef HAS_OPENPTY
 	if (openpty(pty, tty, NULL, NULL, NULL) == -1) {
 		return 1;
 	}
 	return 0;
-#elif defined (SVR4) || defined (USE_PTS)
+#else
+	static char ttydev[64], ptydev[64];
+
+#if defined (SVR4) || defined (USE_PTS)
 #if defined (_AIX)
 	if ((*pty = open ("/dev/ptc", O_RDWR)) < 0)
 #else
@@ -823,14 +825,6 @@ get_pty(int *pty, int *tty, char *ttydev
 #else
 	static int devindex, letter = 0;
 
-#ifdef sgi
-	{
-	char *slave;
-	slave = _getpty (pty, O_RDWR, 0622, 0);
-	if ((*tty = open (slave, O_RDWR)) != -1)
-		return 0;
-	}
-#else
 	strcpy (ttydev, "/dev/ttyxx");
 	strcpy (ptydev, "/dev/ptyxx");
 	while (PTYCHAR1[letter]) {
@@ -857,7 +851,6 @@ get_pty(int *pty, int *tty, char *ttydev
 	devindex = 0;
 	(void) letter++;
 	}
-#endif /* sgi else not sgi */
 #endif /* USE_GET_PSEUDOTTY */
 #endif /* SVR4 */
 	/*
@@ -865,6 +858,7 @@ get_pty(int *pty, int *tty, char *ttydev
 	 * condition and let our caller terminate cleanly.
 	 */
 	return(1);
+#endif /* HAS_OPENPTY */
 }
 #endif
 

Index: xsrc/external/mit/xmodmap/dist/handle.c
diff -u xsrc/external/mit/xmodmap/dist/handle.c:1.2 xsrc/external/mit/xmodmap/dist/handle.c:1.3
--- xsrc/external/mit/xmodmap/dist/handle.c:1.2	Sun Jul 19 23:13:49 2015
+++ xsrc/external/mit/xmodmap/dist/handle.c	Mon Jul 11 08:49:36 2022
@@ -37,6 +37,7 @@ from The Open Group.
 #include "xmodmap.h"
 #include "wq.h"
 #include 
+#include 
 
 #ifdef HAVE_STRNCASECMP
 #include 
@@ -59,6 +60,26 @@ struct wq work_queue = {NULL, NULL};
  * common utility routines
  */
 
+/*
+ * This is a combination of reallocf() and reallocarray().
+ * If the realloc fails, it frees the old pointer so it doesn't leak.
+ */
+static void *
+reallocfarray(void *old, size_t num, size_t size)
+{
+static void *new;
+
+if (size > 0 && num > (SIZE_MAX / size)) /* overflow would happen */
+new = NULL;
+else
+new = realloc(old, num * size);
+
+if (new == NULL)
+free(old);
+
+return new;
+}
+
 static KeyCode *
 KeysymToKeycodes(Display *dpy, KeySym keysym, int *pnum_kcs)
 {
@@ -72,7 +93,12 @@ KeysymToKeycodes(Display *dpy, KeySym ke
 		if (!kcs)
 		kcs = malloc(sizeof(KeyCode));
 		else
-		kcs = realloc(kcs, sizeof(KeyCode) * (*pnum_kcs + 1));
+		kcs = reallocfarray(kcs, (*pnum_kcs + 1), sizeof(KeyCode));
+		if (!kcs) {
+		fprintf(stderr, "attempt to allocate %ld byte keycode set",
+			(long) ((*pnum_kcs + 1) * sizeof (KeyCode)));
+		return NULL;
+		}
 		kcs[*pnum_kcs] = i;
 		*pnum_kcs += 1;
 		break;
@@ -690,7 +716,7 @@ do_remove(char *line, int len)
 	}
 	if (nc + num_kcs > tot) {
 	tot = nc + num_kcs;
-	kclist = realloc(kclist, tot * sizeof(KeyCode));
+	kclist = reallocfarray(kclist, tot, sizeof(KeyCode));
 	if (!kclist) {
 		badmsg ("attempt to allocate %ld byte keycode list",
 			(long) (tot * sizeof (KeyCode)));
@@ -708,6 +734,7 @@ do_remove(char *line, int len)
 if (!uop) {
 	badmsg ("attempt to allocat

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 09:13:32 UTC 2022

Modified Files:
xsrc/external/mit/mkfontscale/dist: mkfontscale.c
xsrc/external/mit/twm/dist/man: twm.man
xsrc/external/mit/twm/dist/src: util.c util.h
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xdm/dist: compile
xsrc/external/mit/xdm/dist/greeter: Login.c
xsrc/external/mit/xdm/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/xdm/dist/man: xdm.man
xsrc/external/mit/xdm/dist/xdm: dm.c
Removed Files:
xsrc/external/mit/twm/dist: README
xsrc/external/mit/xauth/dist/tests: test_xauth.c

Log Message:
merge mkfontscale 1.2.2, twm 1.0.12, xauth 1.1.2, and xdm 1.1.13.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/twm/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/twm/dist/man/twm.man
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/twm/dist/src/util.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/twm/dist/src/util.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xauth/dist/tests/test_xauth.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/compile
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/greeter/Login.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdm/dist/m4/libtool.m4 \
xsrc/external/mit/xdm/dist/m4/ltoptions.m4 \
xsrc/external/mit/xdm/dist/m4/ltsugar.m4 \
xsrc/external/mit/xdm/dist/m4/ltversion.m4 \
xsrc/external/mit/xdm/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/man/xdm.man
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/xdm/dm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:26:45 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: libdrm_lists.h xf86drm.c xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/xterm/dist: fontutils.c graphics_sixel.c linedata.c
misc.c ptyx.h resize.c scrollback.c xterm.h xterm.man
Removed Files:
xsrc/external/mit/libdrm/dist/libkms: Android.mk Makefile.sources api.c
dumb.c exynos.c intel.c internal.h kms-symbols.txt libkms.h
libkms.pc.in linux.c meson.build nouveau.c radeon.c vmwgfx.c
xsrc/external/mit/libdrm/dist/tests/kms: kms-steal-crtc.c
kms-universal-planes.c libkms-test-crtc.c libkms-test-device.c
libkms-test-framebuffer.c libkms-test-plane.c libkms-test-screen.c
libkms-test.h meson.build
xsrc/external/mit/libdrm/dist/tests/kmstest: main.c meson.build

Log Message:
merge libdrm 2.4.112, and xterm-372.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/libdrm_lists.h
cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/Android.mk
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/libkms/Makefile.sources \
xsrc/external/mit/libdrm/dist/libkms/kms-symbols.txt
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/libkms/api.c \
xsrc/external/mit/libdrm/dist/libkms/intel.c \
xsrc/external/mit/libdrm/dist/libkms/meson.build \
xsrc/external/mit/libdrm/dist/libkms/nouveau.c \
xsrc/external/mit/libdrm/dist/libkms/vmwgfx.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/libkms/dumb.c \
xsrc/external/mit/libdrm/dist/libkms/internal.h \
xsrc/external/mit/libdrm/dist/libkms/radeon.c
cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/libdrm/dist/libkms/exynos.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/libkms.h \
xsrc/external/mit/libdrm/dist/libkms/libkms.pc.in
cvs rdiff -u -r1.1.1.8 -r0 xsrc/external/mit/libdrm/dist/libkms/linux.c
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-steal-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-plane.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-screen.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-universal-planes.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-device.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-framebuffer.c \
xsrc/external/mit/libdrm/dist/tests/kms/meson.build
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test.h
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/tests/kmstest/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kmstest/meson.build
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/graphics_sixel.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/scrollback.c \
xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/dist/xterm.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 11 19:26:45 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: libdrm_lists.h xf86drm.c xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/xterm/dist: fontutils.c graphics_sixel.c linedata.c
misc.c ptyx.h resize.c scrollback.c xterm.h xterm.man
Removed Files:
xsrc/external/mit/libdrm/dist/libkms: Android.mk Makefile.sources api.c
dumb.c exynos.c intel.c internal.h kms-symbols.txt libkms.h
libkms.pc.in linux.c meson.build nouveau.c radeon.c vmwgfx.c
xsrc/external/mit/libdrm/dist/tests/kms: kms-steal-crtc.c
kms-universal-planes.c libkms-test-crtc.c libkms-test-device.c
libkms-test-framebuffer.c libkms-test-plane.c libkms-test-screen.c
libkms-test.h meson.build
xsrc/external/mit/libdrm/dist/tests/kmstest: main.c meson.build

Log Message:
merge libdrm 2.4.112, and xterm-372.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/libdrm_lists.h
cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/Android.mk
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/libkms/Makefile.sources \
xsrc/external/mit/libdrm/dist/libkms/kms-symbols.txt
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/libkms/api.c \
xsrc/external/mit/libdrm/dist/libkms/intel.c \
xsrc/external/mit/libdrm/dist/libkms/meson.build \
xsrc/external/mit/libdrm/dist/libkms/nouveau.c \
xsrc/external/mit/libdrm/dist/libkms/vmwgfx.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/libkms/dumb.c \
xsrc/external/mit/libdrm/dist/libkms/internal.h \
xsrc/external/mit/libdrm/dist/libkms/radeon.c
cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/libdrm/dist/libkms/exynos.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/libkms/libkms.h \
xsrc/external/mit/libdrm/dist/libkms/libkms.pc.in
cvs rdiff -u -r1.1.1.8 -r0 xsrc/external/mit/libdrm/dist/libkms/linux.c
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-steal-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-plane.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-screen.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/kms-universal-planes.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-crtc.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-device.c \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test-framebuffer.c \
xsrc/external/mit/libdrm/dist/tests/kms/meson.build
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/kms/libkms-test.h
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/tests/kmstest/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libdrm/dist/tests/kmstest/meson.build
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/graphics_sixel.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/scrollback.c \
xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/dist/xterm.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/libdrm_lists.h
diff -u xsrc/external/mit/libdrm/dist/libdrm_lists.h:1.2 xsrc/external/mit/libdrm/dist/libdrm_lists.h:1.3
--- xsrc/external/mit/libdrm/dist/libdrm_lists.h:1.2	Sun Jan 21 21:48:54 2018
+++ xsrc/external/mit/libdrm/dist/libdrm_lists.h	Mon Jul 11 19:26:44 2022
@@ -97,18 +97,18 @@ typedef struct _drmMMListHead
 
 #define DRMLISTFOREACHENTRY(__item, __list, __head)\
 	for ((__item) = DRMLISTENTRY(__typeof__(*__item), (__list)->next, __head); \
-	 &(__item)->__head != (__list);\
+	 &(__item)->__head != (__list);\
 	 (__item) = DRMLISTENTRY(__typeof__(*__item),  \
- (__item)->__head.next, __head))
+	 (__item)->__head.next, __head))
 
 #define DRMLISTFOREACHENTRYSAFE(__item, __temp, __list, _

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul 12 01:11:37 UTC 2022

Modified Files:
xsrc/external/mit/xf86-video-cirrus/dist/src: alp_driver.c lg_driver.c
xsrc/external/mit/xf86-video-mach64/dist/src: atimach64render.c
atipreinit.c ativalid.c
xsrc/external/mit/xf86-video-mga/dist/src: mga_bios.c mga_dac3026.c
mga_dacG.c mga_dh.c mga_dri.c mga_driver.c mga_exa.c mga_merge.c
mga_vga.c
Removed Files:
xsrc/external/mit/xf86-input-keyboard/dist: README
xsrc/external/mit/xf86-input-keyboard/dist/src: lnx_KbdMap.c lnx_kbd.c
lnx_kbd.h
xsrc/external/mit/xf86-video-cirrus/dist: README

Log Message:
xf86-input-keyboard 2.0.0, xf86-video-cirrus 1.6.0, xf86-video-mach64 6.9.7,
and xf86-video-mga 2.0.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-input-keyboard/dist/README
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_KbdMap.c
cvs rdiff -u -r1.1.1.5 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-cirrus/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c \
xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul 12 01:11:37 UTC 2022

Modified Files:
xsrc/external/mit/xf86-video-cirrus/dist/src: alp_driver.c lg_driver.c
xsrc/external/mit/xf86-video-mach64/dist/src: atimach64render.c
atipreinit.c ativalid.c
xsrc/external/mit/xf86-video-mga/dist/src: mga_bios.c mga_dac3026.c
mga_dacG.c mga_dh.c mga_dri.c mga_driver.c mga_exa.c mga_merge.c
mga_vga.c
Removed Files:
xsrc/external/mit/xf86-input-keyboard/dist: README
xsrc/external/mit/xf86-input-keyboard/dist/src: lnx_KbdMap.c lnx_kbd.c
lnx_kbd.h
xsrc/external/mit/xf86-video-cirrus/dist: README

Log Message:
xf86-input-keyboard 2.0.0, xf86-video-cirrus 1.6.0, xf86-video-mach64 6.9.7,
and xf86-video-mga 2.0.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-input-keyboard/dist/README
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_KbdMap.c
cvs rdiff -u -r1.1.1.5 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-cirrus/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c \
xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c
diff -u xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c:1.2 xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c:1.3
--- xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c:1.2	Sat Aug 20 05:00:58 2016
+++ xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c	Tue Jul 12 01:11:37 2022
@@ -5,7 +5,7 @@
  * Support for the CL-GD7548: David Monniaux
  *
  * This is mainly a cut & paste from the MGA driver.
- * Original autors and contributors list include:
+ * Original authors and contributors list include:
  *Radoslaw Kapitan, Andrew Vanderstock, Dirk Hohndel,
  *David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
  *Guy DESBIEF
@@ -159,8 +159,6 @@ static int gd7556_MaxClocks[] = {  80100
 #define ALP_MINOR_VERSION 0
 #define ALP_PATCHLEVEL 0
 
-static MODULESETUPPROTO(alpSetup);
-
 static XF86ModuleVersionInfo alpVersRec =
 {
 	"cirrus_alpine",
@@ -181,20 +179,10 @@ static XF86ModuleVersionInfo alpVersRec 
  */
 _X_EXPORT XF86ModuleData cirrus_alpineModuleData = {
 &alpVersRec,
-alpSetup,
+NULL,
 NULL
 };
 
-static pointer
-alpSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
-	static Bool setupDone = FALSE;
-	if (!setupDone) {
-		setupDone = TRUE;
-	}
-	return (pointer)1;
-}
-
 #endif /* XFree86LOADER */
 
 _X_EXPORT const OptionInfoRec *
@@ -551,11 +539,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
 	depth_flags |= Support32bppFb |
 			   SupportConvert32to24 |
 			   PreferConvert32to24;
+
 	/*
 	 * The first thing we should figure out is the depth, bpp, etc.
 	 * We support both 24bpp and 32bpp layouts, so indicate that.
 	 */
-	if (!xf86SetDepthBpp(pScrn, 0, 0, 24, depth_flags)) {
+	if (!xf86SetDepthBpp(pScrn, 0, 0, 16, depth_flags)) {
 		return FALSE;
 	} else {
 		/* Check that the returned depth is one we support */
@@ -774,6 +763,16 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  else
  	xf86SetDDCproperties(pScrn,xf86PrintEDID(
 		 xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pCir->I2CPtr1)));
+
+#ifdef XSERVER_LIBPCIACCESS
+ #ifndef PCI_CHIP_QEMU
+ #define PCI_CHIP_QEMU 0x1af4
+ #endif
+ if (!pScrn->monitor->DDC &&
+	((pCir->PciInfo->subvendor_id & 0x) == PCI_CHIP_QEMU)) {
+	pCir->NoAccel = TRUE;
+ }
+#endif
  
  /* Probe the possible LCD display */
  AlpProbeLCD(pScrn);

Index: xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
diff -u xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.8 xsrc/external/m

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul 12 01:13:15 UTC 2022

Modified Files:
xsrc/external/mit/xdpyinfo/include: config.h
xsrc/external/mit/xfs/include: config.h

Log Message:
updates for xfs 1.2.1, and xdpyinfo 1.3.3


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdpyinfo/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfs/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul 12 01:13:15 UTC 2022

Modified Files:
xsrc/external/mit/xdpyinfo/include: config.h
xsrc/external/mit/xfs/include: config.h

Log Message:
updates for xfs 1.2.1, and xdpyinfo 1.3.3


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdpyinfo/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfs/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdpyinfo/include/config.h
diff -u xsrc/external/mit/xdpyinfo/include/config.h:1.2 xsrc/external/mit/xdpyinfo/include/config.h:1.3
--- xsrc/external/mit/xdpyinfo/include/config.h:1.2	Fri Dec 28 22:18:12 2018
+++ xsrc/external/mit/xdpyinfo/include/config.h	Tue Jul 12 01:13:15 2022
@@ -4,12 +4,12 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define to 1 if you have the  header file. */
-#define HAVE_MEMORY_H 1
-
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDINT_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDIO_H 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDLIB_H 1
 
@@ -115,7 +115,9 @@
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 2
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
 /* Version number of package */

Index: xsrc/external/mit/xfs/include/config.h
diff -u xsrc/external/mit/xfs/include/config.h:1.4 xsrc/external/mit/xfs/include/config.h:1.5
--- xsrc/external/mit/xfs/include/config.h:1.4	Sun Mar 11 10:08:03 2018
+++ xsrc/external/mit/xfs/include/config.h	Tue Jul 12 01:13:15 2022
@@ -16,8 +16,8 @@
 /* Define to 1 if you have the `ws2_32' library (-lws2_32). */
 /* #undef HAVE_LIBWS2_32 */
 
-/* Define to 1 if you have the  header file. */
-#define HAVE_MEMORY_H 1
+/* Define to 1 if you have the  header file. */
+#undef HAVE_MINIX_CONFIG_H
 
 /* Define to 1 if the system has the type `socklen_t'. */
 #define HAVE_SOCKLEN_T 1
@@ -25,15 +25,24 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDINT_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDIO_H 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -43,6 +52,9 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_WCHAR_H 1
+
 /* Support IPv6 for TCP connections */
 #ifndef __NetBSD__	/* Defined by the build */
 # define IPv6 1
@@ -81,7 +93,9 @@
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
 /* Support TCP socket connections */
@@ -97,21 +111,87 @@
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
 #endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
-/* Enable threading extensions on Solaris.  */
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul 12 01:26:29 UTC 2022

Modified Files:
xsrc/external/mit/libXcursor/include: config.h
xsrc/external/mit/xdpyinfo/include: config.h
xsrc/external/mit/xfs/include: config.h

Log Message:
more updates for xfs 1.2.1, xdpyinfo 1.3.3, and libXcursor 1.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXcursor/include/config.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdpyinfo/include/config.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xfs/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXcursor/include/config.h
diff -u xsrc/external/mit/libXcursor/include/config.h:1.5 xsrc/external/mit/libXcursor/include/config.h:1.6
--- xsrc/external/mit/libXcursor/include/config.h:1.5	Mon Mar 11 06:37:19 2019
+++ xsrc/external/mit/libXcursor/include/config.h	Tue Jul 12 01:26:29 2022
@@ -7,12 +7,12 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define to 1 if you have the  header file. */
-#define HAVE_MEMORY_H 1
-
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDINT_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDIO_H 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDLIB_H 1
 
@@ -48,7 +48,7 @@
 #define PACKAGE_NAME "libXcursor"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libXcursor 1.2.0"
+#define PACKAGE_STRING "libXcursor 1.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libXcursor"
@@ -57,7 +57,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.0"
+#define PACKAGE_VERSION "1.2.1"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -66,10 +66,12 @@
 #define PACKAGE_VERSION_MINOR 2
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 20
+#define PACKAGE_VERSION_PATCHLEVEL 1
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"

Index: xsrc/external/mit/xdpyinfo/include/config.h
diff -u xsrc/external/mit/xdpyinfo/include/config.h:1.3 xsrc/external/mit/xdpyinfo/include/config.h:1.4
--- xsrc/external/mit/xdpyinfo/include/config.h:1.3	Tue Jul 12 01:13:15 2022
+++ xsrc/external/mit/xdpyinfo/include/config.h	Tue Jul 12 01:26:29 2022
@@ -95,7 +95,7 @@
 #define PACKAGE_NAME "xdpyinfo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xdpyinfo 1.3.2"
+#define PACKAGE_STRING "xdpyinfo 1.3.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xdpyinfo"
@@ -104,7 +104,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.2"
+#define PACKAGE_VERSION "1.3.3"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -113,7 +113,7 @@
 #define PACKAGE_VERSION_MINOR 3
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 2
+#define PACKAGE_VERSION_PATCHLEVEL 3
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
@@ -121,4 +121,4 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.3.2"
+#define VERSION "1.3.3"

Index: xsrc/external/mit/xfs/include/config.h
diff -u xsrc/external/mit/xfs/include/config.h:1.5 xsrc/external/mit/xfs/include/config.h:1.6
--- xsrc/external/mit/xfs/include/config.h:1.5	Tue Jul 12 01:13:15 2022
+++ xsrc/external/mit/xfs/include/config.h	Tue Jul 12 01:26:29 2022
@@ -73,7 +73,7 @@
 #define PACKAGE_NAME "xfs"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xfs 1.2.0"
+#define PACKAGE_STRING "xfs 1.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xfs"
@@ -82,7 +82,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.0"
+#define PACKAGE_VERSION "1.2.1"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -91,7 +91,7 @@
 #define PACKAGE_VERSION_MINOR 2
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
@@ -196,7 +196,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"
 
 /* Build support for 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul 12 01:26:29 UTC 2022

Modified Files:
xsrc/external/mit/libXcursor/include: config.h
xsrc/external/mit/xdpyinfo/include: config.h
xsrc/external/mit/xfs/include: config.h

Log Message:
more updates for xfs 1.2.1, xdpyinfo 1.3.3, and libXcursor 1.2.1.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXcursor/include/config.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xdpyinfo/include/config.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xfs/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 13 19:02:09 UTC 2022

Modified Files:
xsrc/external/mit/xmag/dist: xmag.c
xsrc/external/mit/xmessage/dist: compile
Removed Files:
xsrc/external/mit/xkbutils/dist: README
xsrc/external/mit/xmag/dist: README
xsrc/external/mit/xrefresh/dist: README

Log Message:
merge xkbutils 1.0.5, xmag 1.0.7, xmessage 1.0.6, and xrefresh 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbutils/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmag/dist/README
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmag/dist/xmag.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmessage/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xrefresh/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 13 19:02:09 UTC 2022

Modified Files:
xsrc/external/mit/xmag/dist: xmag.c
xsrc/external/mit/xmessage/dist: compile
Removed Files:
xsrc/external/mit/xkbutils/dist: README
xsrc/external/mit/xmag/dist: README
xsrc/external/mit/xrefresh/dist: README

Log Message:
merge xkbutils 1.0.5, xmag 1.0.7, xmessage 1.0.6, and xrefresh 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbutils/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmag/dist/README
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmag/dist/xmag.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmessage/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xrefresh/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xmag/dist/xmag.c
diff -u xsrc/external/mit/xmag/dist/xmag.c:1.2 xsrc/external/mit/xmag/dist/xmag.c:1.3
--- xsrc/external/mit/xmag/dist/xmag.c:1.2	Mon Jul 20 23:49:02 2015
+++ xsrc/external/mit/xmag/dist/xmag.c	Wed Jul 13 19:02:09 2022
@@ -534,7 +534,7 @@ SelectCB(Widget w, XtPointer clientData,
 
 
 /*
- * PasteCB() -- Paste from the primary selectin into xmag.
+ * PasteCB() -- Paste from the primary selection into xmag.
  */
 static void			/* ARGSUSED */
 PasteCB(Widget w, XtPointer clientData, XtPointer callData)

Index: xsrc/external/mit/xmessage/dist/compile
diff -u xsrc/external/mit/xmessage/dist/compile:1.3 xsrc/external/mit/xmessage/dist/compile:1.4
--- xsrc/external/mit/xmessage/dist/compile:1.3	Sun Mar 11 08:35:14 2018
+++ xsrc/external/mit/xmessage/dist/compile	Wed Jul 13 19:02:09 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 04:13:16 UTC 2022

Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: compat-api.h radeon.h
xsrc/external/mit/xf86-video-ati/dist/src: radeon_modes.c
xsrc/external/mit/xf86-video-intel-2014/dist/src: compat-api.h
xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa: intel_driver.c
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_accel.c
sna_video.h
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_driver.c
xsrc/external/mit/xf86-video-nouveau/dist/src: compat-api.h
xsrc/external/mit/xf86-video-s3/dist/src: s3.h
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h

Log Message:
various updates to build against xorg-server 21.1.3.

- avoid a const issue with an expanded __UNCONST().
- cope with renamed member names
- deal with "xf86RamDac.h" going away (now use "xf86Cursor.h")


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-s3/dist/src/s3.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 04:13:16 UTC 2022

Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: compat-api.h radeon.h
xsrc/external/mit/xf86-video-ati/dist/src: radeon_modes.c
xsrc/external/mit/xf86-video-intel-2014/dist/src: compat-api.h
xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa: intel_driver.c
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_accel.c
sna_video.h
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_driver.c
xsrc/external/mit/xf86-video-nouveau/dist/src: compat-api.h
xsrc/external/mit/xf86-video-s3/dist/src: s3.h
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h

Log Message:
various updates to build against xorg-server 21.1.3.

- avoid a const issue with an expanded __UNCONST().
- cope with renamed member names
- deal with "xf86RamDac.h" going away (now use "xf86Cursor.h")


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-s3/dist/src/s3.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h:1.1.1.5 xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h:1.1.1.5	Sun Mar 11 19:42:43 2018
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h	Fri Jul 15 04:13:15 2022
@@ -34,4 +34,10 @@
 #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
 #endif
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(25, 2)
+#define current_master current_primary
+#define master_pixmap primary_pixmap
+#define slave_dst secondary_dst
+#endif
+
 #endif

Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.2 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.3
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.2	Sun Mar  8 18:27:51 2020
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h	Fri Jul 15 04:13:15 2022
@@ -190,6 +190,10 @@ radeon_master_screen(ScreenPtr screen)
 return screen;
 }
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 25
+#define slave_dst secondary_dst
+#define master_pixmap primary_pixmap
+#endif
 static inline ScreenPtr
 radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
 {

Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.3	Thu Jan 31 20:41:37 2019
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c	Fri Jul 15 04:13:15 2022
@@ -146,7 +146,11 @@ static DisplayModePtr RADEONFPNativeMode
 	new = xnfcalloc(1, sizeof (DisplayModeRec));
 	sprintf(stmp, "%dx%d", native_mode->PanelXRes, native_mode->PanelYRes);
 	new->name   = xnfalloc(strlen(stmp) + 1);
-	strcpy(new->name, stmp);
+	/*
+	 * XXX - expanded __UNCONST() version, new->name became const in
+	 * xorg-server 21.*
+	 */
+	strcpy((void *)(unsigned long)(const void *)new->name, stmp);
 	new->HDisplay   = native_mode->PanelXRes;
 	new->VDisplay   = native_mode->PanelYRes;
 

Index: xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h:1.1.1.1 xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h:1.1.1.1	Fri May 10 06:22:22 2019
+++ xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h	Fri Jul 15 04:13:15 2022
@@ -236,4 +236,10 @@ static inline void FreePixmap(PixmapPtr 
 			  dstx, dsty)
 #endif
 
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#define current_primary current_master
+#define primary_pixmap master_pixmap
+#define secondary_dst slave_dst
+#endif
+
 #endif

Index: xsrc/ex

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 04:30:06 UTC 2022

Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e.h
xsrc/external/mit/xf86-video-crime/dist/src: crime.h
xsrc/external/mit/xf86-video-glint/dist/src: glint.h
xsrc/external/mit/xf86-video-igs/dist/src: igs.h
xsrc/external/mit/xf86-video-mgx/dist/src: mgx.h
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz.h
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h
xsrc/external/mit/xf86-video-tga/dist/src: tga.h
xsrc/external/mit/xf86-video-trident/dist/src: trident.h

Log Message:
more xf86RamDac.h vs xf86Cursor.h.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-crime/dist/src/crime.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-glint/dist/src/glint.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-igs/dist/src/igs.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xf86-video-tga/dist/src/tga.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-trident/dist/src/trident.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul 15 04:30:06 UTC 2022

Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e.h
xsrc/external/mit/xf86-video-crime/dist/src: crime.h
xsrc/external/mit/xf86-video-glint/dist/src: glint.h
xsrc/external/mit/xf86-video-igs/dist/src: igs.h
xsrc/external/mit/xf86-video-mgx/dist/src: mgx.h
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz.h
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h
xsrc/external/mit/xf86-video-tga/dist/src: tga.h
xsrc/external/mit/xf86-video-trident/dist/src: trident.h

Log Message:
more xf86RamDac.h vs xf86Cursor.h.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-crime/dist/src/crime.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-glint/dist/src/glint.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-igs/dist/src/igs.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xf86-video-tga/dist/src/tga.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-trident/dist/src/trident.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h
diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.3 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.4
--- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.3	Mon May 23 19:53:36 2011
+++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h	Fri Jul 15 04:30:05 2022
@@ -27,7 +27,11 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) 
+#include "xf86RamDac.h" 
+#else  
+#include "xf86Cursor.h"  
+#endif
 #include "Xmd.h"
 #include "gcstruct.h"
 #include "ag10e_regs.h"

Index: xsrc/external/mit/xf86-video-crime/dist/src/crime.h
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.7 xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.8
--- xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.7	Tue Sep 29 20:41:21 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime.h	Fri Jul 15 04:30:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: crime.h,v 1.7 2009/09/29 20:41:21 macallan Exp $ */
+/* $NetBSD: crime.h,v 1.8 2022/07/15 04:30:05 mrg Exp $ */
 /*
  * Copyright (c) 2008 Michael Lorenz
  * All rights reserved.
@@ -38,7 +38,11 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) 
+#include "xf86RamDac.h" 
+#else  
+#include "xf86Cursor.h"  
+#endif
 #include "xaa.h"
 
 #ifndef CRIME_H

Index: xsrc/external/mit/xf86-video-glint/dist/src/glint.h
diff -u xsrc/external/mit/xf86-video-glint/dist/src/glint.h:1.4 xsrc/external/mit/xf86-video-glint/dist/src/glint.h:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/glint.h:1.4	Fri Dec 23 06:52:17 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/glint.h	Fri Jul 15 04:30:05 2022
@@ -41,7 +41,11 @@
 #include "exa.h"
 
 #include "xf86fbman.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) 
+#include "xf86RamDac.h" 
+#else  
+#include "xf86Cursor.h"  
+#endif
 #include "xf86cmap.h"
 #include "xf86i2c.h"
 #include "xf86DDC.h"

Index: xsrc/external/mit/xf86-video-igs/dist/src/igs.h
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.7 xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.8
--- xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.7	Thu Aug 18 09:32:26 2016
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs.h	Fri Jul 15 04:30:05 2022
@@ -1,5 +1,5 @@
 /* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */
-/* $NetBSD: igs.h,v 1.7 2016/08/18 09:32:26 mrg Exp $ */
+/* $NetBSD: igs.h,v 1.8 2022/07/15 04:30:05 mrg Exp $ */
 /*
  * Copyright (c) 2001 Matthieu Herrb
  *		 2009 Michael Lorenz
@@ -49,7 +49,11 @@
 #include "xf86_OSproc.h"
 #include "compiler.h"
 
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) 
+#include "xf86RamDac.h" 
+#else  
+#include "xf86Cursor.h"  
+#endif
 #include "exa.h"
 
 #ifn

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Sep 11 05:47:47 UTC 2022

Modified Files:
xsrc/external/mit/oclock/dist: compile
xsrc/external/mit/xmh/dist: compile
Removed Files:
xsrc/external/mit/fslsfonts/dist: README
xsrc/external/mit/ico/dist: README
xsrc/external/mit/oclock/dist: README
xsrc/external/mit/showfont/dist: README
xsrc/external/mit/xmh/dist: README

Log Message:
merge fslsfonts-1.0.6, ico-1.0.6, oclock-1.0.5, showfont-1.0.6, and xmh-1.0.4


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/fslsfonts/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/ico/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/oclock/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/oclock/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/showfont/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmh/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmh/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Sep 11 05:47:47 UTC 2022

Modified Files:
xsrc/external/mit/oclock/dist: compile
xsrc/external/mit/xmh/dist: compile
Removed Files:
xsrc/external/mit/fslsfonts/dist: README
xsrc/external/mit/ico/dist: README
xsrc/external/mit/oclock/dist: README
xsrc/external/mit/showfont/dist: README
xsrc/external/mit/xmh/dist: README

Log Message:
merge fslsfonts-1.0.6, ico-1.0.6, oclock-1.0.5, showfont-1.0.6, and xmh-1.0.4


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/fslsfonts/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/ico/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/oclock/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/oclock/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/showfont/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmh/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmh/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/oclock/dist/compile
diff -u xsrc/external/mit/oclock/dist/compile:1.3 xsrc/external/mit/oclock/dist/compile:1.4
--- xsrc/external/mit/oclock/dist/compile:1.3	Sun Mar 11 08:02:46 2018
+++ xsrc/external/mit/oclock/dist/compile	Sun Sep 11 05:47:47 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/xmh/dist/compile
diff -u xsrc/external/mit/xmh/dist/compile:1.3 xsrc/external/mit/xmh/dist/compile:1.4
--- xsrc/external/mit/xmh/dist/compile:1.3	Sun Jul 19 23:04:04 2015
+++ xsrc/external/mit/xmh/dist/compile	Sun Sep 11 05:47:47 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esa

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:23:26 UTC 2022

Modified Files:
xsrc/external/mit/libXtst/dist/man: XTestQueryExtension.man
xsrc/external/mit/libXtst/dist/src: XRecord.c XTest.c
xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c
Removed Files:
xsrc/external/mit/libXtst/dist: README
xsrc/external/mit/libXxf86vm/dist: README

Log Message:
merge libXtst-1.2.4 and libXxf86vm-1.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libXtst/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXtst/dist/src/XRecord.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXtst/dist/src/XTest.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXxf86vm/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
diff -u xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man:1.6 xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man:1.7
--- xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man:1.6	Tue Oct  4 22:01:49 2016
+++ xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man	Tue Sep 27 18:23:26 2022
@@ -1,7 +1,7 @@
 '\" t
 .\" Title: XTest
 .\"Author: Kieron Drake
-.\" Generator: DocBook XSL Stylesheets v1.78.1 
+.\" Generator: DocBook XSL Stylesheets vsnapshot_9276 
 .\"  Date: 6 June 2007
 .\"Manual: XTST FUNCTIONS
 .\"Source: __xorgversion__

Index: xsrc/external/mit/libXtst/dist/src/XRecord.c
diff -u xsrc/external/mit/libXtst/dist/src/XRecord.c:1.6 xsrc/external/mit/libXtst/dist/src/XRecord.c:1.7
--- xsrc/external/mit/libXtst/dist/src/XRecord.c:1.6	Fri Oct  7 16:05:13 2016
+++ xsrc/external/mit/libXtst/dist/src/XRecord.c	Tue Sep 27 18:23:26 2022
@@ -166,7 +166,7 @@ static XPointer alloc_mem_cache(void)
 struct mem_cache_str *cache;
 
 /* note that an error will go unnoticed */
-cache = (struct mem_cache_str *) Xmalloc(sizeof(struct mem_cache_str));
+cache = Xmalloc(sizeof(struct mem_cache_str));
 if (cache) {
 	cache->display_closed = False;
 	cache->inter_data = NULL;
@@ -317,7 +317,7 @@ XRecordCreateContext(Display *dpy, int d
 XRecordRange *
 XRecordAllocRange(void)
 {
-return (XRecordRange*)Xcalloc(1, sizeof(XRecordRange));
+return Xcalloc(1, sizeof(XRecordRange));
 }
 
 Status
@@ -409,7 +409,7 @@ XRecordGetContext(Display *dpy, XRecordC
 XExtDisplayInfo 	*info = find_display (dpy);
 register 		xRecordGetContextReq   	*req;
 xRecordGetContextReply 	rep;
-unsigned int	count, i, rn;
+unsigned int	count;
 xRecordRange   	xrange;
 xRecordClientInfo   xclient_inf;
 XRecordState	*ret;
@@ -427,7 +427,7 @@ XRecordGetContext(Display *dpy, XRecordC
 }
 count = rep.nClients;
 
-ret = (XRecordState*)Xmalloc(sizeof(XRecordState));
+ret = Xmalloc(sizeof(XRecordState));
 if (!ret) {
 	_XEatDataWords (dpy, rep.length);
 	UnlockDisplay(dpy);
@@ -459,7 +459,7 @@ XRecordGetContext(Display *dpy, XRecordC
 	   SyncHandle();
 	   return 0;
 }
-for(i = 0; i < count; i++)
+for (unsigned int i = 0; i < count; i++)
 {
 	client_inf[i] = &(client_inf_str[i]);
 _XRead(dpy, (char *)&xclient_inf, (long)sizeof(xRecordClientInfo));
@@ -487,7 +487,7 @@ XRecordGetContext(Display *dpy, XRecordC
 		SyncHandle();
 		return 0;
 		}
-		for (rn=0; rnnclients; i++) {
+for (unsigned long i = 0; i < state->nclients; i++) {
 	if (state->client_info[i]->ranges) {
 	if (state->client_info[i]->ranges[0])
 		Xfree(state->client_info[i]->ranges[0]);
@@ -560,10 +558,10 @@ static struct reply_buffer *alloc_reply_
 /*
  * nothing available; malloc a new struct
  */
-rbp = (struct reply_buffer *)Xmalloc(sizeof(struct reply_buffer));
+rbp = Xmalloc(sizeof(struct reply_buffer));
 if (!rbp)
 	return NULL;
-rbp->buf = (unsigned char *)Xmalloc(nbytes);
+rbp->buf = Xmalloc(nbytes);
 if (!rbp->buf) {
 	Xfree(rbp);
 	return NULL;
@@ -587,7 +585,7 @@ static XRecordInterceptData *alloc_inter
 	return &iq->data;
 }
 /* allocate a new one */
-iq = (struct intercept_queue *)Xmalloc(sizeof(struct intercept_queue));
+iq = Xmalloc(sizeof(struct intercept_queue));
 if (!iq)
 	return NULL;
 iq->cache = cache;
@@ -727,14 +725,13 @@ parse_reply_call_callback(
 XRecordInterceptProc callback,
 XPointer		 closure)
 {
-int current_index;
+unsigned int current_index;
 int datum_bytes = 0;
-XRecordInterceptData *data;
 
 /* call the callback for each protocol element in the reply */
 current_index = 0;
 do {
-	data = alloc_inter_data(info);
+	XRecordInterc

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:23:26 UTC 2022

Modified Files:
xsrc/external/mit/libXtst/dist/man: XTestQueryExtension.man
xsrc/external/mit/libXtst/dist/src: XRecord.c XTest.c
xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c
Removed Files:
xsrc/external/mit/libXtst/dist: README
xsrc/external/mit/libXxf86vm/dist: README

Log Message:
merge libXtst-1.2.4 and libXxf86vm-1.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libXtst/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXtst/dist/src/XRecord.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXtst/dist/src/XTest.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXxf86vm/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Oct 16 22:48:18 UTC 2022

Modified Files:
xsrc/external/mit/fstobdf/dist: fstobdf.c
Removed Files:
xsrc/external/mit/bdftopcf/dist: README stubs.h
xsrc/external/mit/fstobdf/dist: README

Log Message:
merge bdftopcf 1.1.1 and fstobdf 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/bdftopcf/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bdftopcf/dist/stubs.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/fstobdf/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fstobdf/dist/fstobdf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Oct 16 22:48:18 UTC 2022

Modified Files:
xsrc/external/mit/fstobdf/dist: fstobdf.c
Removed Files:
xsrc/external/mit/bdftopcf/dist: README stubs.h
xsrc/external/mit/fstobdf/dist: README

Log Message:
merge bdftopcf 1.1.1 and fstobdf 1.0.7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/bdftopcf/dist/README
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/bdftopcf/dist/stubs.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/fstobdf/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fstobdf/dist/fstobdf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fstobdf/dist/fstobdf.c
diff -u xsrc/external/mit/fstobdf/dist/fstobdf.c:1.4 xsrc/external/mit/fstobdf/dist/fstobdf.c:1.5
--- xsrc/external/mit/fstobdf/dist/fstobdf.c:1.4	Wed Jul 22 08:17:32 2015
+++ xsrc/external/mit/fstobdf/dist/fstobdf.c	Sun Oct 16 22:48:18 2022
@@ -44,7 +44,7 @@ in this Software without prior written a
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
 #include	
@@ -59,9 +59,8 @@ usage(const char *progName, const char *
 if (msg)
 fprintf(stderr, "%s: %s\n", progName, msg);
 fprintf(stderr,
-	"Usage: %s [-server ] -fn \n"
-	"	or: %s -version\n",
-	progName, progName);
+"Usage: %s [-server ] -fn \n"
+"	or: %s -version\n", progName, progName);
 exit(0);
 }
 
@@ -75,79 +74,78 @@ Fail(const char *progName)
 int
 main(int argc, char *argv[])
 {
-FSServer   *fontServer;
-FontfontID,
-dummy;
+FSServer *fontServer;
+Font fontID, dummy;
 FSBitmapFormat bitmapFormat;
 FSXFontInfoHeader fontHeader;
-FSPropInfo  propInfo;
+FSPropInfo propInfo;
 FSPropOffset *propOffsets;
 unsigned char *propData;
 
-FILE   *outFile;
-char   *fontName;
-char   *serverName;
-int i;
+FILE *outFile;
+char *fontName;
+char *serverName;
+int i;
 
 fontName = NULL;
 serverName = NULL;
 outFile = stdout;
 
 for (i = 1; i < argc; i++) {
-	if (!strncmp(argv[i], "-s", 2)) {
-	if (argv[++i])
-		serverName = argv[i];
-	else
-		usage(argv[0], "-server requires an argument");
-	} else if (!strncmp(argv[i], "-fn", 3)) {
-	if (argv[++i])
-		fontName = argv[i];
-	else
-		usage(argv[0], "-fn requires an argument");
-	}
-	else if (!strcmp(argv[i], "-version")) {
-	printf("%s\n", PACKAGE_STRING);
-	exit(0);
-	}
-	else {
-	fprintf(stderr, "%s: unrecognized option '%s'\n",
-		argv[0], argv[i]);
-	usage(argv[0], NULL);
-	}
+if (!strncmp(argv[i], "-s", 2)) {
+if (argv[++i])
+serverName = argv[i];
+else
+usage(argv[0], "-server requires an argument");
+}
+else if (!strncmp(argv[i], "-fn", 3)) {
+if (argv[++i])
+fontName = argv[i];
+else
+usage(argv[0], "-fn requires an argument");
+}
+else if (!strcmp(argv[i], "-version")) {
+printf("%s\n", PACKAGE_STRING);
+exit(0);
+}
+else {
+fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], argv[i]);
+usage(argv[0], NULL);
+}
 }
 
 if (fontName == NULL)
-	usage(argv[0], "No font name specified");
+usage(argv[0], "No font name specified");
 
 fontServer = FSOpenServer(serverName);
 if (!fontServer) {
-	const char *sn = FSServerName(serverName);
-	if (sn)
-	fprintf(stderr, "%s: can't open font server \"%s\"\n",
-	  	argv[0], sn);
-	else
-	usage(argv[0], "No font server specified.");
-	exit(0);
+const char *sn = FSServerName(serverName);
+
+if (sn)
+fprintf(stderr, "%s: can't open font server \"%s\"\n", argv[0], sn);
+else
+usage(argv[0], "No font server specified.");
+exit(0);
 }
 bitmapFormat = 0;
 fontID = FSOpenBitmapFont(fontServer, bitmapFormat, (FSBitmapFormatMask) 0,
-			  fontName, &dummy);
+  fontName, &dummy);
 if (!fontID) {
-	printf("can't open font \"%s\"\n", fontName);
-	exit(0);
+printf("can't open font \"%s\"\n", fontName);
+exit(0);
 }
 FSQueryXInfo(fontServer, fontID, &fontHeader, &propInfo, &propOffsets,
-		 &propData);
+ &propData);
 
 if (!EmitHeader(outFile, &fontHeader, &propInfo, propOffsets, propData))
-	Fail(argv[0]);
+Fail(argv[0]);
 if (!EmitProperties(outFile, &fontHeader, &propInfo, propOffsets, propData))
-	Fail(argv[0]);
+Fail(argv[0]);
 if (!EmitCharacters(outFile, fontServer, &fontHeader, fontID))
-	Fail(argv[0]);
+Fail(argv[0]);
 fprintf(outFile, "ENDFONT\n");
 
 FSFree((char *) propOffsets);
 FSFr

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Oct 16 23:01:13 UTC 2022

Modified Files:
xsrc/external/mit/viewres/dist: compile
xsrc/external/mit/xditview/dist: compile
xsrc/external/mit/xgc/dist: compile
Removed Files:
xsrc/external/mit/smproxy/dist: README
xsrc/external/mit/xgc/dist: README

Log Message:
merge smproxy 1.0.7, viewres 1.0.7, xditview 1.0.6, and xgc 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/smproxy/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/viewres/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xditview/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgc/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xgc/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/viewres/dist/compile
diff -u xsrc/external/mit/viewres/dist/compile:1.3 xsrc/external/mit/viewres/dist/compile:1.4
--- xsrc/external/mit/viewres/dist/compile:1.3	Sun Mar 11 08:02:47 2018
+++ xsrc/external/mit/viewres/dist/compile	Sun Oct 16 23:01:13 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/xditview/dist/compile
diff -u xsrc/external/mit/xditview/dist/compile:1.3 xsrc/external/mit/xditview/dist/compile:1.4
--- xsrc/external/mit/xditview/dist/compile:1.3	Sun Jul 19 19:43:02 2015
+++ xsrc/external/mit/xditview/dist/compile	Sun Oct 16 23:01:13 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 #

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Oct 16 23:01:13 UTC 2022

Modified Files:
xsrc/external/mit/viewres/dist: compile
xsrc/external/mit/xditview/dist: compile
xsrc/external/mit/xgc/dist: compile
Removed Files:
xsrc/external/mit/smproxy/dist: README
xsrc/external/mit/xgc/dist: README

Log Message:
merge smproxy 1.0.7, viewres 1.0.7, xditview 1.0.6, and xgc 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/smproxy/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/viewres/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xditview/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xgc/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xgc/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:02:04 UTC 2022

Modified Files:
xsrc/external/mit/libXext/dist/src: XEVI.c XSync.c Xge.c extutil.c
xsrc/external/mit/libXmu/dist/src: CmapAlloc.c
xsrc/external/mit/libXrender/dist/src: Filter.c Xrender.c
xsrc/external/mit/libxkbfile/dist/src: cout.c
xsrc/external/mit/libxshmfence/dist/src: xshmfence_alloc.c
Removed Files:
xsrc/external/mit/libXpresent/dist: README
xsrc/external/mit/libXrender/dist: README
xsrc/external/mit/libxshmfence/dist: README

Log Message:
merge libXext 1.3.5, libbXmu 1.1.4, libXrender 1.0.1, libxkbfile 1.1.1 and
libxshmfence 1.3.1.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXext/dist/src/XEVI.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXext/dist/src/XSync.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXext/dist/src/Xge.c \
xsrc/external/mit/libXext/dist/src/extutil.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXmu/dist/src/CmapAlloc.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXpresent/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXrender/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrender/dist/src/Filter.c \
xsrc/external/mit/libXrender/dist/src/Xrender.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libxkbfile/dist/src/cout.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxshmfence/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libxshmfence/dist/src/xshmfence_alloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 29 21:02:04 UTC 2022

Modified Files:
xsrc/external/mit/libXext/dist/src: XEVI.c XSync.c Xge.c extutil.c
xsrc/external/mit/libXmu/dist/src: CmapAlloc.c
xsrc/external/mit/libXrender/dist/src: Filter.c Xrender.c
xsrc/external/mit/libxkbfile/dist/src: cout.c
xsrc/external/mit/libxshmfence/dist/src: xshmfence_alloc.c
Removed Files:
xsrc/external/mit/libXpresent/dist: README
xsrc/external/mit/libXrender/dist: README
xsrc/external/mit/libxshmfence/dist: README

Log Message:
merge libXext 1.3.5, libbXmu 1.1.4, libXrender 1.0.1, libxkbfile 1.1.1 and
libxshmfence 1.3.1.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXext/dist/src/XEVI.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXext/dist/src/XSync.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXext/dist/src/Xge.c \
xsrc/external/mit/libXext/dist/src/extutil.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXmu/dist/src/CmapAlloc.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXpresent/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXrender/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXrender/dist/src/Filter.c \
xsrc/external/mit/libXrender/dist/src/Xrender.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libxkbfile/dist/src/cout.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxshmfence/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libxshmfence/dist/src/xshmfence_alloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXext/dist/src/XEVI.c
diff -u xsrc/external/mit/libXext/dist/src/XEVI.c:1.2 xsrc/external/mit/libXext/dist/src/XEVI.c:1.3
--- xsrc/external/mit/libXext/dist/src/XEVI.c:1.2	Mon Sep  7 15:20:53 2020
+++ xsrc/external/mit/libXext/dist/src/XEVI.c	Sat Oct 29 21:02:03 2022
@@ -31,6 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include 
 #include 
 #include 
+#include "reallocarray.h"
 
 static XExtensionInfo *xevi_info;/* needs to move to globals.c */
 static const char *xevi_extension_name = EVINAME;
@@ -126,7 +127,7 @@ Status XeviGetVisualInfo(
 	return BadValue;
 }
 if (!n_visual || !visual) {		/* copy the all visual */
-	temp_visual = (VisualID32 *)Xmalloc(sz_VisualID32 * sz_info);
+	temp_visual = Xcalloc(sz_info, sz_VisualID32);
 	n_visual = 0;
 for (vinfoIndex = 0; vinfoIndex < sz_info; vinfoIndex++)
 	if (notInList(temp_visual, n_visual, vinfo[vinfoIndex].visualid))
@@ -148,7 +149,7 @@ Status XeviGetVisualInfo(
 	return BadValue;
 	}
 	}
-	temp_visual = (VisualID32 *)Xmalloc(sz_VisualID32 * n_visual);
+	temp_visual = Xmallocarray(n_visual, sz_VisualID32);
 for (visualIndex = 0; visualIndex < n_visual; visualIndex++)
 	temp_visual[visualIndex] = visual[visualIndex];
 }
@@ -172,7 +173,7 @@ Status XeviGetVisualInfo(
 	sz_xInfo = rep.n_info * sz_xExtendedVisualInfo;
 	sz_conflict = rep.n_conflicts * sizeof(VisualID);
 	sz_xConflict = rep.n_conflicts * sz_VisualID32;
-	*evi_return = Xmalloc(sz_info + sz_conflict);
+	*evi_return = Xcalloc(sz_info + sz_conflict, 1);
 	temp_xInfo = Xmalloc(sz_xInfo);
 	temp_conflict = Xmalloc(sz_xConflict);
 } else {

Index: xsrc/external/mit/libXext/dist/src/XSync.c
diff -u xsrc/external/mit/libXext/dist/src/XSync.c:1.4 xsrc/external/mit/libXext/dist/src/XSync.c:1.5
--- xsrc/external/mit/libXext/dist/src/XSync.c:1.4	Wed Jul 22 02:23:01 2015
+++ xsrc/external/mit/libXext/dist/src/XSync.c	Sat Oct 29 21:02:03 2022
@@ -358,7 +358,7 @@ XSyncListSystemCounters(Display *dpy, in
 	int i;
 
 	if (rep.nCounters < (INT_MAX / sizeof(XSyncSystemCounter)))
-	list = Xmalloc(rep.nCounters * sizeof(XSyncSystemCounter));
+	list = Xcalloc(rep.nCounters, sizeof(XSyncSystemCounter));
 	if (rep.length < (INT_MAX >> 2)) {
 	replylen = rep.length << 2;
 	pWireSysCounter = Xmalloc (replylen + sizeof(XSyncCounter));

Index: xsrc/external/mit/libXext/dist/src/Xge.c
diff -u xsrc/external/mit/libXext/dist/src/Xge.c:1.6 xsrc/external/mit/libXext/dist/src/Xge.c:1.7
--- xsrc/external/mit/libXext/dist/src/Xge.c:1.6	Wed Jul 22 02:23:01 2015
+++ xsrc/external/mit/libXext/dist/src/Xge.c	Sat Oct 29 21:02:03 2022
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2007-2008 Peter Hutterer
+ * Copyright © 2007-2008 Peter Hutterer
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -39,6 +39,8 @@
 #include 
 #include 
 
+#include "extutilP.h"
+
 /***/
 /*internal data structures */
 /***/
@@ -141,7 +143,7 @@ _xgeCheckExtInit(Display* dpy, XExtDispl
 
 if (!info->data)
 {
-XGEData

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:08:51 UTC 2022

Modified Files:
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/rgb/dist: README
xsrc/external/mit/xsetroot/dist: README

Log Message:
merge rgb 1.1.0, sessreg 1.1.3, xfsinfo 1.0.7, and xsetroot 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/rgb/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xsetroot/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:08:51 UTC 2022

Modified Files:
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/rgb/dist: README
xsrc/external/mit/xsetroot/dist: README

Log Message:
merge rgb 1.1.0, sessreg 1.1.3, xfsinfo 1.0.7, and xsetroot 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/rgb/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xsetroot/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/sessreg/include/config.h
diff -u xsrc/external/mit/sessreg/include/config.h:1.5 xsrc/external/mit/sessreg/include/config.h:1.6
--- xsrc/external/mit/sessreg/include/config.h:1.5	Mon Jul  8 20:41:24 2019
+++ xsrc/external/mit/sessreg/include/config.h	Fri Nov 11 23:08:51 2022
@@ -59,7 +59,7 @@
 #define PACKAGE_NAME "sessreg"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sessreg 1.1.1"
+#define PACKAGE_STRING "sessreg 1.1.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sessreg"
@@ -68,7 +68,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.3"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -105,7 +105,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.3"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */

Index: xsrc/external/mit/xfsinfo/dist/compile
diff -u xsrc/external/mit/xfsinfo/dist/compile:1.4 xsrc/external/mit/xfsinfo/dist/compile:1.5
--- xsrc/external/mit/xfsinfo/dist/compile:1.4	Sun Mar  3 08:17:43 2019
+++ xsrc/external/mit/xfsinfo/dist/compile	Fri Nov 11 23:08:51 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:24:25 UTC 2022

Modified Files:
xsrc/external/mit/xlogo/dist: compile
Removed Files:
xsrc/external/mit/xkbevd/dist: README
xsrc/external/mit/xkill/dist: README

Log Message:
merge xkbevd 1.1.5, xkill 1.0.6, and xlogo 1.0.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbevd/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkill/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlogo/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xlogo/dist/compile
diff -u xsrc/external/mit/xlogo/dist/compile:1.3 xsrc/external/mit/xlogo/dist/compile:1.4
--- xsrc/external/mit/xlogo/dist/compile:1.3	Sun Mar  3 21:38:01 2019
+++ xsrc/external/mit/xlogo/dist/compile	Sun Nov 13 05:24:24 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Nov 13 05:24:25 UTC 2022

Modified Files:
xsrc/external/mit/xlogo/dist: compile
Removed Files:
xsrc/external/mit/xkbevd/dist: README
xsrc/external/mit/xkill/dist: README

Log Message:
merge xkbevd 1.1.5, xkill 1.0.6, and xlogo 1.0.6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbevd/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkill/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlogo/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Bernd Ernesti]

Module Name:xsrc
Committed By:   veego
Date:   Sun Jan 10 10:00:14 UTC 2010

Modified Files:
xsrc/external/mit/xmodmap/include: config.h
xsrc/external/mit/xprop/include: config.h
xsrc/external/mit/xwininfo/include: config.h

Log Message:
Regenerate to match current source
* Add several defines for headers


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xmodmap/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xprop/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xwininfo/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:28:59 UTC 2021

Modified Files:
xsrc/external/mit/xeyes/dist: compile
xsrc/external/mit/xrdb/dist: xrdb.c
Removed Files:
xsrc/external/mit/xeyes/dist: README
xsrc/external/mit/xwd/dist: README

Log Message:
merge xeyes 1.2.0, xrdb 1.2.1, and xwd 1.0.8.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xeyes/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xeyes/dist/compile
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwd/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:28:59 UTC 2021

Modified Files:
xsrc/external/mit/xeyes/dist: compile
xsrc/external/mit/xrdb/dist: xrdb.c
Removed Files:
xsrc/external/mit/xeyes/dist: README
xsrc/external/mit/xwd/dist: README

Log Message:
merge xeyes 1.2.0, xrdb 1.2.1, and xwd 1.0.8.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xeyes/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xeyes/dist/compile
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwd/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xeyes/dist/compile
diff -u xsrc/external/mit/xeyes/dist/compile:1.3 xsrc/external/mit/xeyes/dist/compile:1.4
--- xsrc/external/mit/xeyes/dist/compile:1.3	Sun Mar 11 08:15:22 2018
+++ xsrc/external/mit/xeyes/dist/compile	Mon Aug 23 21:28:58 2021
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.10 xsrc/external/mit/xrdb/dist/xrdb.c:1.11
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.10	Sun Mar  3 08:36:21 2019
+++ xsrc/external/mit/xrdb/dist/xrdb.c	Mon Aug 23 21:28:58 2021
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -84,6 +85,7 @@
 #define OPLOAD 4
 #define OPMERGE 5
 #define OPOVERRIDE 6
+#define OPGET 7
 
 #define BACKUP_SUFFIX ".bak"/* for editing */
 
@@ -126,6 +128,7 @@ static char *editFile = NULL;
 static const char *cpp_program = NULL;
 static const char * const cpp_locations[] = { CPP };
 static const char *backup_suffix = BACKUP_SUFFIX;
+static const char *resource_name = NULL;
 static Bool dont_execute = False;
 static Bool show_cpp = False;
 static String defines;
@@ -745,6 +748,8 @@ EditFile(Entries *new, FILE *in, FILE *o
 buff[0] = '\0';
 if (!fgets(buff, BUFSIZ, in))
 goto cleanup;
+if (buff[0] == '\0')
+continue;
 AppendToBuffer(&b, buff, strlen(buff));
 c = &b.buff[b.used - 1];
 if ((*(c--) == '\n') && (b.used == 1 || *c != '\\'))
@@ -784,6 +789,7 @@ Syntax(const char *errmsg)
 " -nocpp  do not use a preprocessor\n"
 " -E  show preprocessor command & processed input file\n"
 " -query  query resources\n"
+" -get name   get the content of a resource\n"
 " -load   load resources from file [default]\n"
 " -override   add in resources from file\n"
 " -merge  merge resources from file & sort\n"
@@ -982,6 +988,13 @@ main(int argc, char *argv[])
 oper = OPQUERY;
 continue;
 }
+else if (isabbreviation("-get", arg, 2)) {
+oper = OPGET;
+if (++i >= argc)
+Syntax("-get requires an argument");
+resource_name = argv[i];
+   

CVS commit: xsrc/external/mit

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Tue Dec 14 14:43:43 UTC 2021

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc: addrinterface.h
addrtypes.h
xsrc/external/mit/MesaLib.old/dist/src/amd/common: ac_gpu_info.h
ac_surface.h
xsrc/external/mit/MesaLib.old/dist/src/util: u_atomic.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h

Log Message:
lint fixes:
1. avoid typedef re-definitions (perhaps introduce c11 mode for lint)
2. add __lint__ wherever __GNUC__ is defined.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h \
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h
cvs rdiff -u -r1.1.1.11 -r1.2 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Tue Dec 14 14:43:43 UTC 2021

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc: addrinterface.h
addrtypes.h
xsrc/external/mit/MesaLib.old/dist/src/amd/common: ac_gpu_info.h
ac_surface.h
xsrc/external/mit/MesaLib.old/dist/src/util: u_atomic.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h

Log Message:
lint fixes:
1. avoid typedef re-definitions (perhaps introduce c11 mode for lint)
2. add __lint__ wherever __GNUC__ is defined.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h \
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h
cvs rdiff -u -r1.1.1.11 -r1.2 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h:1.1.1.1	Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h	Tue Dec 14 09:43:42 2021
@@ -45,7 +45,10 @@ extern "C"
 #define ADDRLIB_VERSION ((ADDRLIB_VERSION_MAJOR << 16) | ADDRLIB_VERSION_MINOR)
 
 /// Virtually all interface functions need ADDR_HANDLE as first parameter
+#ifndef ADDR_HANDLE_TYPEDEF
+#define ADDR_HANDLE_TYPEDEF
 typedef VOID*   ADDR_HANDLE;
+#endif
 
 /// Client handle used in callbacks
 typedef VOID*   ADDR_CLIENT_HANDLE;
Index: xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h:1.1.1.1	Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h	Tue Dec 14 09:43:42 2021
@@ -67,7 +67,7 @@ typedef intINT;
 
 */
 #ifndef ADDR_CDECL
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__lint__)
 #define ADDR_CDECL __attribute__((cdecl))
 #else
 #define ADDR_CDECL __cdecl
@@ -75,7 +75,7 @@ typedef intINT;
 #endif
 
 #ifndef ADDR_STDCALL
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__lint__)
 #if defined(__amd64__) || defined(__x86_64__)
 #define ADDR_STDCALL
 #else
@@ -89,13 +89,13 @@ typedef intINT;
 #ifndef ADDR_FASTCALL
 #if defined(BRAHMA_ARM)
 #define ADDR_FASTCALL
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) || defined(__lint__)
 #if defined(__i386__)
 #define ADDR_FASTCALL __attribute__((regparm(0)))
 #else
 #define ADDR_FASTCALL
 #endif
-#else
+#elif
 #define ADDR_FASTCALL __fastcall
 #endif
 #endif
@@ -112,7 +112,7 @@ typedef intINT;
 #define GC_FASTCALL  ADDR_FASTCALL
 #endif
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__lint__)
 #define ADDR_INLINE static inline   // inline needs to be static to link
 #else
 // win32, win64, other platforms
@@ -656,7 +656,7 @@ typedef enum _AddrTileType
 //
 //  64-bit integer types depend on the compiler
 //
-#if defined( __GNUC__ ) || defined( __WATCOMC__ )
+#if defined( __GNUC__ ) || defined( __WATCOMC__ ) || defined(__lint__)
 #define INT_64   long long
 #define UINT_64  unsigned long long
 
@@ -689,7 +689,7 @@ typedef enum _AddrTileType
 
 //  ADDR64X is used to print addresses in hex form on both Windows and Linux
 //
-#if defined( __GNUC__ ) || defined( __WATCOMC__ )
+#if defined( __GNUC__ ) || defined( __WATCOMC__ ) || defined(__lint__)
 #define ADDR64X "llx"
 #define ADDR64D "lld"
 

Index: xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h:1.1.1.1	Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h	Tue Dec 14 09:43:43 2021
@@ -36,7 +36,10 @@ extern "C" {
 #endif
 
 /* Prior to C11 the following may trigger a typedef redeclaration warning */
+#ifndef AMDGPU_DEVICE_TYPEDEF
+#defin

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul  8 19:58:13 UTC 2019

Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11/extensions: randrproto.h
Removed Files:
xsrc/external/mit/encodings/dist: README
xsrc/external/mit/xorgproto/dist: COPYING-panoramixproto README

Log Message:
merge xorgproto 2019.1 and encodings 1.0.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/encodings/dist/README
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorgproto/dist/COPYING-panoramixproto \
xsrc/external/mit/xorgproto/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul  8 19:58:13 UTC 2019

Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11/extensions: randrproto.h
Removed Files:
xsrc/external/mit/encodings/dist: README
xsrc/external/mit/xorgproto/dist: COPYING-panoramixproto README

Log Message:
merge xorgproto 2019.1 and encodings 1.0.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/encodings/dist/README
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorgproto/dist/COPYING-panoramixproto \
xsrc/external/mit/xorgproto/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h
diff -u xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h:1.2 xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h:1.3
--- xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h:1.2	Wed Jan 23 16:57:01 2019
+++ xsrc/external/mit/xorgproto/dist/include/X11/extensions/randrproto.h	Mon Jul  8 19:58:13 2019
@@ -65,49 +65,49 @@
  */
 
 typedef struct {
-CARD16 widthInPixels B16;
-CARD16 heightInPixels B16;
-CARD16 widthInMillimeters B16;
-CARD16 heightInMillimeters B16;
+CARD16 widthInPixels;
+CARD16 heightInPixels;
+CARD16 widthInMillimeters;
+CARD16 heightInMillimeters;
 } xScreenSizes;
 #define sz_xScreenSizes 8
 
-/* 
+/*
  * requests and replies
  */
 
 typedef struct {
 CARD8   reqType;
 CARD8   randrReqType;
-CARD16  length B16;
-CARD32  majorVersion B32;
-CARD32  minorVersion B32;
+CARD16  length;
+CARD32  majorVersion;
+CARD32  minorVersion;
 } xRRQueryVersionReq;
 #define sz_xRRQueryVersionReq   12
 
 typedef struct {
 BYTEtype;   /* X_Reply */
 BYTEpad1;
-CARD16  sequenceNumber B16;
-CARD32  length B32;
-CARD32  majorVersion B32;
-CARD32  minorVersion B32;
-CARD32  pad2 B32;
-CARD32  pad3 B32;
-CARD32  pad4 B32;
-CARD32  pad5 B32;
+CARD16  sequenceNumber;
+CARD32  length;
+CARD32  majorVersion;
+CARD32  minorVersion;
+CARD32  pad2;
+CARD32  pad3;
+CARD32  pad4;
+CARD32  pad5;
 } xRRQueryVersionReply;
 #define sz_xRRQueryVersionReply	32
 
 typedef struct {
 CARD8   reqType;
 CARD8   randrReqType;
-CARD16  length B16;
-Window  window B32;
+CARD16  length;
+Window  window;
 } xRRGetScreenInfoReq;
 #define sz_xRRGetScreenInfoReq   8
 
-/* 
+/*
  * the xRRScreenInfoReply structure is followed by:
  *
  * the size information
@@ -117,68 +117,68 @@ typedef struct {
 typedef struct {
 BYTEtype;   /* X_Reply */
 BYTEsetOfRotations;
-CARD16  sequenceNumber B16;
-CARD32  length B32;
-Window  root B32;
-Timetimestamp B32;
-TimeconfigTimestamp B32;
-CARD16  nSizes B16;
-SizeID  sizeID B16;
-Rotation  rotation B16;
-CARD16  rate B16;
-CARD16  nrateEnts B16;
-CARD16  pad B16;
+CARD16  sequenceNumber;
+CARD32  length;
+Window  root;
+Timetimestamp;
+TimeconfigTimestamp;
+CARD16  nSizes;
+SizeID  sizeID;
+Rotation  rotation;
+CARD16  rate;
+CARD16  nrateEnts;
+CARD16  pad;
 } xRRGetScreenInfoReply;
 #define sz_xRRGetScreenInfoReply	32
 
 typedef struct {
 CARD8reqType;
 CARD8randrReqType;
-CARD16   length B16;
-Drawable drawable B32;
-Time timestamp B32;
-Time configTimestamp B32;
-SizeID   sizeID B16;
-Rotation rotation B16;
+CARD16   length;
+Drawable drawable;
+Time timestamp;
+Time configTimestamp;
+SizeID   sizeID;
+Rotation rotation;
 } xRR1_0SetScreenConfigReq;
 #define sz_xRR1_0SetScreenConfigReq   20
 
 typedef struct {
 CARD8reqType;
 CARD8randrReqType;
-CARD16   length B16;
-Drawable drawable B32;
-Time timestamp B32;
-Time configTimestamp B32;
-SizeID   sizeID B16;
-Rotation rotation B16;
-CARD16   rate B16;
-CARD16   pad B16;
+CARD16   length;
+Drawable drawable;
+Time timestamp;
+Time configTimestamp;
+SizeID   sizeID;
+Rotation rotation;
+CARD16   rate;
+CARD16   pad;
 } xRRSetScreenConfigReq;
 #define sz_xRRSetScreenConfigReq   24
 
 typedef struct {
 BYTEtype;   /* X_Reply */
 CARD8   status;
-CARD16  sequenceNumber B16;
-CARD32  length B32;
-TimenewTimestamp B32;  
-TimenewConfigTimestamp B32;
+CARD16  sequenceNumber;
+CARD32  length;
+TimenewTimestamp;
+TimenewConfigTimestamp;
 Window  root;
-CARD16  subpixelOrder B16;
-CARD16  pad4 B16;
-CARD32  pad5 B32;
-CARD32  pad6 B32;
+CARD16  subpixelOrder;
+CARD16  

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul  8 20:41:25 UTC 2019

Modified Files:
xsrc/external/mit/sessreg/dist: sessreg.h
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xf86-input-elographics/include: config.h
Removed Files:
xsrc/external/mit/sessreg/dist: README
xsrc/external/mit/xf86-input-elographics/dist: README

Log Message:
merge sessreg 1.1.2 and xf86-input-elographics 1.4.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/sessreg/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/sessreg/dist/sessreg.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-input-elographics/dist/README
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-input-elographics/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.