CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon May 13 10:13:11 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c
cg14_driver.c

Log Message:
support 16bit colour
This requires kernel support, which was committed yesterday.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.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-suncg14/dist/src/cg14_accel.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.32 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.33
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.32	Wed May 11 21:13:13 2022
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c	Mon May 13 10:13:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cg14_accel.c,v 1.32 2022/05/11 21:13:13 macallan Exp $ */
+/* $NetBSD: cg14_accel.c,v 1.33 2024/05/13 10:13:10 macallan Exp $ */
 /*
  * Copyright (c) 2013 Michael Lorenz
  * All rights reserved.
@@ -68,6 +68,7 @@ int src_formats[] = {PICT_a8r8g8b8, PICT
 int tex_formats[] = {PICT_a8r8g8b8, PICT_a8b8g8r8, PICT_a8};
 
 static void CG14Copy32(PixmapPtr, int, int, int, int, int, int);
+static void CG14Copy16(PixmapPtr, int, int, int, int, int, int);
 static void CG14Copy8(PixmapPtr, int, int, int, int, int, int);
 
 static inline void
@@ -121,6 +122,9 @@ CG14PrepareCopy(PixmapPtr pSrcPixmap, Pi
 		case 8:
 			p->pExa->Copy = CG14Copy8;
 			break;
+		case 16:
+			p->pExa->Copy = CG14Copy16;
+			break;
 		case 32:
 			p->pExa->Copy = CG14Copy32;
 			break;
@@ -610,6 +614,13 @@ CG14Copy8_short_norop(Cg14Ptr p, int src
 }
 
 static void
+CG14Copy16(PixmapPtr pDstPixmap,
+ int srcX, int srcY, int dstX, int dstY, int w, int h)
+{
+	CG14Copy8(pDstPixmap, srcX << 1, srcY, dstX << 1, dstY, w << 1, h);
+}
+
+static void
 CG14Copy8(PixmapPtr pDstPixmap,
  int srcX, int srcY, int dstX, int dstY, int w, int h)
 {
@@ -896,10 +907,12 @@ CG14PrepareSolid(PixmapPtr pPixmap, int 
 			fg = 0x;
 			break;
 	}
-	/* repeat the colour in every sub byte if we're in 8 bit */
+	/* repeat the colour in every sub byte if we're in 8 or 16 bit */
 	if (pPixmap->drawable.bitsPerPixel == 8) {
 		fg |= fg << 8;
 		fg |= fg << 16;
+	} else if (pPixmap->drawable.bitsPerPixel == 16) {
+		fg |= fg << 16;
 	}
 	write_sx_reg(p, SX_QUEUED(8), fg);
 	write_sx_reg(p, SX_QUEUED(9), fg);
@@ -974,6 +987,90 @@ CG14Solid32(Cg14Ptr p, uint32_t start, u
 }
 
 static void
+CG14Solid16(Cg14Ptr p, uint32_t start, uint32_t pitch, int w, int h)
+{
+	int line, num, pre, cnt;
+	uint32_t ptr;
+
+	ENTER;
+	pre = start & 2;
+	if (pre != 0) pre = 1;
+
+	if (p->last_rop == 0xcc) {
+		/* simple fill */
+		for (line = 0; line < h; line++) {
+			ptr = start;
+			cnt = w;
+			if (pre) {
+sxm(SX_STW, ptr, 8, 0);
+ptr += 2;
+cnt -= 1;
+if (cnt == 0) goto next;
+			}
+			/* now do the aligned pixels in 32bit chunks */
+			if (ptr & 3) xf86Msg(X_ERROR, "%s %x\n", __func__, ptr);
+			while(cnt > 1) {
+num = min(32, cnt >> 1);
+sxm(SX_STS, ptr, 8, num - 1);
+ptr += num << 2;
+cnt -= num << 1;
+			}
+			if (cnt > 1) xf86Msg(X_ERROR, "%s cnt %d\n", __func__, cnt);
+			if (cnt > 0) {
+sxm(SX_STW, ptr, 8, 0);
+			}
+next:
+			start += pitch;
+		}
+	} else if (p->last_rop == 0xaa) {
+		/* nothing to do here */
+		return;
+	} else {
+		/* alright, let's do actual ROP stuff */
+
+		/* first repeat the fill colour into 16 registers */
+		sxi(SX_SELECT_S, 8, 8, 10, 15);
+
+		for (line = 0; line < h; line++) {
+			ptr = start;
+			cnt = w;
+			pre = min(pre, cnt);
+			if (pre) {
+sxm(SX_LDW, ptr, 26, 0);
+sxi(SX_ROP, 10, 26, 42, 0);
+sxm(SX_STW, ptr, 42, 0);
+ptr += 2;
+cnt -= 1;
+if (cnt == 0) goto next2;
+			}
+			/* now do the aligned pixels in 32bit chunks */
+			if (ptr & 3) xf86Msg(X_ERROR, "%s %x\n", __func__, ptr);
+			while(cnt > 1) {
+num = min(32, cnt >> 1);
+sxm(SX_LD, ptr, 26, num - 1);
+if (num <= 16) {
+	sxi(SX_ROP, 10, 26, 58, num - 1);
+} else {
+	sxi(SX_ROP, 10, 26, 58, 15);
+	sxi(SX_ROP, 10, 42, 74, num - 17);
+}
+sxm(SX_ST, ptr, 58, num - 1);
+ptr += num << 2;
+cnt -= num << 1;
+			}
+			if (cnt > 1) xf86Msg(X_ERROR, "%s cnt %d\n", __func__, cnt);
+			if (cnt > 0) {
+sxm(SX_LDW, ptr, 26, 0);
+sxi(SX_ROP, 10, 26, 42, 0);
+sxm(SX_STW, ptr, 42, 0);
+			}
+next2:
+			start += pitch;
+		}
+	}
+}
+
+static void
 CG14Solid8(Cg14Ptr p, uint32_t start, uint32_t pitch, int w, int h)
 {
 	int line, num, pre, cnt;
@@ -1078,6 +1175,10 @@ CG14Solid(PixmapPtr pPixmap, int x1, int
 			start = dstoff + (y1 * dstpitch) + (x1 << 2);
 			CG14Solid32(p, start, dstpitch, w, h);
 			break;
+		case 16:
+			start 

CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon May 13 10:13:11 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_accel.c
cg14_driver.c

Log Message:
support 16bit colour
This requires kernel support, which was committed yesterday.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.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/xdpyinfo/include

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Thu May  9 06:29:32 UTC 2024

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

Log Message:
undef HAVE_X11_EXTENSIONS_XF86MISC_H

none of our X servers support this extension since 2008 or so.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdpyinfo/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.5 xsrc/external/mit/xdpyinfo/include/config.h:1.6
--- xsrc/external/mit/xdpyinfo/include/config.h:1.5	Mon Jun 19 07:32:08 2023
+++ xsrc/external/mit/xdpyinfo/include/config.h	Thu May  9 06:29:32 2024
@@ -50,7 +50,7 @@
 #define HAVE_X11_EXTENSIONS_XF86DGA_H 1
 
 /* Define to 1 if you have the  header file. */
-#define HAVE_X11_EXTENSIONS_XF86MISC_H 1
+/* #undef HAVE_X11_EXTENSIONS_XF86MISC_H 1 */
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_X11_EXTENSIONS_XF86MSCSTR_H 1

CVS commit: xsrc/external/mit/xdpyinfo/include

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Thu May  9 06:29:32 UTC 2024

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

Log Message:
undef HAVE_X11_EXTENSIONS_XF86MISC_H

none of our X servers support this extension since 2008 or so.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdpyinfo/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/MesaLib/dist/src/compiler

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Wed May  8 16:54:51 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/compiler/nir: nir_lower_blend.c
nir_lower_subgroups.c nir_opt_copy_prop_vars.c
xsrc/external/mit/MesaLib/dist/src/compiler/spirv: spirv_to_nir.c

Log Message:
Add casts to appease clang


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.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/dist/src/compiler/nir/nir_lower_blend.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c:1.1.1.1	Sun May  8 21:23:27 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c	Wed May  8 12:54:50 2024
@@ -375,7 +375,7 @@ nir_lower_blend_instr(nir_builder *b, ni
blended = nir_color_mask(b, options->rt[rt].colormask, blended, dst);
 
if (src_num_comps != 4)
-  blended = nir_channels(b, blended, BITFIELD_MASK(src_num_comps));
+  blended = nir_channels(b, blended, (nir_component_mask_t)BITFIELD_MASK(src_num_comps));
 
/* Write out the final color instead of the input */
nir_instr_rewrite_src_ssa(instr, >src[1], blended);

Index: xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c:1.1.1.2	Sun May  8 21:23:27 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c	Wed May  8 12:54:50 2024
@@ -98,7 +98,7 @@ uint_to_ballot_type(nir_builder *b, nir_
 * have enough ballot bits.
 */
if (value->num_components > num_components)
-  value = nir_channels(b, value, BITFIELD_MASK(num_components));
+  value = nir_channels(b, value, (nir_component_mask_t)BITFIELD_MASK(num_components));
 
return value;
 }

Index: xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c:1.1.1.4	Sun May  8 21:23:28 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c	Wed May  8 12:54:50 2024
@@ -191,7 +191,7 @@ gather_vars_written(struct copy_prop_var
 nir_deref_instr *payload =
nir_src_as_deref(*nir_get_shader_call_payload_src(intrin));
 
-nir_component_mask_t mask =
+nir_component_mask_t mask = (nir_component_mask_t)
BITFIELD_MASK(glsl_get_vector_elements(payload->type));
 
 struct hash_entry *ht_entry =
@@ -1150,7 +1150,7 @@ copy_prop_vars_block(struct copy_prop_va
 
  nir_deref_and_path payload = {
 nir_src_as_deref(*nir_get_shader_call_payload_src(intrin)), NULL};
- nir_component_mask_t full_mask =
+ nir_component_mask_t full_mask = (nir_component_mask_t)
 BITFIELD_MASK(glsl_get_vector_elements(payload.instr->type));
  kill_aliases(state, copies, , full_mask);
  break;

Index: xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c:1.1.1.4	Sun May  8 21:23:28 2022
+++ xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.c	Wed May  8 12:54:51 2024
@@ -3095,7 +3095,8 @@ vtn_handle_texture(struct vtn_builder *b
   unsigned result_size = glsl_get_vector_elements(ret_type->type);
   dest->elems[0]->def = nir_channel(>nb, >dest.ssa, result_size);
   dest->elems[1]->def = nir_channels(>nb, >dest.ssa,
- BITFIELD_MASK(result_size));
+ (nir_component_mask_t)
+	 BITFIELD_MASK(result_size));
   vtn_push_ssa_value(b, w[2], dest);
} else {
   vtn_push_nir_ssa(b, w[2], >dest.ssa);
@@ -3514,7 +3515,8 @@ vtn_handle_image(struct vtn_builder *b, 
  if (intrin->dest.ssa.bit_size != 32)
 dest->elems[0]->def = nir_u2u32(>nb, 

CVS commit: xsrc/external/mit/MesaLib/dist/src/compiler

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Wed May  8 16:54:51 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/compiler/nir: nir_lower_blend.c
nir_lower_subgroups.c nir_opt_copy_prop_vars.c
xsrc/external/mit/MesaLib/dist/src/compiler/spirv: spirv_to_nir.c

Log Message:
Add casts to appease clang


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_blend.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_lower_subgroups.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_opt_copy_prop_vars.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/spirv/spirv_to_nir.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/MesaLib/dist/src/util

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Wed Apr 24 19:05:53 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
fix pasto in previous


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.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/dist/src/util/u_cpu_detect.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.3 xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.3	Wed Apr 24 07:51:17 2024
+++ xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c	Wed Apr 24 19:05:53 2024
@@ -437,7 +437,7 @@ check_os_arm_support(void)
 #if defined(PIPE_ARCH_MIPS64)
 #ifdef __NetBSD__
 static void
-check_os_arm_support(void)
+check_os_mips64_support(void)
 {
 util_cpu_caps.has_msa = false;	/* XXX seems there is no way to detect MSA support from userland */
 }

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Wed Apr 24 19:05:53 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
fix pasto in previous


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.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/xf86-video-suncg14/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Wed Apr 24 11:42:06 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c

Log Message:
don't enable xrender support unless we have 24bit colour


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.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-suncg14/dist/src/cg14_driver.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.20 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.21
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.20	Sun Jan  8 22:03:02 2023
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c	Wed Apr 24 11:42:06 2024
@@ -395,6 +395,12 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags
 pCg14->use_xrender = xf86ReturnOptValBool(pCg14->Options, OPTION_XRENDER,
 FALSE);
 
+if (pScrn->depth < 24) {
+	if (pCg14->use_xrender)
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling xrender on depth < 24\n");
+	pCg14->use_xrender = FALSE;
+}
+
 /*
  * This must happen after pScrn->display has been set because
  * xf86SetWeight references it.

CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Wed Apr 24 11:42:06 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c

Log Message:
don't enable xrender support unless we have 24bit colour


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.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/MesaLib/dist/src/util

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Wed Apr 24 07:51:17 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
Add dummy cpu feature detection for mipsn64 on NetBSD.
XXX seems there is no way to detect mips MSA (SIMD) support currently.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.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/MesaLib/dist/src/util

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Wed Apr 24 07:51:17 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
Add dummy cpu feature detection for mipsn64 on NetBSD.
XXX seems there is no way to detect mips MSA (SIMD) support currently.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.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/dist/src/util/u_cpu_detect.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.2 xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.2	Sun Jul 16 22:01:35 2023
+++ xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c	Wed Apr 24 07:51:17 2024
@@ -435,6 +435,13 @@ check_os_arm_support(void)
 #endif /* PIPE_ARCH_ARM || PIPE_ARCH_AARCH64 */
 
 #if defined(PIPE_ARCH_MIPS64)
+#ifdef __NetBSD__
+static void
+check_os_arm_support(void)
+{
+util_cpu_caps.has_msa = false;	/* XXX seems there is no way to detect MSA support from userland */
+}
+#else
 static void
 check_os_mips64_support(void)
 {
@@ -454,6 +461,7 @@ check_os_mips64_support(void)
close (fd);
 }
 }
+#endif
 #endif /* PIPE_ARCH_MIPS64 */
 
 

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Tue Apr 23 16:16:44 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: macros.h

Log Message:
Do not re-define CACHE_LINE_SIZE


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/MesaLib/dist/src/util/macros.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/dist/src/util/macros.h
diff -u xsrc/external/mit/MesaLib/dist/src/util/macros.h:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/util/macros.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/util/macros.h:1.1.1.4	Mon May  9 01:23:43 2022
+++ xsrc/external/mit/MesaLib/dist/src/util/macros.h	Tue Apr 23 16:16:44 2024
@@ -478,6 +478,8 @@ typedef int lock_cap_t;
 #endif
 
 /* TODO: this could be different on non-x86 architectures. */
+#ifndef CACHE_LINE_SIZE
 #define CACHE_LINE_SIZE 64
+#endif
 
 #endif /* UTIL_MACROS_H */

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Martin Husemann]

Module Name:xsrc
Committed By:   martin
Date:   Tue Apr 23 16:16:44 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: macros.h

Log Message:
Do not re-define CACHE_LINE_SIZE


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/MesaLib/dist/src/util/macros.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/MesaLib/dist/src/amd/common

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Sat Apr 20 15:57:17 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/amd/common: ac_rtld.c

Log Message:
Fix build of mesa 21

This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h),
which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.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/dist/src/amd/common/ac_rtld.c
diff -u xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c:1.1.1.1	Mon May  9 01:23:25 2022
+++ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c	Sat Apr 20 15:57:17 2024
@@ -65,6 +65,10 @@
 #define R_AMDGPU_RELATIVE6413
 #endif
 
+#ifndef STN_UNDEF
+#define	STN_UNDEF	0
+#endif
+
 /* For the UMR disassembler. */
 #define DEBUGGER_END_OF_CODE_MARKER 0xbf9f /* invalid instruction */
 #define DEBUGGER_NUM_MARKERS5

CVS commit: xsrc/external/mit/MesaLib/dist/src/amd/common

[Maya Rashish]

Module Name:xsrc
Committed By:   maya
Date:   Sat Apr 20 15:57:17 UTC 2024

Modified Files:
xsrc/external/mit/MesaLib/dist/src/amd/common: ac_rtld.c

Log Message:
Fix build of mesa 21

This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h),
which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.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/xf86-input-ws/dist/src

[Michael van Elst]

Module Name:xsrc
Committed By:   mlelstv
Date:   Sun Apr 14 20:10:29 UTC 2024

Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c

Log Message:
Only limit the scroll warning, but continue to send the scroll events.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xf86-input-ws/dist/src/ws.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-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.17 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.18
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.17	Wed Feb  7 18:01:48 2024
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c	Sun Apr 14 20:10:29 2024
@@ -747,11 +747,13 @@ wsReadInput(InputInfoPtr pInfo)
 			dw = 0;
 		}
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
-		static int warned = 0;
-		if ((hscroll || vscroll) && !warned) {
-			warned = 1;
-			xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
-			pInfo->name, hscroll, vscroll);
+		if (hscroll || vscroll) {
+			static int warned = 0;
+			if (!warned) {
+warned = 1;
+xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
+pInfo->name, hscroll, vscroll);
+			}
 			valuator_mask_zero(priv->scroll_mask);
 			valuator_mask_set_double(priv->scroll_mask,
 			HSCROLL_AXIS, (double) hscroll);

CVS commit: xsrc/external/mit/xf86-input-ws/dist/src

[Michael van Elst]

Module Name:xsrc
Committed By:   mlelstv
Date:   Sun Apr 14 20:10:29 UTC 2024

Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c

Log Message:
Only limit the scroll warning, but continue to send the scroll events.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xf86-input-ws/dist/src/ws.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(>drawable, shaBase, shaStride, shaBpp, shaXoff,
+  shaYoff);
+if (sizeof(FbBits) != 

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/xf86-input-ws/dist/src

[Olaf Seibert]

Module Name:xsrc
Committed By:   rhialto
Date:   Wed Feb  7 18:01:48 UTC 2024

Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c

Log Message:
xf86-input-ws: print log message about touchpad scrolling only once.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xf86-input-ws/dist/src/ws.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/xf86-input-ws/dist/src

[Olaf Seibert]

Module Name:xsrc
Committed By:   rhialto
Date:   Wed Feb  7 18:01:48 UTC 2024

Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c

Log Message:
xf86-input-ws: print log message about touchpad scrolling only once.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xf86-input-ws/dist/src/ws.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-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.17
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.16	Sat Dec  4 15:21:55 2021
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c	Wed Feb  7 18:01:48 2024
@@ -747,7 +747,9 @@ wsReadInput(InputInfoPtr pInfo)
 			dw = 0;
 		}
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
-		if (hscroll || vscroll) {
+		static int warned = 0;
+		if ((hscroll || vscroll) && !warned) {
+			warned = 1;
 			xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
 			pInfo->name, hscroll, vscroll);
 			valuator_mask_zero(priv->scroll_mask);

CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Jan 26 13:37:21 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c

Log Message:
Handle "LSBit is left" bitorder VRAM of smg(4) and qv(4) on VAXen.

Confirmed on smg(4) on my VAXstation 3100/30.
Should be pulled up to netbsd-10.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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.48 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.48	Mon Jan 22 21:17:01 2024
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c	Fri Jan 26 13:37:21 2024
@@ -590,6 +590,12 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
 	if (pScrn->depth == 24 && pix24bpp == 0)
 		pix24bpp = xf86GetBppFromDepth(pScrn, 24);
 
+#ifdef	WSDISPLAY_TYPE_VAX_MONO
+	if (wstype == WSDISPLAY_TYPE_VAX_MONO) {
+		pScrn->bitmapBitOrder = LSBFirst;
+	}
+#endif
+
 	/* Handle options. */
 	xf86CollectOptions(pScrn, NULL);
 	fPtr->Options = (OptionInfoRec *)malloc(sizeof(WsfbOptions));

CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Jan 26 13:37:21 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c

Log Message:
Handle "LSBit is left" bitorder VRAM of smg(4) and qv(4) on VAXen.

Confirmed on smg(4) on my VAXstation 3100/30.
Should be pulled up to netbsd-10.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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/xf86-video-wsfb/dist/src

[Jared D. McNeill]

Module Name:xsrc
Committed By:   jmcneill
Date:   Mon Jan 22 21:17:01 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h wsfb_driver.c

Log Message:
xf86-video-wsfb: Add support for Nintendo Wii

The Wii's framebuffer is YUY2, so add a custom shadowproc that converts
from RGB565 to YUY2 on the fly.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h
cvs rdiff -u -r1.47 -r1.48 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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.h
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.10 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.11
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.10	Sat Sep 10 19:23:03 2022
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h	Mon Jan 22 21:17:01 2024
@@ -73,6 +73,7 @@ typedef struct {
 	void *			shadow;
 	Bool			HWCursor;
 	Bool			useSwap32;
+	Bool			useRGB16ToYUY2;
 #ifdef HAVE_SHADOW_AFB
 	Bool			planarAfb;
 #endif

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.47 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.48
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.47	Sat Sep 10 19:25:44 2022
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c	Mon Jan 22 21:17:01 2024
@@ -133,6 +133,7 @@ static void WsfbDGASetViewport(ScrnInfoP
 static Bool WsfbDGAInit(ScrnInfoPtr, ScreenPtr);
 #endif
 
+static void WsfbShadowUpdateRGB16ToYUY2(ScreenPtr, shadowBufPtr);
 static void WsfbShadowUpdateSwap32(ScreenPtr, shadowBufPtr);
 static void WsfbShadowUpdateSplit(ScreenPtr, shadowBufPtr);
 
@@ -154,6 +155,13 @@ enum { WSFB_ROTATE_NONE = 0,
  */
 static int pix24bpp = 0;
 
+/*
+ * Screen-independent lookup table for RGB16 to YUV conversions.
+ */
+static unsigned char *mapRGB16ToY = NULL;
+static unsigned char *mapRGB16ToU = NULL;
+static unsigned char *mapRGB16ToV = NULL;
+
 #define WSFB_VERSION		4000
 #define WSFB_NAME		"wsfb"
 #define WSFB_DRIVER_NAME	"wsfb"
@@ -610,6 +618,25 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
 			fPtr->shadowFB = TRUE;
 		}
 	}
+
+	fPtr->useRGB16ToYUY2 = FALSE;
+#ifdef WSDISPLAY_TYPE_HOLLYWOOD
+	if (wstype == WSDISPLAY_TYPE_HOLLYWOOD) {
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+			   "Enabling RGB16->YUY2 conversion for Hollywood\n");
+		fPtr->useRGB16ToYUY2 = TRUE;
+		if (!fPtr->shadowFB) {
+			xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+   "Shadow FB forced on for RGB16->YUY2 conversion\n");
+			fPtr->shadowFB = TRUE;
+		}
+		/*
+		 * Hollywood has a YUY2 framebuffer, but we treat it as
+		 * RGB565 and convert with a custom shadowproc.
+		 */
+		fPtr->fbi.fbi_pixeltype = WSFB_RGB;
+	}
+#endif
 	/* Rotation */
 	fPtr->rotate = WSFB_ROTATE_NONE;
 	if ((s = xf86GetOptValString(fPtr->Options, OPTION_ROTATE))) {
@@ -823,6 +850,35 @@ WsfbCreateScreenResources(ScreenPtr pScr
 	pPixmap = pScreen->GetScreenPixmap(pScreen);
 	if (fPtr->fbi.fbi_flags & WSFB_VRAM_IS_SPLIT) {
 		shadowproc = WsfbShadowUpdateSplit;
+	} else if (fPtr->useRGB16ToYUY2) {
+		/* Build RGB16 to Y, U, and V lookup tables */
+		if (mapRGB16ToY == NULL) {
+			mapRGB16ToY = malloc(0x3);
+			if (mapRGB16ToY == NULL) {
+xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+"Cannot malloc %d bytes for RGB16->YUY2\n",
+0x3);
+return FALSE;
+			}
+			mapRGB16ToU = mapRGB16ToY + 0x1;
+			mapRGB16ToV = mapRGB16ToY + 0x2;
+		for (unsigned int n = 0; n < 0x1; n++) {
+		/* RGB565 values, scaled to 8 bits */
+		const double R = (((n >> 11) & 0x1f) * 255) / 31;
+		const double G = (((n >> 5) & 0x3f) * 255) / 63;
+		const double B = (((n >> 0) & 0x1f) * 255) / 31;
+
+/* Convert to YUV */
+		mapRGB16ToY[n] =
+0.257 * R + 0.504 * G + 0.098 * B +  16;
+		mapRGB16ToU[n] =
+   -0.148 * R - 0.291 * G + 0.439 * B + 128;
+		mapRGB16ToV[n] =
+0.439 * R - 0.368 * G - 0.071 * B + 128;
+			}
+		}
+
+		shadowproc = WsfbShadowUpdateRGB16ToYUY2;
 	} else if (fPtr->useSwap32) {
 		shadowproc = WsfbShadowUpdateSwap32;
 	} else if (fPtr->rotate) {
@@ -1682,6 +1738,101 @@ WsfbDriverFunc(ScrnInfoPtr pScrn, xorgDr
 }
 
 static inline void
+WsfbCopyRGB16ToYUY2(void *dest, void *src, int len)
+{
+	uint16_t *src16 = src;
+	uint32_t *dest32 = dest;
+
+	while (len > 0) {
+		const uint16_t rgb0 = src16[0];
+		const uint16_t rgb1 = src16[1];
+		const uint16_t rgb = ((rgb0 >> 1) & ~0x8410) +
+ ((rgb1 >> 1) & ~0x8410) +
+ ((rgb0 & rgb1) & 0x0841);
+		const uint32_t y0 = mapRGB16ToY[rgb0];
+		const uint32_t y1 = mapRGB16ToY[rgb1];
+		const uint32_t u = mapRGB16ToU[rgb];
+		const uint32_t v = mapRGB16ToV[rgb];
+

CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src

[Jared D. McNeill]

Module Name:xsrc
Committed By:   jmcneill
Date:   Mon Jan 22 21:17:01 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h wsfb_driver.c

Log Message:
xf86-video-wsfb: Add support for Nintendo Wii

The Wii's framebuffer is YUY2, so add a custom shadowproc that converts
from RGB565 to YUY2 on the fly.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h
cvs rdiff -u -r1.47 -r1.48 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.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/xf86-input-keyboard/dist/src

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  7 14:29:01 UTC 2023

Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c bsd_kbd.h
kbd.c
Added Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: ws_KbdMap.c

Log Message:
xf86-input-keyboard: add suppport to get keymap via WSKBDIO_GETMAP ioctl(2).

No particular comment on tech-x11@:
 https://mail-index.netbsd.org/tech-x11/2023/10/31/msg002415.html
 https://mail-index.netbsd.org/tech-x11/2023/11/04/msg002416.html

Tested on NWS-3260 and NWS-3470 with Xorg 1.10 server in netbsd-9.
Worth to pullup to netbsd-10 and netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xf86-input-keyboard/dist/src/ws_KbdMap.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-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.21 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.22
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.21	Thu Nov 12 12:03:58 2015
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c	Tue Nov  7 14:29:00 2023
@@ -445,12 +445,14 @@ OpenKeyboard(InputInfoPtr pInfo)
case WSKBD_TYPE_PC_AT:
printWsType("AT", pInfo->name);
break;
+#ifndef USE_WSKBD_GETMAP
case 0:
/* If wsKbdType==0, no keyboard attached to the mux. Assume USB. */
xf86Msg(X_WARNING, "%s: No keyboard attached, assuming USB\n",
   pInfo->name);
pKbd->wsKbdType = WSKBD_TYPE_USB;
/* FALLTHROUGH */
+#endif
case WSKBD_TYPE_USB:
printWsType("USB", pInfo->name);
break;
@@ -484,6 +486,9 @@ OpenKeyboard(InputInfoPtr pInfo)
printWsType("Sun5", pInfo->name);
break;
 #endif
+#ifdef USE_WSKBD_GETMAP
+   case 0:
+#endif
default:
xf86Msg(X_WARNING, "%s: Unsupported wskbd type \"%d\"\n",
   pInfo->name, pKbd->wsKbdType);
@@ -506,7 +511,11 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
 pKbd->Bell		= SoundBell;
 pKbd->SetLeds	= SetKbdLeds;
 pKbd->GetLeds	= GetKbdLeds;
+#ifdef USE_WSKBD_GETMAP
+pKbd->KbdGetMapping	= KbdGetMappingFromWsksym;
+#else
 pKbd->KbdGetMapping	= KbdGetMapping;
+#endif
 
 pKbd->RemapScanCode = NULL;
 

Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.4 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.5
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h:1.4	Fri Jul 26 20:37:00 2013
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h	Tue Nov  7 14:29:00 2023
@@ -1,3 +1,7 @@
 extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
 CARD8 *pModMap);
+#ifdef USE_WSKBD_GETMAP
+extern void KbdGetMappingFromWsksym(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
+CARD8 *pModMap);
+#endif
 

Index: xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.8 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.9
--- xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.8	Sat Oct  2 04:28:54 2021
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c	Tue Nov  7 14:29:00 2023
@@ -310,6 +310,29 @@ KbdProc(DeviceIntPtr device, int what)
  pKbd->KbdGetMapping(pInfo, , modMap);
 
  device->public.on = FALSE;
+#ifdef USE_WSKBD_GETMAP
+ /* Use keySyms from device dependent ioctl rather than complex XKB */
+ rmlvo.rules = "base";
+ rmlvo.model = "empty";
+ rmlvo.layout = xkb_layout;
+ rmlvo.variant = xkb_variant;
+ rmlvo.options = xkb_options;
+
+ XkbSetRulesDflts();
+ if (!InitKeyboardDeviceStruct(device, NULL, KbdBell, KbdCtrl))
+ {
+ xf86Msg(X_ERROR, "%s: Keyboard initialization failed. This "
+ "could be a missing or incorrect setup of "
+ "xkeyboard-config.\n", device->name);
+
+ return BadValue;
+ }
+ /* Apply device dependent keySyms over "empty" XKB settings */
+ XkbApplyMappingChange(device, ,
+   keySyms.minKeyCode,
+   keySyms.maxKeyCode - keySyms.minKeyCode + 1,
+   modMap, serverClient);
+#else
  rmlvo.rules = xkb_rules;
  rmlvo.model = xkb_model;
  rmlvo.layout = xkb_layout;
@@ -324,6 +347,7 @@ KbdProc(DeviceIntPtr device, int 

CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src

[Izumi Tsutsui]

Module Name:xsrc
Committed By:   tsutsui
Date:   Tue Nov  7 14:29:01 UTC 2023

Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c bsd_kbd.h
kbd.c
Added Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: ws_KbdMap.c

Log Message:
xf86-input-keyboard: add suppport to get keymap via WSKBDIO_GETMAP ioctl(2).

No particular comment on tech-x11@:
 https://mail-index.netbsd.org/tech-x11/2023/10/31/msg002415.html
 https://mail-index.netbsd.org/tech-x11/2023/11/04/msg002416.html

Tested on NWS-3260 and NWS-3470 with Xorg 1.10 server in netbsd-9.
Worth to pullup to netbsd-10 and netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xf86-input-keyboard/dist/src/ws_KbdMap.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/xf86-video-pnozz/dist/src

[Julian Coleman]

Module Name:xsrc
Committed By:   jdc
Date:   Sun Nov  5 17:06:15 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c

Log Message:
Add NetBSD keyword.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.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-pnozz/dist/src/pnozz_exa.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.5 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.6
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.5	Sun Nov  5 17:01:05 2023
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c	Sun Nov  5 17:06:14 2023
@@ -29,6 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/* $NetBSD: pnozz_exa.c,v 1.6 2023/11/05 17:06:14 jdc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

CVS commit: xsrc/external/mit/xf86-video-pnozz/dist/src

[Julian Coleman]

Module Name:xsrc
Committed By:   jdc
Date:   Sun Nov  5 17:06:15 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c

Log Message:
Add NetBSD keyword.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.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/xf86-video-pnozz/dist/src

[Julian Coleman]

Module Name:xsrc
Committed By:   jdc
Date:   Sun Nov  5 17:01:05 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c

Log Message:
Revert r1.4.
The changes are minimal and they cause redraw problems (as reported by
Maxim Devaev on port-sparc).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.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/xf86-video-pnozz/dist/src

[Julian Coleman]

Module Name:xsrc
Committed By:   jdc
Date:   Sun Nov  5 17:01:05 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_exa.c

Log Message:
Revert r1.4.
The changes are minimal and they cause redraw problems (as reported by
Maxim Devaev on port-sparc).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.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-pnozz/dist/src/pnozz_exa.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.4 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.5
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c:1.4	Wed Jun  9 07:25:57 2021
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_exa.c	Sun Nov  5 17:01:05 2023
@@ -1,6 +1,7 @@
 /*
  * SBus Weitek P9100 EXA support
- *
+ */
+/*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -78,9 +79,11 @@ static CARD32 PnozzDrawROP[] = {
 #define waitReady(pPnozz) while((pnozz_read_4(pPnozz, ENGINE_STATUS) & \
 (ENGINE_BUSY | BLITTER_BUSY)) !=0 )
 
-/* From pnozz_accel.c */
+void PnozzInitEngine(PnozzPtr);
 void pnozz_write_colour(PnozzPtr pPnozz, int reg, CARD32 colour);
 
+extern CARD32 MaxClip, junk;
+
 static void
 PnozzWaitMarker(ScreenPtr pScreen, int Marker)
 {
@@ -107,10 +110,8 @@ PnozzPrepareCopy
 waitReady(pPnozz);
 pnozz_write_4(pPnozz, RASTER_OP, (PnozzCopyROP[alu] & 0xff));
 pnozz_write_4(pPnozz, PLANE_MASK, planemask);
-pPnozz->srcoff = exaGetPixmapOffset(pSrcPixmap);
+pPnozz->srcoff = exaGetPixmapOffset(pSrcPixmap) / pPnozz->width;
 
-if (exaGetPixmapPitch(pSrcPixmap) != exaGetPixmapPitch(pDstPixmap))
-	return FALSE;
 return TRUE;
 }
 
@@ -129,25 +130,24 @@ PnozzCopy
 ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
 PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
 CARD32 src, dst, srcw, dstw;
-int soff = pPnozz->srcoff / exaGetPixmapPitch(pDstPixmap);
-int doff = exaGetPixmapOffset(pDstPixmap) / exaGetPixmapPitch(pDstPixmap);
+int doff = exaGetPixmapOffset(pDstPixmap) / pPnozz->width;
 
 src = (((xSrc << pPnozz->depthshift) & 0x1fff) << 16) |
-	((ySrc + soff) & 0x1fff);
+	((ySrc + pPnozz->srcoff) & 0x1fff);
 dst = (((xDst << pPnozz->depthshift) & 0x1fff) << 16) |
 	((yDst + doff) & 0x1fff);
-srcw = xSrc + w) << pPnozz->depthshift) - 1) << 16) |
-	((ySrc + soff + h) & 0x1fff);
+srcw = xSrc + w) << pPnozz->depthshift) - 1) << 16) | 
+((ySrc + pPnozz->srcoff + h - 1) & 0x1fff);
 dstw = xDst + w) << pPnozz->depthshift) - 1) << 16) |
-	((yDst + doff + h) & 0x1fff);
+((yDst + doff + h - 1) & 0x1fff);
 
 waitReady(pPnozz);
+
 pnozz_write_4(pPnozz, ABS_XY0, src);
 pnozz_write_4(pPnozz, ABS_XY1, srcw);
 pnozz_write_4(pPnozz, ABS_XY2, dst);
 pnozz_write_4(pPnozz, ABS_XY3, dstw);
-pnozz_read_4(pPnozz, COMMAND_BLIT);
-
+junk = pnozz_read_4(pPnozz, COMMAND_BLIT);
 exaMarkSync(pDstPixmap->drawable.pScreen);
 }
 
@@ -172,8 +172,7 @@ PnozzPrepareSolid(
 
 waitReady(pPnozz);
 pnozz_write_colour(pPnozz, FOREGROUND_COLOR, fg);
-pnozz_write_colour(pPnozz, BACKGROUND_COLOR, fg);
-pnozz_write_4(pPnozz, RASTER_OP, ROP_PAT);
+pnozz_write_4(pPnozz, RASTER_OP, PnozzDrawROP[alu] & 0xff);
 pnozz_write_4(pPnozz, PLANE_MASK, planemask);
 pnozz_write_4(pPnozz, COORD_INDEX, 0);
 
@@ -190,18 +189,15 @@ PnozzSolid(
 {
 ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
 PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
-int doff = exaGetPixmapOffset(pPixmap);
+int w = x2 - x - 1;
+int h = y2 - y - 1;
 
 waitReady(pPnozz);
-pnozz_write_4(pPnozz, ABS_XY0, (((x + doff) & 0x1fff) << 16) |
-	(y & 0x1fff));
-pnozz_write_4(pPnozz, ABS_XY1, (((x + doff) & 0x1fff) << 16) |
-	(y2 & 0x1fff));
-pnozz_write_4(pPnozz, ABS_XY2, (((x2 + doff) & 0x1fff) << 16) |
-	(y2 & 0x1fff));
-pnozz_write_4(pPnozz, ABS_XY3, (((x2 + doff) & 0x1fff) << 16) |
-	(y & 0x1fff));
-pnozz_read_4(pPnozz, COMMAND_QUAD);
+pnozz_write_4(pPnozz, RECT_RTW_XY, ((x & 0x1fff) << 16) | 
+(y & 0x1fff));
+pnozz_write_4(pPnozz, RECT_RTP_XY, (((w & 0x1fff) << 16) | 
+(h & 0x1fff)));
+junk = pnozz_read_4(pPnozz, COMMAND_QUAD);
 exaMarkSync(pPixmap->drawable.pScreen);
 }
 
@@ -212,6 +208,8 @@ PnozzEXAInit(ScreenPtr pScreen)
 PnozzPtr pPnozz = GET_PNOZZ_FROM_SCRN(pScrn);
 ExaDriverPtr pExa;
 
+PnozzInitEngine(pPnozz);
+
 pExa = exaDriverAlloc();
 if (!pExa)
 	return FALSE;
@@ -225,8 +223,7 @@ PnozzEXAInit(ScreenPtr pScreen)
 
 /* round to multiple of pixmap pitch */
 pExa->memorySize = (pPnozz->vidmem / pPnozz->width) * pPnozz->width;
-pExa->offScreenBase = pPnozz->width * pPnozz->height *
-	

CVS commit: xsrc/external/mit/libdrm/dist

[Patrick Welche]

Module Name:xsrc
Committed By:   prlw1
Date:   Fri Nov  3 17:05:42 UTC 2023

Modified Files:
xsrc/external/mit/libdrm/dist: configure

Log Message:
We already have libdrm 2.4.114 :-)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/configure

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

CVS commit: xsrc/external/mit/libdrm/dist

[Patrick Welche]

Module Name:xsrc
Committed By:   prlw1
Date:   Fri Nov  3 17:05:42 UTC 2023

Modified Files:
xsrc/external/mit/libdrm/dist: configure

Log Message:
We already have libdrm 2.4.114 :-)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/configure

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/configure
diff -u xsrc/external/mit/libdrm/dist/configure:1.4 xsrc/external/mit/libdrm/dist/configure:1.5
--- xsrc/external/mit/libdrm/dist/configure:1.4	Thu Mar 17 09:10:42 2022
+++ xsrc/external/mit/libdrm/dist/configure	Fri Nov  3 17:05:41 2023
@@ -3,6 +3,6 @@
 # Identity of this package.
 PACKAGE_NAME='libdrm'
 PACKAGE_TARNAME='libdrm'
-PACKAGE_VERSION='2.4.109'
-PACKAGE_STRING='libdrm 2.4.109'
+PACKAGE_VERSION='2.4.114'
+PACKAGE_STRING='libdrm 2.4.114'
 PACKAGE_URL=''

CVS commit: xsrc/external/mit/xorg-server.old/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 28 18:44:38 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server.old/dist/Xi: xiproperty.c
xsrc/external/mit/xorg-server.old/dist/dix: enterleave.h
xsrc/external/mit/xorg-server.old/dist/include: eventstr.h
xsrc/external/mit/xorg-server.old/dist/mi: mipointer.c
xsrc/external/mit/xorg-server.old/dist/os: auth.c
xsrc/external/mit/xorg-server.old/dist/randr: rrproperty.c

Log Message:
merge security fixes from xorg-server 21.1.9 into xorg-server 10.

Fixes CVE-2023-5367 and CVE-2023-5380.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/include/eventstr.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server.old/dist/os/auth.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/randr/rrproperty.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/xorg-server.old/dist/Xi/xiproperty.c
diff -u xsrc/external/mit/xorg-server.old/dist/Xi/xiproperty.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/Xi/xiproperty.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/Xi/xiproperty.c:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/Xi/xiproperty.c	Sat Oct 28 18:44:37 2023
@@ -753,7 +753,7 @@ XIChangeDeviceProperty (DeviceIntPtr dev
 XIDestroyDeviceProperty (prop);
 return BadAlloc;
 }
-new_value.size = len;
+new_value.size = total_len;
 new_value.type = type;
 new_value.format = format;
 
@@ -770,7 +770,7 @@ XIChangeDeviceProperty (DeviceIntPtr dev
 case PropModePrepend:
 new_data = new_value.data;
 old_data = (pointer) (((char *) new_value.data) +
-  (prop_value->size * size_in_bytes));
+  (len * size_in_bytes));
 break;
 }
 if (new_data)

Index: xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h
diff -u xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h	Sat Oct 28 18:44:37 2023
@@ -76,8 +76,6 @@ extern void EnterWindow(DeviceIntPtr dev
 WindowPtr win,
 int mode);
 
-extern void LeaveWindow(DeviceIntPtr dev);
-
 extern void CoreFocusEvent(DeviceIntPtr kbd,
int type,
int mode,

Index: xsrc/external/mit/xorg-server.old/dist/include/eventstr.h
diff -u xsrc/external/mit/xorg-server.old/dist/include/eventstr.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/include/eventstr.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/include/eventstr.h:1.1.1.1	Thu Jun  9 09:08:00 2016
+++ xsrc/external/mit/xorg-server.old/dist/include/eventstr.h	Sat Oct 28 18:44:37 2023
@@ -243,4 +243,7 @@ union _InternalEvent {
 #endif
 };
 
+extern void
+LeaveWindow(DeviceIntPtr dev);
+
 #endif

Index: xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c
diff -u xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c:1.1.1.1	Thu Jun  9 09:08:00 2016
+++ xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c	Sat Oct 28 18:44:38 2023
@@ -41,6 +41,8 @@ in this Software without prior written a
 # include   "inputstr.h"
 # include   "inpututils.h"
 
+# include   "eventstr.h"
+
 DevPrivateKeyRec miPointerScreenKeyRec;
 
 #define GetScreenPrivate(s) ((miPointerScreenPtr) \
@@ -318,8 +320,21 @@ miPointerWarpCursor (DeviceIntPtr pDev, 
 #ifdef PANORAMIX
 && noPanoramiXExtension
 #endif
-   )
-UpdateSpriteForScreen (pDev, pScreen) ;
+   ) {
+DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER);
+/* Hack for CVE-2023-5380: if we're moving
+ * screens PointerWindows[] keeps referring to the
+ * old window. If that gets destroyed we have a UAF
+ * bug later. Only happens when jumping from a window
+ * to the root window on the other screen.
+ * Enter/Leave events are incorrect for that case but
+ * too niche to fix.
+ */
+LeaveWindow(pDev);
+if (master)
+LeaveWindow(master);
+UpdateSpriteForScreen(pDev, pScreen);
+}
 }
 
 /*

Index: 

CVS commit: xsrc/external/mit/xorg-server.old/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Oct 28 18:44:38 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server.old/dist/Xi: xiproperty.c
xsrc/external/mit/xorg-server.old/dist/dix: enterleave.h
xsrc/external/mit/xorg-server.old/dist/include: eventstr.h
xsrc/external/mit/xorg-server.old/dist/mi: mipointer.c
xsrc/external/mit/xorg-server.old/dist/os: auth.c
xsrc/external/mit/xorg-server.old/dist/randr: rrproperty.c

Log Message:
merge security fixes from xorg-server 21.1.9 into xorg-server 10.

Fixes CVE-2023-5367 and CVE-2023-5380.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/dix/enterleave.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/include/eventstr.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/mi/mipointer.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server.old/dist/os/auth.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/randr/rrproperty.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/xorg-server

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Oct 25 04:35:07 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: xiproperty.c
xsrc/external/mit/xorg-server/dist/include: os.h
xsrc/external/mit/xorg-server/dist/os: auth.c
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
merge xorg-server 21.1.9.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/auth.c
cvs rdiff -u -r1.50 -r1.51 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.30 -r1.31 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.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/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.17 xsrc/external/mit/xorg-server/dist/configure:1.18
--- xsrc/external/mit/xorg-server/dist/configure:1.17	Thu Mar 30 23:04:22 2023
+++ xsrc/external/mit/xorg-server/dist/configure	Wed Oct 25 04:35:07 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xorg-server 21.1.8.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.9.
 #
 # Report bugs to .
 #
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.8'
-PACKAGE_STRING='xorg-server 21.1.8'
+PACKAGE_VERSION='21.1.9'
+PACKAGE_STRING='xorg-server 21.1.9'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -1048,6 +1048,8 @@ FBDEVHW_FALSE
 FBDEVHW_TRUE
 AGP_FALSE
 AGP_TRUE
+LIBBSD_LIBS
+LIBBSD_CFLAGS
 POLL_FALSE
 POLL_TRUE
 LIBOBJS
@@ -1392,6 +1394,8 @@ LT_SYS_LIBRARY_PATH
 YACC
 YFLAGS
 CPP
+LIBBSD_CFLAGS
+LIBBSD_LIBS
 PIXMAN_CFLAGS
 PIXMAN_LIBS
 SYSTEMD_DAEMON_CFLAGS
@@ -2000,7 +2004,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 21.1.8 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2071,7 +2075,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.8:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.9:";;
esac
   cat <<\_ACEOF
 
@@ -2256,10 +2260,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.8)
+  (default: 21.1.9)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.8)
+  CFBundleShortVersionString (default: 21.1.9)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2303,6 +2307,9 @@ Some influential environment variables:
   This script will default YFLAGS to the empty string to avoid a
   default value of `-d' given by some make applications.
   CPP C preprocessor
+  LIBBSD_CFLAGS
+  C compiler flags for LIBBSD, overriding pkg-config
+  LIBBSD_LIBS linker flags for LIBBSD, overriding pkg-config
   PIXMAN_CFLAGS
   C compiler flags for PIXMAN, overriding pkg-config
   PIXMAN_LIBS linker flags for PIXMAN, overriding pkg-config
@@ -2473,7 +2480,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.8
+xorg-server configure 21.1.9
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3130,7 +3137,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 21.1.8, which was
+It was created by xorg-server $as_me 21.1.9, which was
 

CVS commit: xsrc/external/mit/xorg-server

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Oct 25 04:35:07 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: xiproperty.c
xsrc/external/mit/xorg-server/dist/include: os.h
xsrc/external/mit/xorg-server/dist/os: auth.c
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
merge xorg-server 21.1.9.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/os/auth.c
cvs rdiff -u -r1.50 -r1.51 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.30 -r1.31 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.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/ctwm/dist

[Michael van Elst]

Module Name:xsrc
Committed By:   mlelstv
Date:   Fri Oct 20 10:18:56 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: signals.c

Log Message:
Use a SIGCHLD handler instead of ignoring the signal.

This avoids lockups when child processes were inherited (e.g. from .xsession)
but new children are waited for in system().


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/ctwm/dist/signals.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/ctwm/dist/signals.c
diff -u xsrc/external/mit/ctwm/dist/signals.c:1.1.1.1 xsrc/external/mit/ctwm/dist/signals.c:1.2
--- xsrc/external/mit/ctwm/dist/signals.c:1.1.1.1	Wed Jul  5 07:36:07 2023
+++ xsrc/external/mit/ctwm/dist/signals.c	Fri Oct 20 10:18:55 2023
@@ -8,6 +8,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include "ctwm_shutdown.h"
 #include "signals.h"
@@ -26,6 +28,15 @@ static bool sig_shutdown = false;
 // needs to trigger an action.
 bool SignalFlag = false;
 
+void ChildExit(int signum)
+{
+	int Errno = errno;
+	/* reap dead children, ignore status */
+	while (waitpid(-1, NULL, WNOHANG) > 0)
+		continue;
+	/* restore errno for interrupted sys calls */
+	errno = Errno;
+}
 
 /**
  * Setup signal handlers (run during startup)
@@ -46,9 +57,12 @@ setup_signal_handlers(void)
 	// die...
 	signal(SIGALRM, SIG_IGN);
 
-	// This should be set by default, but just in case; explicitly don't
-	// leave zombies.
-	signal(SIGCHLD, SIG_IGN);
+	/* Setting SIGCHLD to SIG_IGN detaches children from the parent
+	 * immediately, so it need not be waited for.
+	 * In fact, you cannot wait for it, so a function like system()
+	 * breaks.
+	 */
+	signal(SIGCHLD, ChildExit);
 
 	return;
 }

CVS commit: xsrc/external/mit/ctwm/dist

[Michael van Elst]

Module Name:xsrc
Committed By:   mlelstv
Date:   Fri Oct 20 10:18:56 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: signals.c

Log Message:
Use a SIGCHLD handler instead of ignoring the signal.

This avoids lockups when child processes were inherited (e.g. from .xsession)
but new children are waited for in system().


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/ctwm/dist/signals.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 

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/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep  5 18:26:12 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50:
nv50_query_hw_metric.c

Log Message:
adjust the prototype for sm11_hw_metric_calc_result() to reality.

it used to say res64[8] but was passed a res64[4], and only accessed
the first 4 elements anyway.

already fixed the same in newer Mesa.  fixes GCC 12 warning.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \

xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.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/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
diff -u xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c:1.1.1.1	Sun Jul 11 20:36:26 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c	Tue Sep  5 18:26:12 2023
@@ -102,7 +102,7 @@ nv50_hw_metric_end_query(struct nv50_con
 }
 
 static uint64_t
-sm11_hw_metric_calc_result(struct nv50_hw_query *hq, uint64_t res64[8])
+sm11_hw_metric_calc_result(struct nv50_hw_query *hq, uint64_t res64[4])
 {
switch (hq->base.type - NV50_HW_METRIC_QUERY(0)) {
case NV50_HW_METRIC_QUERY_BRANCH_EFFICIENCY:

CVS commit: xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep  5 18:26:12 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50:
nv50_query_hw_metric.c

Log Message:
adjust the prototype for sm11_hw_metric_calc_result() to reality.

it used to say res64[8] but was passed a res64[4], and only accessed
the first 4 elements anyway.

already fixed the same in newer Mesa.  fixes GCC 12 warning.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \

xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.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/luit/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 11 18:34:32 UTC 2023

Modified Files:
xsrc/external/mit/luit/dist: luit.c

Log Message:
don't try to free(argv) from main.  free(child_argv) instead.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/luit/dist/luit.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/luit/dist/luit.c
diff -u xsrc/external/mit/luit/dist/luit.c:1.1.1.4 xsrc/external/mit/luit/dist/luit.c:1.2
--- xsrc/external/mit/luit/dist/luit.c:1.1.1.4	Wed Jul 22 07:50:41 2015
+++ xsrc/external/mit/luit/dist/luit.c	Fri Aug 11 18:34:32 2023
@@ -363,8 +363,8 @@ parseArgs(int argc, char **argv,
   bail:
 if (path)
 	free(path);
-if (argv)
-	free(argv);
+if (child_argv)
+	free(child_argv);
 return -1;
 }
 

CVS commit: xsrc/external/mit/luit/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 11 18:34:32 UTC 2023

Modified Files:
xsrc/external/mit/luit/dist: luit.c

Log Message:
don't try to free(argv) from main.  free(child_argv) instead.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/luit/dist/luit.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/ctwm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 11 18:32:46 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: menus.c

Log Message:
redo previous change which didn't actually avoid the truncation.

increase the definition of MSLEN so that the size check fits the
maximum actual string definition.  also reduces diff vs upstream
to just one 1 line.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/ctwm/dist/menus.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/ctwm/dist/menus.c
diff -u xsrc/external/mit/ctwm/dist/menus.c:1.12 xsrc/external/mit/ctwm/dist/menus.c:1.13
--- xsrc/external/mit/ctwm/dist/menus.c:1.12	Fri Jul 28 14:27:35 2023
+++ xsrc/external/mit/ctwm/dist/menus.c	Fri Aug 11 18:32:46 2023
@@ -1658,8 +1658,8 @@ mk_twmkeys_entry(const FuncKey *key)
 {
 	char *ret;
 	// S+  C+  5(Mx+)  5(Ax+)
-#define MSLEN (2 + 2 + 5 * 3 + 5 * 3)
-	char modStr[64];
+#define MSLEN (2 + 2 + 2 + 5 * 3 + 5 * 3 + 1 + 26)
+	char modStr[MSLEN + 1];
 	char *modStrCur = modStr;
 
 	// Init

CVS commit: xsrc/external/mit/ctwm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 11 18:32:46 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: menus.c

Log Message:
redo previous change which didn't actually avoid the truncation.

increase the definition of MSLEN so that the size check fits the
maximum actual string definition.  also reduces diff vs upstream
to just one 1 line.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/ctwm/dist/menus.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/ctwm/dist

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Fri Jul 28 14:27:35 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: menus.c

Log Message:
Gcc complains about overflow writing 53 bytes into a region of size 35,
and it is correct for the alphabet copying line, which correctly comments
about the overflow too.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/ctwm/dist/menus.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/ctwm/dist

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Fri Jul 28 14:27:35 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: menus.c

Log Message:
Gcc complains about overflow writing 53 bytes into a region of size 35,
and it is correct for the alphabet copying line, which correctly comments
about the overflow too.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/ctwm/dist/menus.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/ctwm/dist/menus.c
diff -u xsrc/external/mit/ctwm/dist/menus.c:1.11 xsrc/external/mit/ctwm/dist/menus.c:1.12
--- xsrc/external/mit/ctwm/dist/menus.c:1.11	Wed Jul  5 04:39:10 2023
+++ xsrc/external/mit/ctwm/dist/menus.c	Fri Jul 28 10:27:35 2023
@@ -1659,7 +1659,7 @@ mk_twmkeys_entry(const FuncKey *key)
 	char *ret;
 	// S+  C+  5(Mx+)  5(Ax+)
 #define MSLEN (2 + 2 + 5 * 3 + 5 * 3)
-	char modStr[MSLEN + 1];
+	char modStr[64];
 	char *modStrCur = modStr;
 
 	// Init

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 22:01:36 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
sizeof() returns size_t type.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.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/dist/src/util/u_cpu_detect.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.1.1.3 xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c:1.1.1.3	Mon May  9 01:23:43 2022
+++ xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.c	Sun Jul 16 22:01:35 2023
@@ -623,7 +623,7 @@ util_cpu_detect_once(void)
if (available_cpus == 0) {
   const int mib[] = { CTL_HW, HW_NCPUONLINE };
   int ncpu;
-  int len = sizeof(ncpu);
+  size_t len = sizeof(ncpu);
 
   sysctl(mib, 2, , , NULL, 0);
   available_cpus = ncpu;

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 22:01:36 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_cpu_detect.c

Log Message:
sizeof() returns size_t type.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_cpu_detect.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/MesaLib/dist/src/gallium/drivers/radeon

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:58:14 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon:
radeon_vcn_enc.c

Log Message:
Fix enum name in cast.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.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/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c:1.4 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c:1.5
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c:1.4	Mon May  9 01:27:23 2022
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.c	Sun Jul 16 21:58:14 2023
@@ -103,7 +103,7 @@ static void radeon_vcn_enc_get_param(str
   }
} else if (u_reduce_video_profile(picture->profile) == PIPE_VIDEO_FORMAT_HEVC) {
   struct pipe_h265_enc_picture_desc *pic = (struct pipe_h265_enc_picture_desc *)picture;
-  enc->enc_pic.picture_type = (enum pipe_h264_enc_picture_type)pic->picture_type;
+  enc->enc_pic.picture_type = (enum pipe_h2645_enc_picture_type)pic->picture_type;
   enc->enc_pic.frame_num = pic->frame_num;
   enc->enc_pic.pic_order_cnt = pic->pic_order_cnt;
   enc->enc_pic.pic_order_cnt_type = pic->pic_order_cnt_type;

CVS commit: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:58:14 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon:
radeon_vcn_enc.c

Log Message:
Fix enum name in cast.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon/radeon_vcn_enc.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/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:55:45 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_printf.h

Log Message:
include cstdarg for va_list

Copied from graphics/MesaLib pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_printf.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/dist/src/util/u_printf.h
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_printf.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/util/u_printf.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/util/u_printf.h:1.1.1.1	Mon May  9 01:23:43 2022
+++ xsrc/external/mit/MesaLib/dist/src/util/u_printf.h	Sun Jul 16 21:55:45 2023
@@ -25,6 +25,7 @@
 #ifdef __cplusplus
 
 #include 
+#include 
 
 /* find next valid printf specifier in a C++ std::string */
 size_t util_printf_next_spec_pos(const std::string , size_t pos);

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:55:45 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_printf.h

Log Message:
include cstdarg for va_list

Copied from graphics/MesaLib pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_printf.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/MesaLib/dist/src/gallium/auxiliary/gallivm

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:54:34 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm:
lp_bld_misc.cpp

Log Message:
setOverrideStackAlignment() isn't in our llvm runtime library.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.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/MesaLib/dist/src/gallium/auxiliary/gallivm

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:54:34 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm:
lp_bld_misc.cpp

Log Message:
setOverrideStackAlignment() isn't in our llvm runtime library.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.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/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.3 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.4
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:1.3	Mon May  9 01:27:18 2022
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp	Sun Jul 16 21:54:33 2023
@@ -619,8 +619,10 @@ lp_is_function(LLVMValueRef v)
 extern "C" void
 lp_set_module_stack_alignment_override(LLVMModuleRef MRef, unsigned align)
 {
+#if 0
 #if LLVM_VERSION_MAJOR >= 13
llvm::Module *M = llvm::unwrap(MRef);
M->setOverrideStackAlignment(align);
 #endif
+#endif
 }

CVS commit: xsrc/external/mit/MesaLib/src

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:41:57 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/src/amd/common: sid_tables.h
xsrc/external/mit/MesaLib/src/compiler: ir_expression_operation.h
xsrc/external/mit/MesaLib/src/compiler/glsl: float64_glsl.h
glsl_lexer.cpp glsl_parser.cpp glsl_parser.h
ir_expression_operation_constant.h
ir_expression_operation_strings.h
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp: glcpp-lex.c
glcpp-parse.c glcpp-parse.h
xsrc/external/mit/MesaLib/src/compiler/nir: nir_builder_opcodes.h
nir_constant_expressions.c nir_intrinsics.c nir_intrinsics.h
nir_opcodes.c nir_opcodes.h nir_opt_algebraic.c
xsrc/external/mit/MesaLib/src/compiler/spirv: spirv_info.c
vtn_gather_types.c
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_indices_gen.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen11_pack.h gen45_pack.h
gen4_pack.h gen5_pack.h gen6_pack.h gen75_pack.h gen7_pack.h
gen8_pack.h gen9_pack.h genX_bits.h genX_xml.h
xsrc/external/mit/MesaLib/src/mesa: format_info.h get_hash.h
xsrc/external/mit/MesaLib/src/mesa/main: dispatch.h marshal_generated.h
remap_helper.h
xsrc/external/mit/MesaLib/src/mesa/program: program_parse.tab.c
program_parse.tab.h
xsrc/external/mit/MesaLib/src/util: format_srgb.c
Added Files:
xsrc/external/mit/MesaLib/src: git_sha1.h
xsrc/external/mit/MesaLib/src/amd/common: amdgfxregs.h
gfx10_format_table.c
xsrc/external/mit/MesaLib/src/compiler/nir: nir_intrinsics_indices.h
xsrc/external/mit/MesaLib/src/compiler/spirv: vtn_generator_ids.h
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_tracepoints.c
u_tracepoints.h
xsrc/external/mit/MesaLib/src/gallium/drivers/lima:
lima_nir_algebraic.c
xsrc/external/mit/MesaLib/src/gallium/frontends/xa: xa_tracker.h
xsrc/external/mit/MesaLib/src/intel/compiler:
brw_nir_trig_workarounds.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen125_pack.h gen12_pack.h
gen_rt_pack.h
xsrc/external/mit/MesaLib/src/intel/isl: isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: intel_perf_metrics.c
intel_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi/es1api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/es2api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi/gen: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated0.c
marshal_generated1.c marshal_generated2.c marshal_generated3.c
marshal_generated4.c marshal_generated5.c marshal_generated6.c
marshal_generated7.c
xsrc/external/mit/MesaLib/src/mapi/shared-glapi: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mesa: format_fallback.c
xsrc/external/mit/MesaLib/src/mesa/program: lex.yy.c
xsrc/external/mit/MesaLib/src/panfrost/bifrost: bi_builder.h
bi_opcodes.c bi_opcodes.h bi_packer.c bi_printer.c
bifrost_gen_disasm.c bifrost_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/lib/genxml: common_pack.h
v4_pack.h v5_pack.h v6_pack.h v7_pack.h
xsrc/external/mit/MesaLib/src/panfrost/midgard: midgard_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/perf: pan_perf_metrics.c
pan_perf_metrics.h
xsrc/external/mit/MesaLib/src/util: driconf_static.h
xsrc/external/mit/MesaLib/src/util/format: u_format_pack.h
u_format_table.c
Removed Files:
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_format_table.c
xsrc/external/mit/MesaLib/src/intel: brw_nir_trig_workarounds.c
isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: gen_perf_metrics.c
gen_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi: shared-glapi_glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated.c
xsrc/external/mit/MesaLib/src/mesa: matypes.h
xsrc/external/mit/MesaLib/src/mesa/main: Makefile format_fallback.c
format_pack.c format_unpack.c git_sha1.h
xsrc/external/mit/MesaLib/src/mesa/program: Makefile
xsrc/external/mit/MesaLib/src/util: Makefile
xsrc/external/mit/MesaLib/src/util/xmlpool: options.h

Log Message:
Update generated files to match 21.3.7.

Created using a dummy pkg.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/git_sha1.h
cvs rdiff -u -r0 -r1.1 

CVS commit: xsrc/external/mit/MesaLib/src

[Robert Swindells]

Module Name:xsrc
Committed By:   rjs
Date:   Sun Jul 16 21:41:57 UTC 2023

Modified Files:
xsrc/external/mit/MesaLib/src/amd/common: sid_tables.h
xsrc/external/mit/MesaLib/src/compiler: ir_expression_operation.h
xsrc/external/mit/MesaLib/src/compiler/glsl: float64_glsl.h
glsl_lexer.cpp glsl_parser.cpp glsl_parser.h
ir_expression_operation_constant.h
ir_expression_operation_strings.h
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp: glcpp-lex.c
glcpp-parse.c glcpp-parse.h
xsrc/external/mit/MesaLib/src/compiler/nir: nir_builder_opcodes.h
nir_constant_expressions.c nir_intrinsics.c nir_intrinsics.h
nir_opcodes.c nir_opcodes.h nir_opt_algebraic.c
xsrc/external/mit/MesaLib/src/compiler/spirv: spirv_info.c
vtn_gather_types.c
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_indices_gen.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen11_pack.h gen45_pack.h
gen4_pack.h gen5_pack.h gen6_pack.h gen75_pack.h gen7_pack.h
gen8_pack.h gen9_pack.h genX_bits.h genX_xml.h
xsrc/external/mit/MesaLib/src/mesa: format_info.h get_hash.h
xsrc/external/mit/MesaLib/src/mesa/main: dispatch.h marshal_generated.h
remap_helper.h
xsrc/external/mit/MesaLib/src/mesa/program: program_parse.tab.c
program_parse.tab.h
xsrc/external/mit/MesaLib/src/util: format_srgb.c
Added Files:
xsrc/external/mit/MesaLib/src: git_sha1.h
xsrc/external/mit/MesaLib/src/amd/common: amdgfxregs.h
gfx10_format_table.c
xsrc/external/mit/MesaLib/src/compiler/nir: nir_intrinsics_indices.h
xsrc/external/mit/MesaLib/src/compiler/spirv: vtn_generator_ids.h
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_tracepoints.c
u_tracepoints.h
xsrc/external/mit/MesaLib/src/gallium/drivers/lima:
lima_nir_algebraic.c
xsrc/external/mit/MesaLib/src/gallium/frontends/xa: xa_tracker.h
xsrc/external/mit/MesaLib/src/intel/compiler:
brw_nir_trig_workarounds.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen125_pack.h gen12_pack.h
gen_rt_pack.h
xsrc/external/mit/MesaLib/src/intel/isl: isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: intel_perf_metrics.c
intel_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi/es1api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/es2api: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi/gen: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated0.c
marshal_generated1.c marshal_generated2.c marshal_generated3.c
marshal_generated4.c marshal_generated5.c marshal_generated6.c
marshal_generated7.c
xsrc/external/mit/MesaLib/src/mapi/shared-glapi: glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mesa: format_fallback.c
xsrc/external/mit/MesaLib/src/mesa/program: lex.yy.c
xsrc/external/mit/MesaLib/src/panfrost/bifrost: bi_builder.h
bi_opcodes.c bi_opcodes.h bi_packer.c bi_printer.c
bifrost_gen_disasm.c bifrost_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/lib/genxml: common_pack.h
v4_pack.h v5_pack.h v6_pack.h v7_pack.h
xsrc/external/mit/MesaLib/src/panfrost/midgard: midgard_nir_algebraic.c
xsrc/external/mit/MesaLib/src/panfrost/perf: pan_perf_metrics.c
pan_perf_metrics.h
xsrc/external/mit/MesaLib/src/util: driconf_static.h
xsrc/external/mit/MesaLib/src/util/format: u_format_pack.h
u_format_table.c
Removed Files:
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_format_table.c
xsrc/external/mit/MesaLib/src/intel: brw_nir_trig_workarounds.c
isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/perf: gen_perf_metrics.c
gen_perf_metrics.h
xsrc/external/mit/MesaLib/src/mapi: shared-glapi_glapi_mapi_tmp.h
xsrc/external/mit/MesaLib/src/mapi/glapi: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated.c
xsrc/external/mit/MesaLib/src/mesa: matypes.h
xsrc/external/mit/MesaLib/src/mesa/main: Makefile format_fallback.c
format_pack.c format_unpack.c git_sha1.h
xsrc/external/mit/MesaLib/src/mesa/program: Makefile
xsrc/external/mit/MesaLib/src/util: Makefile
xsrc/external/mit/MesaLib/src/util/xmlpool: options.h

Log Message:
Update generated files to match 21.3.7.

Created using a dummy pkg.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/git_sha1.h
cvs rdiff -u -r0 -r1.1 

CVS commit: xsrc/external/mit/ctwm/dist

[Nia Alarie]

Module Name:xsrc
Committed By:   nia
Date:   Wed Jul  5 08:39:10 UTC 2023

Modified Files:
xsrc/external/mit/ctwm/dist: add_window.c ctwm.1 ctwm.h ctwm_atoms.c
ctwm_atoms.h ctwm_config.h cursor.c deftwmrc.c event_names_table.h
ewmh_atoms.c ewmh_atoms.h functions_deferral.h functions_defs.h
functions_dispatch_execution.h functions_parse_table.h gram.y
iconmgr.c iconmgr.h icons.c list.c menus.c menus.h parse.c screen.h
session.c session.h types.h util.c util.h version.c vscreen.c
vscreen.h windowbox.c
Added Files:
xsrc/external/mit/ctwm/dist: gram.tab.c gram.tab.h

Log Message:
Merge ctwm-4.1.0


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/ctwm/dist/add_window.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/ctwm/dist/ctwm.1 \
xsrc/external/mit/ctwm/dist/ctwm.h xsrc/external/mit/ctwm/dist/cursor.c \
xsrc/external/mit/ctwm/dist/gram.y xsrc/external/mit/ctwm/dist/iconmgr.c \
xsrc/external/mit/ctwm/dist/iconmgr.h xsrc/external/mit/ctwm/dist/icons.c \
xsrc/external/mit/ctwm/dist/list.c xsrc/external/mit/ctwm/dist/menus.h \
xsrc/external/mit/ctwm/dist/screen.h \
xsrc/external/mit/ctwm/dist/session.h xsrc/external/mit/ctwm/dist/types.h \
xsrc/external/mit/ctwm/dist/util.h xsrc/external/mit/ctwm/dist/version.c \
xsrc/external/mit/ctwm/dist/vscreen.h \
xsrc/external/mit/ctwm/dist/windowbox.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/ctwm/dist/ctwm_atoms.c \
xsrc/external/mit/ctwm/dist/ctwm_atoms.h \
xsrc/external/mit/ctwm/dist/ctwm_config.h \
xsrc/external/mit/ctwm/dist/deftwmrc.c \
xsrc/external/mit/ctwm/dist/event_names_table.h \
xsrc/external/mit/ctwm/dist/ewmh_atoms.c \
xsrc/external/mit/ctwm/dist/ewmh_atoms.h \
xsrc/external/mit/ctwm/dist/functions_deferral.h \
xsrc/external/mit/ctwm/dist/functions_defs.h \
xsrc/external/mit/ctwm/dist/functions_dispatch_execution.h \
xsrc/external/mit/ctwm/dist/functions_parse_table.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/ctwm/dist/gram.tab.c
cvs rdiff -u -r0 -r1.4 xsrc/external/mit/ctwm/dist/gram.tab.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/ctwm/dist/menus.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/ctwm/dist/parse.c \
xsrc/external/mit/ctwm/dist/vscreen.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/ctwm/dist/session.c \
xsrc/external/mit/ctwm/dist/util.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/fontconfig

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jun 20 02:21:56 UTC 2023

Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
xsrc/external/mit/fontconfig/dist/src: fccache.c fccfg.c fcint.h
fcname.c
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcobjshash.h
Removed Files:
xsrc/external/mit/fontconfig/dist/conf.d: 10-no-sub-pixel.conf

Log Message:
merge fontconfig 2.14.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.5 -r1.6 \

xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fccfg.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/include/fcobjshash.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/fontconfig/dist/doc/FcLangSetGetLangs.3
diff -u xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.7 xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.8
--- xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.7	Sat Jan 21 02:10:38 2023
+++ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3	Tue Jun 20 02:21:56 2023
@@ -1,5 +1,5 @@
 .\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "21 10月 2022" "Fontconfig 2.14.1" ""
+.TH "FcLangSetGetLangs" "3" "27 1月 2023" "Fontconfig 2.14.2" ""
 .SH NAME
 FcLangSetGetLangs \- get the list of languages in the langset
 .SH SYNOPSIS

Index: xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
diff -u xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.5 xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.6
--- xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html:1.5	Fri Mar  8 09:49:07 2019
+++ xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html	Tue Jun 20 02:21:56 2023
@@ -103,7 +103,7 @@ WIDTH="100%"
 >#include fontconfig/fontconfig.h
-	langset.
-	cacheDirs);
 if (!list)
 return FcFalse;
-	
+
 while ((cache_dir = FcStrListNext (list)))
 {
 FcChar8	*cache_hashed;
@@ -814,20 +814,17 @@ FcCacheFini (void)
 {
 int		i;
 
-for (i = 0; i < FC_CACHE_MAX_LEVEL; i++)
+if (FcDebug() & FC_DBG_CACHE)
 {
-	if (FcDebug() & FC_DBG_CACHE)
+	for (i = 0; i < FC_CACHE_MAX_LEVEL; i++)
 	{
 	if (fcCacheChains[i] != NULL)
 	{
 		FcCacheSkip *s = fcCacheChains[i];
-		printf("Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count);
+		fprintf(stderr, "Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count);
 	}
 	}
-	else
-	assert (fcCacheChains[i] == NULL);
 }
-assert (fcCacheMaxLevel == 0);
 
 free_lock ();
 }
@@ -1039,7 +1036,7 @@ FcDirCacheMapFd (FcConfig *config, int f
 /* Mark allocated caches so they're freed rather than unmapped */
 if (allocated)
 	cache->magic = FC_CACHE_MAGIC_ALLOC;
-	
+
 return cache;
 }
 
@@ -1731,7 +1728,7 @@ FcCacheCopySet args1(const FcCache *c)
 for (i = 0; i < old->nfont; i++)
 {
 	FcPattern   *font = FcFontSetFont (old, i);
-	
+
 	FcPatternReference (font);
 	if (!FcFontSetAdd (new, font))
 	{

Index: xsrc/external/mit/fontconfig/dist/src/fccfg.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.5 xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.6
--- xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.5	Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/dist/src/fccfg.c	Tue Jun 20 02:21:56 2023
@@ -362,40 +362,43 @@ FcConfigDestroy (FcConfig *config)
 FcExprPage	*page;
 FcMatchKind	k;
 
-if (FcRefDec (>ref) != 1)
-	return;
+if (config)
+{
+	if (FcRefDec (>ref) != 1)
+	return;
 
-(void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL);
+	(void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL);
 
-FcStrSetDestroy (config->configDirs);
-FcStrSetDestroy (config->configMapDirs);
-FcStrSetDestroy (config->fontDirs);
-FcStrSetDestroy (config->cacheDirs);
-FcStrSetDestroy (config->configFiles);
-FcStrSetDestroy (config->acceptGlobs);
-

CVS commit: xsrc/external/mit/fontconfig

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jun 20 02:21:56 UTC 2023

Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
xsrc/external/mit/fontconfig/dist/src: fccache.c fccfg.c fcint.h
fcname.c
xsrc/external/mit/fontconfig/include: fcalias.h fcaliastail.h
fcobjshash.h
Removed Files:
xsrc/external/mit/fontconfig/dist/conf.d: 10-no-sub-pixel.conf

Log Message:
merge fontconfig 2.14.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.5 -r1.6 \

xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fccfg.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/include/fcalias.h \
xsrc/external/mit/fontconfig/include/fcaliastail.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/include/fcobjshash.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/xterm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jun 20 02:07:22 UTC 2023

Modified Files:
xsrc/external/mit/xterm/dist: XTerm.ad fontutils.c graphics_sixel.c
linedata.c misc.c ptyx.h resize.c scrollback.c xterm.h xterm.man
Removed Files:
xsrc/external/mit/xterm/dist: run-tic.sh

Log Message:
merge xterm 382.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/XTerm.ad
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/dist/graphics_sixel.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.24 -r1.25 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/xterm/dist/run-tic.sh
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/scrollback.c \
xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.21 -r1.22 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 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:   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/xf86-video-ati-kms

[matthew green]

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

Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: compat-api.h
drmmode_display.c radeon.h radeon_glamor.c radeon_kms.c
xsrc/external/mit/xf86-video-ati-kms/include: config.h

Log Message:
merge xf86-video-ati 22.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-ati-kms/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", _op, _ev, _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, , 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++) {
-arg 

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/xdpyinfo/include

[matthew green]

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

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

Log Message:
update for new xdpyinfo


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdpyinfo/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.4 xsrc/external/mit/xdpyinfo/include/config.h:1.5
--- xsrc/external/mit/xdpyinfo/include/config.h:1.4	Tue Jul 12 01:26:29 2022
+++ xsrc/external/mit/xdpyinfo/include/config.h	Mon Jun 19 07:32:08 2023
@@ -95,7 +95,7 @@
 #define PACKAGE_NAME "xdpyinfo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xdpyinfo 1.3.3"
+#define PACKAGE_STRING "xdpyinfo 1.3.4"
 
 /* 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.3"
+#define PACKAGE_VERSION "1.3.4"
 
 /* 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 3
+#define PACKAGE_VERSION_PATCHLEVEL 4
 
 /* 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.3"
+#define VERSION "1.3.4"

CVS commit: xsrc/external/mit/xdpyinfo/include

[matthew green]

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

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

Log Message:
update for new xdpyinfo


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdpyinfo/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/xtrans/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 07:23:39 UTC 2023

Modified Files:
xsrc/external/mit/xtrans/dist: Xtrans.c

Log Message:
make _port 'const', to match the users.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.2 xsrc/external/mit/xtrans/dist/Xtrans.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/xtrans/dist/Xtrans.c
diff -u xsrc/external/mit/xtrans/dist/Xtrans.c:1.1.1.10 xsrc/external/mit/xtrans/dist/Xtrans.c:1.2
--- xsrc/external/mit/xtrans/dist/Xtrans.c:1.1.1.10	Mon Jun 19 06:19:41 2023
+++ xsrc/external/mit/xtrans/dist/Xtrans.c	Mon Jun 19 07:23:39 2023
@@ -204,7 +204,8 @@ TRANS(ParseAddress) (const char *address
 
 char	*mybuf, *tmpptr = NULL;
 const char	*_protocol = NULL;
-char	*_host, *_port;
+char	*_host;
+const char	*_port;
 char	hostnamebuf[256];
 int		_host_len;
 

CVS commit: xsrc/external/mit/xtrans/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 07:23:39 UTC 2023

Modified Files:
xsrc/external/mit/xtrans/dist: Xtrans.c

Log Message:
make _port 'const', to match the users.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.2 xsrc/external/mit/xtrans/dist/Xtrans.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(, >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.c:1.6
--- 

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/libX11/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 04:46:12 UTC 2023

Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure
configure.ac
xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre

Log Message:
merge libX11 1.8.6.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/aclocal.m4 \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \
xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \
xsrc/external/mit/libX11/dist/m4/ltversion.m4 \
xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre

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/libX11/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 04:46:12 UTC 2023

Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure
configure.ac
xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre

Log Message:
merge libX11 1.8.6.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/aclocal.m4 \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \
xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \
xsrc/external/mit/libX11/dist/m4/ltversion.m4 \
xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre

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

CVS commit: xsrc/external/mit/xorgproto/dist/include/X11

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 04:36:05 UTC 2023

Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11: Xfuncproto.h

Log Message:
merge xorgproto 2023.02


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.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/Xfuncproto.h
diff -u xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.2 xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.3
--- xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.2	Sun May  9 16:13:39 2021
+++ xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h	Mon Jun 19 04:36:05 2023
@@ -163,19 +163,6 @@ in this Software without prior written a
 # define _X_ATTRIBUTE_PRINTF(x,y)
 #endif
 
-/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
-   argument macros, must be only used inside #ifdef _X_NONNULL guards, as
-   many legacy X clients are compiled in C89 mode still. */
-#if __has_attribute(nonnull) \
-&& defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
-#define _X_NONNULL(...)  __attribute__((nonnull(__VA_ARGS__)))
-#elif __has_attribute(nonnull) \
-|| defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
-#define _X_NONNULL(args...)  __attribute__((nonnull(args)))
-#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
-#define _X_NONNULL(...)  /* */
-#endif
-
 /* requires xproto >= 7.0.22 */
 #if __has_attribute(__unused__) \
 || defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)

CVS commit: xsrc/external/mit/xorgproto/dist/include/X11

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun 19 04:36:05 UTC 2023

Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11: Xfuncproto.h

Log Message:
merge xorgproto 2023.02


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.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

[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

[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/xorg-server.old/dist/composite

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Mar 31 00:02:06 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server.old/dist/composite: compwindow.c

Log Message:
pull across fixes for ZDI-CAN-19866 / CVE-2023-1393: use after free


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/composite/compwindow.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/xorg-server.old/dist/composite/compwindow.c
diff -u xsrc/external/mit/xorg-server.old/dist/composite/compwindow.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/composite/compwindow.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/composite/compwindow.c:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/composite/compwindow.c	Fri Mar 31 00:02:06 2023
@@ -588,6 +588,11 @@ compDestroyWindow (WindowPtr pWin)
 ret = (*pScreen->DestroyWindow) (pWin);
 cs->DestroyWindow = pScreen->DestroyWindow;
 pScreen->DestroyWindow = compDestroyWindow;
+
+/* Did we just destroy the overlay window? */
+if (pWin == cs->pOverlayWin)
+cs->pOverlayWin = NULL;
+
 /*compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
 return ret;
 }

CVS commit: xsrc/external/mit/xorg-server.old/dist/composite

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Mar 31 00:02:06 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server.old/dist/composite: compwindow.c

Log Message:
pull across fixes for ZDI-CAN-19866 / CVE-2023-1393: use after free


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/composite/compwindow.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/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 30 23:04:59 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
updates for xorg-server 21.1.8.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.29 -r1.30 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.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/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 30 23:04:59 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
updates for xorg-server 21.1.8.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.29 -r1.30 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.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/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.49 xsrc/external/mit/xorg-server/include/dix-config.h:1.50
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.49	Tue Feb  7 04:45:32 2023
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Thu Mar 30 23:04:59 2023
@@ -349,7 +349,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 7)
+#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 8)
 
 /* Build Xv Extension */
 #define XvExtension 1

Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.19 xsrc/external/mit/xorg-server/include/version-config.h:1.20
--- xsrc/external/mit/xorg-server/include/version-config.h:1.19	Tue Feb  7 04:45:32 2023
+++ xsrc/external/mit/xorg-server/include/version-config.h	Thu Mar 30 23:04:59 2023
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 21.1.7"
+#define VENDOR_MAN_VERSION "Version 21.1.8"
 
 /* Vendor name */
 #define VENDOR_NAME "The X.Org Foundation"
 
 /* Vendor release */
-#define VENDOR_RELEASE ((1000) + ((21) * 10) + ((1) * 1000) + 7)
+#define VENDOR_RELEASE ((1000) + ((21) * 10) + ((1) * 1000) + 8)
 
 #endif /* VERSION_CONFIG_H */
 

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.29 xsrc/external/mit/xorg-server/include/xorg-config.h:1.30
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.29	Tue Feb  7 04:45:32 2023
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Thu Mar 30 23:04:59 2023
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 7)
+#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 8)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.29 xsrc/external/mit/xorg-server/include/xorg-server.h:1.30
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.29	Tue Feb  7 04:45:32 2023
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Thu Mar 30 23:04:59 2023
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 7)
+#define XORG_VERSION_CURRENT ((1000) + ((21) * 10) + ((1) * 1000) + 8)
 
 /* Build Xv Extension */
 #define XvExtension 1

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 30 23:04:23 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac

Log Message:
merge xorg-server 21.1.8.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/dist/configure.ac

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-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.16 xsrc/external/mit/xorg-server/dist/configure:1.17
--- xsrc/external/mit/xorg-server/dist/configure:1.16	Tue Feb  7 04:45:31 2023
+++ xsrc/external/mit/xorg-server/dist/configure	Thu Mar 30 23:04:22 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xorg-server 21.1.7.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.8.
 #
 # Report bugs to .
 #
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.7'
-PACKAGE_STRING='xorg-server 21.1.7'
+PACKAGE_VERSION='21.1.8'
+PACKAGE_STRING='xorg-server 21.1.8'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2000,7 +2000,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 21.1.7 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2071,7 +2071,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 21.1.7:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.8:";;
esac
   cat <<\_ACEOF
 
@@ -2256,10 +2256,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.7)
+  (default: 21.1.8)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.7)
+  CFBundleShortVersionString (default: 21.1.8)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2473,7 +2473,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.7
+xorg-server configure 21.1.8
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3130,7 +3130,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 21.1.7, which was
+It was created by xorg-server $as_me 21.1.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3887,7 +3887,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2023-02-07"
+RELEASE_DATE="2023-03-29"
 RELEASE_NAME="Caramel Ice Cream"
 
 
@@ -4405,7 +4405,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='21.1.7'
+ VERSION='21.1.8'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -25180,7 +25180,7 @@ if test ${with_bundle_version+y}
 then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else $as_nop
-   BUNDLE_VERSION="21.1.7"
+   BUNDLE_VERSION="21.1.8"
 fi
 
 
@@ -33749,7 +33749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 21.1.7, which was
+This file was extended by xorg-server $as_me 21.1.8, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -33817,7 +33817,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-xorg-server config.status 21.1.7
+xorg-server config.status 21.1.8
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.18 xsrc/external/mit/xorg-server/dist/configure.ac:1.19
--- 

CVS commit: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 30 23:04:23 UTC 2023

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac

Log Message:
merge xorg-server 21.1.8.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/dist/configure.ac

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

CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 23 06:22:44 UTC 2023

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: in lk

Log Message:
merge xkeyboard-config 2.38.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/symbols/lk

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/xkeyboard-config/dist/symbols/in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.17 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.18
--- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.17	Mon Oct 17 07:38:17 2022
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/in	Thu Mar 23 06:22:44 2023
@@ -2066,6 +2066,79 @@ xkb_symbols "tel-kagapa" {
 include "level3(ralt_switch)"
 };
 
+//  BEGIN Gujarati KaGaPa phonetic 
+// Name:KaGaPa phonetic
+// Author:  Sharad Gor 
+// Layout image at https://github.com/Docbroke/Gujarati_KaGaPa/blob/main/Guj_KaGaPa_layout.jpg
+
+partial alphanumeric_keys
+xkb_symbols "guj-kagapa" {
+ name[Group1] = "Gujarati (KaGaPa, phonetic)";
+ key.type[group1]="FOUR_LEVEL";
+
+// NUMBER ROW
+key   { [   grave,asciitilde,   U201C  ] };  // U201C: “ left double quotation mark
+key   { [   1,exclam,   U0AE7  ] };
+key   { [   2,at,   U0AE8,  U0AF1  ] };  // U0AF1: Gujarati rupee sign (૱)
+key   { [   3,numbersign,   U0AE9  ] };
+key   { [   4,dollar,   U0AEA,  U20B9  ] };  // U20B9: new Indian rupee sign
+key   { [   5,percent,  U0AEB  ] };
+key   { [   6,asciicircum,  U0AEC,  U200C  ] };  // ZWNJ
+key   { [   7,ampersand,U0AED,  U200D  ] };  // ZWJ
+key   { [   8,asterisk, U0AEE,  U0A81  ] };  // U0A81: canndrabindu (ઁ )
+key   { [   9,parenleft,U0AEF  ] };
+key   { [   0,parenright,   U0AE6,  U0AF0  ] };  // U0AF0:(૰)  abbreviation sign
+
+key   { [   minus,underscore,   U0952  ] };  // U0952: Devanagari stress sign anudatta(॒)
+key   { [   equal,plus ] };
+
+//First row
+
+key   { [   U0A9F, U0AA0   ] };  // Q: retroflex Ta ટ , Tha ઠ
+key   { [   U0AA1, U0AA2   ] };  // W: retroflex Da ડ , Dha ઢ
+key   { [   U0AC7, U0AC8,  U0A8F,  U0A90   ] };  // E: oે  oૈ  એ  ઐ
+key   { [   U0AB0, U0AC3,  U0A8B,  U0AC4   ] };  // R: ર oૃ  ઋ  oૄ
+key   { [   U0AA4, U0AA5,  U0A9F,  U0AA0   ] };  // T: ત થ ટ ઠ
+key   { [   U0AAF  ] };  // Y: ય
+key   { [   U0AC1, U0AC2,  U0A89,  U0A8A   ] };  // U: oુ   oૂ   ઉ   ઊ
+key   { [   U0ABF, U0AC0,  U0A87,  U0A88   ] };  // I: oિ  oી  ઇ   ઈ
+key   { [   U0ACB, U0ACC,  U0A93,  U0A94   ] };  // O: oો  oૌ  ઓ   ઔ
+key   { [   U0AAA, U0AAB   ] };  // P: પ ફ
+key   { [   bracketleft,   braceleft   ] };
+key   { [   bracketright,  braceright  ] };
+key   { [   backslash,bar,  U0964,  U0965  ] };  // backslash, pipe, danda, double danda
+
+//Second row
+
+key   { [   U0ABE,U0A86, U0A85,U0A8D   ] };  // A: oા આ  અ  ઍ
+key   { [   U0AB8,U0AB6] };  // S: સ  શ
+key   { [   U0AA6,U0AA7, U0AA1,U0AA2   ] };  // D: દ ધ ડ ઢ
+key   { [   U0ACD,U0AC4, U0AE0 ] };  // F: o્  oૄ  ૠ
+key   { [   U0A97,U0A98] };  // G: ગ  ઘ
+key   { [   U0AB9,U0A83] };  // H: હ (ઃ)
+
+key   { [   U0A9C,U0A9D, U0A9E,U0AF9   ] };  // J: જ  ઝ  ઞ  ૹ
+key   { [   U0A95,U0A96] };  // K: ક ખ
+key   { [   U0AB2,U0AB3, U0AE1,U0AE2   ] };  // L: લ ળ  ૡ oૢ
+key   { [   semicolon,colon] };  //
+key   { [   apostrophe,   quotedbl,  U0951,U201D   ] };  // U0951: o॑ Devanagari stress sign udatta
+   // U201D: ” Right double quotation mark
+key   { [   U0A9E,U0A99] };  // Z: nya ઞ, nga ઙ
+key   { [   U0AB7,U0ABC] };  // X: ssa ષ, nukta below o઼
+key   { [   U0A9A,U0A9B] };  // C: ચ છ
+key   { [   U0AB5,U0ACC, U0A94 ] };  // V: વ  oૌ  ઔ
+key   { [   U0AAC,U0AAD] };  // B: બ ભ
+key   { [   U0AA8,U0AA3 

CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 23 06:22:44 UTC 2023

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: in lk

Log Message:
merge xkeyboard-config 2.38.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/symbols/lk

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

CVS commit: xsrc/external/mit/libXaw/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 23 05:26:15 UTC 2023

Modified Files:
xsrc/external/mit/libXaw/dist/src: Pixmap.c Text.c TextAction.c

Log Message:
merge libXaw 1.0.15.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXaw/dist/src/Pixmap.c \
xsrc/external/mit/libXaw/dist/src/TextAction.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXaw/dist/src/Text.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/libXaw/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 23 05:26:15 UTC 2023

Modified Files:
xsrc/external/mit/libXaw/dist/src: Pixmap.c Text.c TextAction.c

Log Message:
merge libXaw 1.0.15.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXaw/dist/src/Pixmap.c \
xsrc/external/mit/libXaw/dist/src/TextAction.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXaw/dist/src/Text.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/libXaw/dist/src/Pixmap.c
diff -u xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.2 xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.3
--- xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.2	Sun May  9 16:58:19 2021
+++ xsrc/external/mit/libXaw/dist/src/Pixmap.c	Thu Mar 23 05:26:15 2023
@@ -690,6 +690,7 @@ GetResourcePixmapPath(Display *display)
 		length = (length + (int)strlen(tok) + 3);
 	}
 	}
+	XtFree(buffer);
 	pixmap_path = XtRealloc(pixmap_path, (Cardinal)((size_t)length + strlen(default_path) + 2));
 	if (length)
 	pixmap_path[length++] = ':';
Index: xsrc/external/mit/libXaw/dist/src/TextAction.c
diff -u xsrc/external/mit/libXaw/dist/src/TextAction.c:1.2 xsrc/external/mit/libXaw/dist/src/TextAction.c:1.3
--- xsrc/external/mit/libXaw/dist/src/TextAction.c:1.2	Sun May  9 16:58:57 2021
+++ xsrc/external/mit/libXaw/dist/src/TextAction.c	Thu Mar 23 05:26:15 2023
@@ -2607,7 +2607,7 @@ InsertNewLineAndIndent(Widget w, XEvent 
 	strcpy(++ptr, line_to_ip);
 
 	length++;
-	while (length && (isspace(*ptr) || (*ptr == XawTAB)))
+	while (length && (isspace((unsigned char)*ptr) || (*ptr == XawTAB)))
 	ptr++, length--;
 	*ptr = '\0';
 	text.length = (int)strlen(text.ptr);
@@ -2822,7 +2822,7 @@ RedrawDisplay(Widget w, XEvent *event, S
 
 /* This is kind of a hack, but, only one text widget can have focus at
  * a time on one display. There is a problem in the implementation of the
- * text widget, the scrollbars can not be adressed via editres, since they
+ * text widget, the scrollbars can not be addressed via editres, since they
  * are not children of a subclass of composite.
  * The focus variable is required to make sure only one text window will
  * show a block cursor at one time.
@@ -2971,7 +2971,7 @@ TextLeaveWindow(Widget w, XEvent *event,
  *	Arguments: ctx - The text widget.
  *
  * Description:
- *	  Breaks the line at the previous word boundry when
+ *	  Breaks the line at the previous word boundary when
  *	called inside InsertChar.
  */
 static void
@@ -3201,7 +3201,7 @@ InsertChar(Widget w, XEvent *event, Stri
  *
  * i18n requires the ability to specify multiple characters in a hexa-
  * decimal string at once.  Since Insert was already too long, I made
- * this a seperate routine.
+ * this a separate routine.
  *
  * A legal hex string in MBNF: '0' 'x' ( HEX-DIGIT HEX-DIGIT )+ '\0'
  *
@@ -3257,7 +3257,7 @@ IfHexConvertHexElseReturnParam(const cha
 	}
 }
 
-/* We quit the above loop becasue we hit a non hex.  If that char is \0... */
+/* We quit the above loop because we hit a non hex.  If that char is \0... */
 if ((c == '\0') && first_digit) {
 	*len_return = (int)strlen(hexval);
 	return (hexval);   /* ...it was a legal hex string, so return it */
@@ -3391,7 +3391,7 @@ Numeric(Widget w, XEvent *event, String 
 	long mult = ctx->text.mult;
 
 	if (*num_params != 1 || strlen(params[0]) != 1
-	|| (!isdigit(params[0][0])
+	|| (!isdigit((unsigned char)params[0][0])
 		&& (params[0][0] != '-' || mult != 0))) {
 	char err_buf[256];
 
@@ -3589,7 +3589,7 @@ StripOutOldCRs(TextWidget ctx, XawTextPo
 		if (!iswspace(((wchar_t*)buf)[i]) || ((periodPos + i) >= to))
 			break;
 		}
-		else if (!isspace(buf[i]) || (periodPos + i) >= to)
+		else if (!isspace((unsigned char)buf[i]) || (periodPos + i) >= to)
 		break;
 
 	XtFree(buf);
@@ -3679,7 +3679,7 @@ InsertNewCRs(TextWidget ctx, XawTextPosi
 		if (!iswspace(((wchar_t*)buf)[i]))
 		break;
 	}
-	else if (!isspace(buf[i]))
+	else if (!isspace((unsigned char)buf[i]))
 		break;
 
 	to -= (i - 1);
@@ -3809,7 +3809,7 @@ GetBlockBoundaries(TextWidget ctx,
 			   XawMin(ctx->text.s.left, ctx->text.s.right),
 			   XawstEOL, XawsdLeft, 1, False);
 	to   = SrcScan(ctx->text.source,
-			   XawMax(ctx->text.s.right, ctx->text.s.right),
+			   XawMax(ctx->text.s.left, ctx->text.s.right),
 			   XawstEOL, XawsdRight, 1, False);
 	}
 	else {
@@ -4128,7 +4128,7 @@ NoOp(Widget w, XEvent *event _X_UNUSED, 
 	case 'R':
 	case 'r':
 	XBell(XtDisplay(w), 0);
-	/*FALLTROUGH*/
+	/*FALLTHROUGH*/
 	default:
 	break;
 }

Index: xsrc/external/mit/libXaw/dist/src/Text.c
diff -u xsrc/external/mit/libXaw/dist/src/Text.c:1.3 xsrc/external/mit/libXaw/dist/src/Text.c:1.4
--- xsrc/external/mit/libXaw/dist/src/Text.c:1.3	Mon Apr 26 21:25:12 2021
+++ xsrc/external/mit/libXaw/dist/src/Text.c	Thu Mar 23 05:26:15 2023
@@ -925,7 

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 

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/xf86-video-vmware/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar  2 05:45:10 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-vmware/dist/src: common_compat.h

Log Message:
fix idempotent check define as noticed by LLVM.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-vmware/dist/src/common_compat.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-vmware/dist/src/common_compat.h
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/common_compat.h:1.1.1.1 xsrc/external/mit/xf86-video-vmware/dist/src/common_compat.h:1.2
--- xsrc/external/mit/xf86-video-vmware/dist/src/common_compat.h:1.1.1.1	Sun Feb 26 19:47:06 2023
+++ xsrc/external/mit/xf86-video-vmware/dist/src/common_compat.h	Thu Mar  2 05:45:10 2023
@@ -1,5 +1,5 @@
 #ifndef _COMMON_COMPAT_H_
-#define _COMMOM_COMPAT_H_
+#define _COMMON_COMPAT_H_
 
 #if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 18)
 #define CONST_ABI_18_0 const

CVS commit: xsrc/external/mit/xf86-video-vmware/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar  2 05:45:10 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-vmware/dist/src: common_compat.h

Log Message:
fix idempotent check define as noticed by LLVM.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-vmware/dist/src/common_compat.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/xf86-video-amdgpu/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Feb 26 20:14:04 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h

Log Message:
updates for xf86-video-amdgpu 23.0.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-amdgpu/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/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.12 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.13
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.12	Fri Aug 27 01:32:09 2021
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h	Sun Feb 26 20:14:04 2023
@@ -88,7 +88,7 @@
 #define PACKAGE_NAME "xf86-video-amdgpu"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-amdgpu 21.0.0"
+#define PACKAGE_STRING "xf86-video-amdgpu 23.0.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-amdgpu"
@@ -97,10 +97,10 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "21.0.0"
+#define PACKAGE_VERSION "23.0.0"
 
 /* Major version of this package */
-#define PACKAGE_VERSION_MAJOR 21
+#define PACKAGE_VERSION_MAJOR 23
 
 /* Minor version of this package */
 #define PACKAGE_VERSION_MINOR 0
@@ -118,7 +118,7 @@
 #define USE_SYS_ENDIAN_H 1
 
 /* Version number of package */
-#define VERSION "21.0.0"
+#define VERSION "23.0.0"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE

CVS commit: xsrc/external/mit/xf86-video-amdgpu/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Feb 26 20:14:04 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h

Log Message:
updates for xf86-video-amdgpu 23.0.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-amdgpu/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/xf86-video-vmware/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Feb 26 20:09:54 UTC 2023

Modified Files:
xsrc/external/mit/xf86-video-vmware/dist/src: vmwarevideo.c

Log Message:
work around a local change that enables drivers to work.

see 'const' commented in xorg-server/dist/hw/xfree86/common/xf86xv.h.
maybe we can clean this up properly now most drivers are updated.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c

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