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

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Sep  2 07:09:57 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_xaa.c

Log Message:
we need NVDMA*() even when building without XAA support


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.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-nv/dist/src/nv_xaa.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c:1.4	Thu Jul  4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c	Mon Sep  2 07:09:57 2024
@@ -307,8 +307,7 @@ crap:
 NVResetGraphics(pScrn);
 }
 
-#ifdef HAVE_XAA_H
-static void
+void
 NVDMAKickoffCallback (ScrnInfoPtr pScrn)
 {
NVPtr pNv = NVPTR(pScrn);
@@ -317,6 +316,7 @@ NVDMAKickoffCallback (ScrnInfoPtr pScrn)
pNv->DMAKickoffCallback = NULL;
 }
 
+#ifdef HAVE_XAA_H
 static void
 NVSetupForScreenToScreenCopy(
ScrnInfoPtr pScrn, 

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

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Sep  2 07:09:57 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_xaa.c

Log Message:
we need NVDMA*() even when building without XAA support


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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 24 07:17:54 UTC 2024

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

Log Message:
don't run on netbsd if booted from UEFI.  it doesn't work, and genfb should.

XXX: pullup-10, maybe pullup-9


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c
diff -u xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c:1.12 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c:1.13
--- xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c:1.12	Sun Jan  8 21:34:50 2023
+++ xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c	Wed Jul 24 07:17:54 2024
@@ -64,6 +64,10 @@
 #endif
 #include "compat-api.h"
 
+#if defined(__NetBSD__)
+#include 
+#endif
+
 /* Mandatory functions */
 static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid);
 static void VESAIdentify(int flags);
@@ -485,6 +489,18 @@ VESAPciProbe(DriverPtr drv, int entity_n
 return FALSE;
 }
 #endif
+#if defined(__NetBSD__)
+{
+	char method[10];
+	size_t len = sizeof(method);
+
+if (sysctlbyname("machdep.bootmethod", &method, &len, NULL, 0) == 0 &&
+	strcmp(method, "UEFI") == 0) {
+ErrorF("vesa: Refusing to run, UEFI booted\n");
+return FALSE;
+}
+}
+#endif
 
 pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
 NULL, NULL, NULL, NULL, NULL);

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul 24 07:17:54 UTC 2024

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

Log Message:
don't run on netbsd if booted from UEFI.  it doesn't work, and genfb should.

XXX: pullup-10, maybe pullup-9


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c

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

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul  5 06:01:37 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
apply some ugly (char *) cast when calling vgaHWSetMmioFuncs().


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_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-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.15 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.16
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.15	Thu Jul  4 06:47:13 2024
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Fri Jul  5 06:01:37 2024
@@ -1554,7 +1554,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 	return FALSE;
 }
 #ifdef __powerpc__ /* XXX probably MI */
-vgaHWSetMmioFuncs(VGAHWPTR(pScrn), pNv->IOAddress, 0);
+vgaHWSetMmioFuncs(VGAHWPTR(pScrn), (char *)pNv->IOAddress, 0);
 #else
 vgaHWSetStdFuncs(VGAHWPTR(pScrn));
 #endif

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jul  5 06:01:37 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c

Log Message:
apply some ugly (char *) cast when calling vgaHWSetMmioFuncs().


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_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/xorg-server

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 21:47:04 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xext: sync.c
xsrc/external/mit/xorg-server/dist/Xi: xichangehierarchy.c
xipassivegrab.c xiquerypointer.c xiselectev.c
xsrc/external/mit/xorg-server/dist/dix: devices.c dispatch.c
enterleave.c
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Modes.c
xsrc/external/mit/xorg-server/dist/m4: libtool.m4
xsrc/external/mit/xorg-server/dist/os: utils.c
xsrc/external/mit/xorg-server/dist/render: glyph.c glyphstr.h render.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.13.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/Xext/sync.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/dix/dispatch.c \
xsrc/external/mit/xorg-server/dist/dix/enterleave.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/m4/libtool.m4
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/dist/os/utils.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/render/glyph.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/render/glyphstr.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/render/render.c
cvs rdiff -u -r1.51 -r1.52 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.31 -r1.32 \
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.18 xsrc/external/mit/xorg-server/dist/configure:1.19
--- xsrc/external/mit/xorg-server/dist/configure:1.18	Wed Oct 25 04:35:07 2023
+++ xsrc/external/mit/xorg-server/dist/configure	Thu Jul  4 21:47:02 2024
@@ -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.9.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.13.
 #
 # Report bugs to .
 #
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.9'
-PACKAGE_STRING='xorg-server 21.1.9'
+PACKAGE_VERSION='21.1.13'
+PACKAGE_STRING='xorg-server 21.1.13'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2004,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.9 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2075,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.9:";;
+ short | recursive ) echo "Configuration of xorg-server 21.1.13:";;
esac
   cat <<\_ACEOF
 
@@ -2260,10 +2260,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 21.1.9)
+  (default: 21.1.13)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 21.1.9)
+  CFBundleShortVersionSt

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 21:47:04 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xext: sync.c
xsrc/external/mit/xorg-server/dist/Xi: xichangehierarchy.c
xipassivegrab.c xiquerypointer.c xiselectev.c
xsrc/external/mit/xorg-server/dist/dix: devices.c dispatch.c
enterleave.c
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Modes.c
xsrc/external/mit/xorg-server/dist/m4: libtool.m4
xsrc/external/mit/xorg-server/dist/os: utils.c
xsrc/external/mit/xorg-server/dist/render: glyph.c glyphstr.h render.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.13.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/Xext/sync.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/dix/dispatch.c \
xsrc/external/mit/xorg-server/dist/dix/enterleave.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/m4/libtool.m4
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/dist/os/utils.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/render/glyph.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/render/glyphstr.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/render/render.c
cvs rdiff -u -r1.51 -r1.52 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.31 -r1.32 \
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/fontconfig/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 19:59:18 UTC 2024

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

Log Message:
re-turn off NLS and a couple of other things here (also used by tools build.)


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/fontconfig/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/fontconfig/include/config.h
diff -u xsrc/external/mit/fontconfig/include/config.h:1.12 xsrc/external/mit/fontconfig/include/config.h:1.13
--- xsrc/external/mit/fontconfig/include/config.h:1.12	Thu Jul  4 19:53:15 2024
+++ xsrc/external/mit/fontconfig/include/config.h	Thu Jul  4 19:59:18 2024
@@ -15,7 +15,7 @@
 
 /* Define to 1 if translation of program messages to the user's native
language is requested. */
-#define ENABLE_NLS 1
+/* #undef ENABLE_NLS */
 
 /* Additional font directories */
 #define FC_ADD_FONTS "/usr/X11R7/lib/X11/fonts,/usr/pkg/share/fonts/urw,/usr/pkg/share/ghostscript/fonts,/usr/pkg/share/fonts/X11"
@@ -24,7 +24,7 @@
 /* #undef FC_ARCHITECTURE */
 
 /* System font directory */
-#define FC_DEFAULT_FONTS "/usr/pkg/share/fonts/X11"
+#define FC_DEFAULT_FONTS "/usr/X11R7/lib/X11/fonts"
 
 /* The type of len parameter of the gperf hash/lookup function */
 #define FC_GPERF_SIZE_T size_t
@@ -51,7 +51,7 @@
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
*/
-#define HAVE_DCGETTEXT 1
+/* #undef HAVE_DCGETTEXT */
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_DIRENT_H 1
@@ -102,7 +102,7 @@
 #define HAVE_GETPROGNAME 1
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
+/* #undef HAVE_GETTEXT */
 
 /* Define if you have the iconv() function and it works. */
 #define HAVE_ICONV 1
@@ -144,10 +144,10 @@
 #define HAVE_POSIX_FADVISE 1
 
 /* Have POSIX threads */
-#define HAVE_PTHREAD 1
+/* #undef HAVE_PTHREAD */
 
 /* Have PTHREAD_PRIO_INHERIT. */
-#define HAVE_PTHREAD_PRIO_INHERIT 1
+/* #undef HAVE_PTHREAD_PRIO_INHERIT */
 
 /* Define to 1 if you have the `rand' function. */
 #define HAVE_RAND 1

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 19:59:18 UTC 2024

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

Log Message:
re-turn off NLS and a couple of other things here (also used by tools build.)


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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 19:53:34 UTC 2024

Added Files:
xsrc/external/mit/fontconfig/include: fcftint.h fcint.h fcstdint.h

Log Message:
add new generated files.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/fontconfig/include/fcftint.h \
xsrc/external/mit/fontconfig/include/fcint.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/fontconfig/include/fcstdint.h

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

Added files:

Index: xsrc/external/mit/fontconfig/include/fcftint.h
diff -u /dev/null xsrc/external/mit/fontconfig/include/fcftint.h:1.1
--- /dev/null	Thu Jul  4 19:53:34 2024
+++ xsrc/external/mit/fontconfig/include/fcftint.h	Thu Jul  4 19:53:34 2024
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2007 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _FCFTINT_H_
+#define _FCFTINT_H_
+
+#include 
+
+/* Bug of GCC 4.2 (visibility and -fPIC)
+   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46861 */
+#if (__GNUC__ == 4 && __GNUC_MINOR__ == 2) && defined(__ELF__) && !defined(__sun)
+#define FcPrivate
+#define HAVE_GNUC_ATTRIBUTE 1
+#include "fcftalias.h"
+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+#define FcPrivate		__attribute__((__visibility__("hidden")))
+#define HAVE_GNUC_ATTRIBUTE 1
+#include "fcftalias.h"
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#define FcPrivate		__hidden
+#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
+#define FcPrivate
+#endif
+
+/* fcfreetype.c */
+FcPrivate FcBool
+FcFreeTypeIsExclusiveLang (const FcChar8  *lang);
+
+FcPrivate FcBool
+FcFreeTypeHasLang (FcPattern *pattern, const FcChar8 *lang);
+
+FcPrivate FcChar32
+FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map);
+
+FcPrivate FcChar32
+FcFreeTypePrivateToUcs4 (FcChar32 private, const FcCharMap *map);
+
+FcPrivate const FcCharMap *
+FcFreeTypeGetPrivateMap (FT_Encoding encoding);
+
+#endif /* _FCFTINT_H_ */
Index: xsrc/external/mit/fontconfig/include/fcint.h
diff -u /dev/null xsrc/external/mit/fontconfig/include/fcint.h:1.1
--- /dev/null	Thu Jul  4 19:53:34 2024
+++ xsrc/external/mit/fontconfig/include/fcint.h	Thu Jul  4 19:53:34 2024
@@ -0,0 +1,1442 @@
+/*
+ * fontconfig/src/fcint.h
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the author(s) not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  The authors make no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _FCINT_H_
+#define _FCINT_H_
+
+#ifdef HAVE_CONFIG_H
+#include 
+#endif
+
+#include "fcstdint.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+#include 
+#include 
+#include 
+#include 
+#include 
+#incl

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 19:53:34 UTC 2024

Added Files:
xsrc/external/mit/fontconfig/include: fcftint.h fcint.h fcstdint.h

Log Message:
add new generated files.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/fontconfig/include/fcftint.h \
xsrc/external/mit/fontconfig/include/fcint.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/fontconfig/include/fcstdint.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/fontconfig

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 19:53:15 UTC 2024

Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/src: fccfg.c fcdir.c fcfreetype.c
fcint.h fcmatch.c
xsrc/external/mit/fontconfig/include: config.h fcobjshash.h
Removed Files:
xsrc/external/mit/fontconfig/dist: README

Log Message:
merge fontconfig 2.15.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r0 xsrc/external/mit/fontconfig/dist/README
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fccfg.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/dist/src/fcdir.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/dist/src/fcint.h
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/fontconfig/dist/src/fcmatch.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/include/config.h
cvs rdiff -u -r1.3 -r1.4 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.8 xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.9
--- xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3:1.8	Tue Jun 20 02:21:56 2023
+++ xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3	Thu Jul  4 19:53:15 2024
@@ -1,5 +1,5 @@
 .\" auto-generated by docbook2man-spec from docbook-utils package
-.TH "FcLangSetGetLangs" "3" "27 1月 2023" "Fontconfig 2.14.2" ""
+.TH "FcLangSetGetLangs" "3" "22 12月 2023" "Fontconfig 2.15.0" ""
 .SH NAME
 FcLangSetGetLangs \- get the list of languages in the langset
 .SH SYNOPSIS

Index: xsrc/external/mit/fontconfig/dist/src/fccfg.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.6 xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.7
--- xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.6	Tue Jun 20 02:21:56 2023
+++ xsrc/external/mit/fontconfig/dist/src/fccfg.c	Thu Jul  4 19:53:15 2024
@@ -147,10 +147,6 @@ FcConfigCreate (void)
 if (!config->configDirs)
 	goto bail1;
 
-config->configMapDirs = FcStrSetCreate();
-if (!config->configMapDirs)
-	goto bail1_5;
-
 config->configFiles = FcStrSetCreate ();
 if (!config->configFiles)
 	goto bail2;
@@ -230,8 +226,6 @@ bail4:
 bail3:
 FcStrSetDestroy (config->configFiles);
 bail2:
-FcStrSetDestroy (config->configMapDirs);
-bail1_5:
 FcStrSetDestroy (config->configDirs);
 bail1:
 free (config);
@@ -370,7 +364,6 @@ FcConfigDestroy (FcConfig *config)
 	(void) fc_atomic_ptr_cmpexch (&_fcConfig, config, NULL);
 
 	FcStrSetDestroy (config->configDirs);
-	FcStrSetDestroy (config->configMapDirs);
 	FcStrSetDestroy (config->fontDirs);
 	FcStrSetDestroy (config->cacheDirs);
 	FcStrSetDestroy (config->configFiles);
@@ -2282,8 +2275,8 @@ FcConfigSubstituteWithPat (FcConfig*
 	printf ("FcConfigSubstitute done");
 	FcPatternPrint (p);
 }
-bail1:
 FamilyTableClear (&data);
+bail1:
 if (elt)
 	free (elt);
 if (value)

Index: xsrc/external/mit/fontconfig/dist/src/fcdir.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.3 xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.4
--- xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.3	Thu Jan 19 06:14:18 2023
+++ xsrc/external/mit/fontconfig/dist/src/fcdir.c	Thu Jul  4 19:53:15 2024
@@ -201,7 +201,7 @@ FcDirScanConfig (FcFontSet	*set,
 DIR			*d;
 struct dirent	*e;
 FcStrSet		*files;
-FcChar8		*file_prefix, *s_dir = NULL;
+FcChar8		*file_prefix = NULL, *s_dir = NULL;
 FcChar8		*base;
 const FcChar8	*sysroot = FcConfigGetSysRoot (config);
 FcBool		ret = FcTrue;
@@ -213,16 +213,6 @@ FcDirScanConfig (FcFontSet	*set,
 if (!set && !dirs)
 	return FcTrue;
 
-/* freed below */
-file_prefix = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
-if (!file_prefix) {
-	ret = FcFalse;
-	goto bail;
-}
-strcpy ((char *) file_prefix, (char *) dir);
-strcat ((char *) file_prefix, FC_DIR_SEPARATOR_S);
-base = file_prefix + strlen ((char *) file_prefix);
-
 if (sysroot)
 	s_dir = FcStrBuildFilename (sysroot, dir, NULL);
 else
@@ -232,6 +222,16 @@ FcDirScanConfig (FcFontSet	*set,
 	goto bail;
 }
 
+/* freed below */
+file_prefix = (FcChar8 *) malloc (strlen ((char *) s_dir) + 1 + FC_MAX_FILE_LEN + 1);
+if (!file_prefix) {
+	ret = FcFalse;
+	goto bail;
+}
+strcpy ((char *) file_prefix, (char *) s_dir);
+strcat ((char *) file_prefix, FC_DIR_SEPARATOR_S);
+base = file_prefix + strlen ((char *) file_prefix);
+
 if (FcDebug () & FC_DBG_SCAN)
 	printf ("\tScanning dir %s\n", s_dir);
 	

Index: xsrc/external/mit/fontconfig/dist/src/f

CVS commit: xsrc/external/mit/fontconfig

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 19:53:15 UTC 2024

Modified Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/src: fccfg.c fcdir.c fcfreetype.c
fcint.h fcmatch.c
xsrc/external/mit/fontconfig/include: config.h fcobjshash.h
Removed Files:
xsrc/external/mit/fontconfig/dist: README

Log Message:
merge fontconfig 2.15.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r0 xsrc/external/mit/fontconfig/dist/README
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fccfg.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/dist/src/fcdir.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/dist/src/fcint.h
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/fontconfig/dist/src/fcmatch.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/fontconfig/include/config.h
cvs rdiff -u -r1.3 -r1.4 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/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 09:22:57 UTC 2024

Modified Files:
xsrc/external/mit/libdrm/dist: configure libsync.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h amdgpu_bo.c
amdgpu_vamgr.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c uthash.h
xsrc/external/mit/libdrm/dist/radeon: radeon_surface.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/intel: i915_pciids.h intel_chipset.c

Log Message:
merge libdrm 2.4.122


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/configure
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/libsync.h
cvs rdiff -u -r1.32 -r1.33 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h \
xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.1.1.9 -r0 xsrc/external/mit/libdrm/dist/intel/i915_pciids.h
cvs rdiff -u -r1.22 -r1.23 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libdrm/dist/intel/intel_chipset.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/intel/uthash.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.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/libdrm/dist/configure
diff -u xsrc/external/mit/libdrm/dist/configure:1.5 xsrc/external/mit/libdrm/dist/configure:1.6
--- xsrc/external/mit/libdrm/dist/configure:1.5	Fri Nov  3 17:05:41 2023
+++ xsrc/external/mit/libdrm/dist/configure	Thu Jul  4 09:22:57 2024
@@ -3,6 +3,6 @@
 # Identity of this package.
 PACKAGE_NAME='libdrm'
 PACKAGE_TARNAME='libdrm'
-PACKAGE_VERSION='2.4.114'
-PACKAGE_STRING='libdrm 2.4.114'
+PACKAGE_VERSION='2.4.122'
+PACKAGE_STRING='libdrm 2.4.122'
 PACKAGE_URL=''

Index: xsrc/external/mit/libdrm/dist/libsync.h
diff -u xsrc/external/mit/libdrm/dist/libsync.h:1.3 xsrc/external/mit/libdrm/dist/libsync.h:1.4
--- xsrc/external/mit/libdrm/dist/libsync.h:1.3	Tue Mar  7 16:28:42 2017
+++ xsrc/external/mit/libdrm/dist/libsync.h	Thu Jul  4 09:22:57 2024
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #if defined(__cplusplus)

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.32 xsrc/external/mit/libdrm/dist/xf86drm.c:1.33
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.32	Sat Nov 12 02:07:07 2022
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Thu Jul  4 09:22:57 2024
@@ -60,7 +60,6 @@
 #if HAVE_SYS_SYSCTL_H
 #include 
 #endif
-#include 
 #include 
 
 #if defined(__FreeBSD__)
@@ -179,11 +178,15 @@ drmGetFormatModifierNameFromAmd(uint64_t
 static char *
 drmGetFormatModifierNameFromAmlogic(uint64_t modifier);
 
+static char *
+drmGetFormatModifierNameFromVivante(uint64_t modifier);
+
 static const struct drmVendorInfo modifier_format_vendor_table[] = {
 { DRM_FORMAT_MOD_VENDOR_ARM, drmGetFormatModifierNameFromArm },
 { DRM_FORMAT_MOD_VENDOR_NVIDIA, drmGetFormatModifierNameFromNvidia },
 { DRM_FORMAT_MOD_VENDOR_AMD, drmGetFormatModifierNameFromAmd },
 { DRM_FORMAT_MOD_VENDOR_AMLOGIC, drmGetFormatModifierNameFromAmlogic },
+{ DRM_FORMAT_MOD_VENDOR_VIVANTE, drmGetFormatModifierNameFromVivante },
 };
 
 #ifndef AFBC_FORMAT_MOD_MODE_VALUE_MASK
@@ -478,6 +481,9 @@ drmGetFormatModifierNameFromAmd(uint64_t
 case AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS:
 str_tile_version = "GFX10_RBPLUS";
 break;
+case AMD_FMT_MOD_TILE_VER_GFX11:
+str_tile_version = "GFX11";
+break;
 }
 
 if (str_tile_version) {
@@ -505,6 +511,9 @@ drmGetFormatModifierNameFromAmd(uint64_t
 case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
 str_tile = "GFX9_64K_R_X";
 break;
+case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
+str_tile = "GFX11_256K_R_X";
+break;
 }
 
 if (str_tile)
@@ -551,6 +560,70 @@ drmGetFormatModifierNameFromAmlogic(uint
 return mod_amlogic;
 }
 
+static char *
+drmGetFormatModifierNameFromVivante(uint64_t modifier)
+{
+const char *color_tiling, *tile_status, *compression;
+char *mod_vivante = NULL;
+
+switch (modifier & VIVANTE_MOD_TS_MASK) {
+case 0:
+tile_status = "";
+break;
+case V

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 09:22:57 UTC 2024

Modified Files:
xsrc/external/mit/libdrm/dist: configure libsync.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h amdgpu_bo.c
amdgpu_vamgr.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c uthash.h
xsrc/external/mit/libdrm/dist/radeon: radeon_surface.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/intel: i915_pciids.h intel_chipset.c

Log Message:
merge libdrm 2.4.122


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/configure
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/libsync.h
cvs rdiff -u -r1.32 -r1.33 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h \
xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.1.1.9 -r0 xsrc/external/mit/libdrm/dist/intel/i915_pciids.h
cvs rdiff -u -r1.22 -r1.23 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libdrm/dist/intel/intel_chipset.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/intel/uthash.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.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/xterm

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 09:09:18 UTC 2024

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
xsrc/external/mit/xterm/include: xtermcfg.h

Log Message:
merge xterm 392.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xterm/dist/XTerm.ad
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xterm/dist/graphics_sixel.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.25 -r1.26 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xterm/dist/resize.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xterm/dist/scrollback.c \
xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xterm/include/xtermcfg.h

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:46:44 UTC 2024

Modified Files:
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xdm/dist/greeter: Login.c greet.c
xsrc/external/mit/xdm/dist/include: dm.h
xsrc/external/mit/xdm/dist/xdm: dm.c session.c

Log Message:
merge xauth 1.1.3, and xdm 1.1.16.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xdm/dist/greeter/Login.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/greeter/greet.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdm/dist/include/dm.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/xdm/dm.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/xdm/session.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:   Thu Jul  4 08:46:44 UTC 2024

Modified Files:
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xdm/dist/greeter: Login.c greet.c
xsrc/external/mit/xdm/dist/include: dm.h
xsrc/external/mit/xdm/dist/xdm: dm.c session.c

Log Message:
merge xauth 1.1.3, and xdm 1.1.16.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xdm/dist/greeter/Login.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/greeter/greet.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdm/dist/include/dm.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/xdm/dm.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/xdm/session.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/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.9 xsrc/external/mit/xauth/dist/process.c:1.10
--- xsrc/external/mit/xauth/dist/process.c:1.9	Mon Jul 11 09:13:31 2022
+++ xsrc/external/mit/xauth/dist/process.c	Thu Jul  4 08:46:43 2024
@@ -268,7 +268,6 @@ static const char **
 split_into_words(char *src, int *argcp)  /* argvify string */
 {
 char *jword;
-char savec;
 const char **argv;
 int cur, total;
 
@@ -286,6 +285,8 @@ split_into_words(char *src, int *argcp) 
  */
 
 do {
+	char savec;
+
 	jword = skip_space (src);
 	src = skip_nonspace (jword);
 	savec = *src;
@@ -360,14 +361,14 @@ getinput(FILE *fp)
 static int
 get_short(FILE *fp, unsigned short *sp)	/* for reading numeric input */
 {
-int c;
-int i;
 unsigned short us = 0;
 
 /*
  * read family:  written with %04x
  */
-for (i = 0; i < 4; i++) {
+for (int i = 0; i < 4; i++) {
+	int c;
+
 	switch (c = getinput (fp)) {
 	  case EOF:
 	  case '\n':
@@ -385,12 +386,13 @@ get_bytes(FILE *fp, unsigned int n, char
 {
 char *s;
 register char *cp;
-int c1, c2;
 
 cp = s = malloc (n);
 if (!cp) return 0;
 
 while (n > 0) {
+	int c1, c2;
+
 	if ((c1 = getinput (fp)) == EOF || c1 == '\n' ||
 	(c2 = getinput (fp)) == EOF || c2 == '\n') {
 	free (s);
@@ -411,7 +413,7 @@ read_numeric(FILE *fp)
 {
 Xauth *auth;
 
-auth = (Xauth *) malloc (sizeof (Xauth));
+auth = malloc (sizeof (Xauth));
 if (!auth) goto bad;
 auth->family = 0;
 auth->address = NULL;
@@ -467,7 +469,7 @@ read_auth_entries(FILE *fp, Bool numeric
 n = 0;
 	/* put all records into linked list */
 while ((auth = ((*readfunc) (fp))) != NULL) {
-	AuthList *l = (AuthList *) malloc (sizeof (AuthList));
+	AuthList *l = malloc (sizeof (AuthList));
 	if (!l) {
 	fprintf (stderr,
 		 "%s:  unable to alloc entry reading auth file\n",
@@ -572,13 +574,11 @@ cvthexkey(const char *hexstr, char **ptr
 int i;
 int len = 0;
 char *retval;
-const char *s;
 unsigned char *us;
-char c;
 char savec = '\0';
 
 /* count */
-for (s = hexstr; *s; s++) {
+for (const char *s = hexstr; *s; s++) {
 	if (!isascii(*s)) return -1;
 	if (isspace(*s)) continue;
 	if (!isxdigit(*s)) return -1;
@@ -599,7 +599,7 @@ cvthexkey(const char *hexstr, char **ptr
 }
 
 for (us = (unsigned char *) retval, i = len; i > 0; hexstr++) {
-	c = *hexstr;
+	char c = *hexstr;
 	if (isspace(c)) continue;	 /* already know it is ascii */
 	if (isupper(c))
 	c = tolower(c);
@@ -626,13 +626,12 @@ dispatch_command(const char *inputfilena
 		 CommandTable *tab,
 		 int *statusp)
 {
-CommandTable *ct;
 const char *cmd;
 int n;
 	/* scan table for command */
 cmd = argv[0];
 n = strlen (cmd);
-for (ct = tab; ct->name; ct++) {
+for (CommandTable *ct = tab; ct->name; ct++) {
 	/* look for unique prefix */
 	if (n >= ct->minlen && n <= ct->maxlen &&
 	strncmp (cmd, ct->name, n) == 0) {
@@ -657,7 +656,7 @@ static volatile Bool dying = False;
 
 /* poor man's puts(), for under signal handlers, 
extended to ignore warn_unused_result */
-#define WRITES(fd, S) {if(write((fd), (S), strlen((S;}
+#define WRITES(fd, S) {if(write((fd), (S), strlen((S{}}
 
 /* ARGSUSED */
 _X_NORETURN
@@ -712,7 +711,6 @@ int
 auth_initialize(const char *authfilename)
 {
 int n;
-AuthList *head, *tail;
 FILE *authfp;
 Bool exists;
 
@@ -794,6 +792,8 @@ auth_initialize(const char *authfilename
 		 "%s:  file %s does not exist\n",
 		 ProgramName, authfilename);
 } else {
+	AuthList *head, *tail;
+
 	xauth_existed = True;
 	n = read_auth_entries (authfp, False, &head, &tail);
 	(void) fclose (authfp);
@@ -826,7 +826,6 @@ write_auth_file(char *tmp_nam)
 {
 FILE *fp = NULL;
 int fd;
-AuthList *list;
 
 /*
  * xdm and auth spec assumes auth file is 12 or fewer characters
@@ -848,7 +847,7 @@ write_auth_file(char *tmp_nam)
  * Write MIT-MAGIC-COOKIE-1 first, because R4 Xlib 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:38:50 UTC 2024

Modified Files:
xsrc/external/mit/xmh/dist: tocfuncs.c

Log Message:
re-merge properly


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xmh/dist/tocfuncs.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/xmh/dist/tocfuncs.c
diff -u xsrc/external/mit/xmh/dist/tocfuncs.c:1.1.1.3 xsrc/external/mit/xmh/dist/tocfuncs.c:1.2
--- xsrc/external/mit/xmh/dist/tocfuncs.c:1.1.1.3	Thu Jul  4 00:50:02 2024
+++ xsrc/external/mit/xmh/dist/tocfuncs.c	Thu Jul  4 08:38:50 2024
@@ -963,7 +963,7 @@ static void TwiddleSequence(Scrn scrn, T
 argv[0] = "mark";
 argv[1] = TocMakeFolderName(toc);
 argv[2] = "-sequence";
-argv[3] = selectedseq->name;
+argv[3] = __UNCONST(selectedseq->name);
 switch (op) {
   case ADD:
 	argv[4] = "-add";

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:38:50 UTC 2024

Modified Files:
xsrc/external/mit/xmh/dist: tocfuncs.c

Log Message:
re-merge properly


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xmh/dist/tocfuncs.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/libpciaccess/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:35:39 UTC 2024

Added Files:
xsrc/external/mit/libpciaccess/dist: configure

Log Message:
pkgconfig hack.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libpciaccess/dist/configure

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

Added files:

Index: xsrc/external/mit/libpciaccess/dist/configure
diff -u /dev/null xsrc/external/mit/libpciaccess/dist/configure:1.3
--- /dev/null	Thu Jul  4 08:35:39 2024
+++ xsrc/external/mit/libpciaccess/dist/configure	Thu Jul  4 08:35:38 2024
@@ -0,0 +1,8 @@
+# XXX hack for netbsd pkgconfig processing.
+
+# Identity of this package.
+PACKAGE_NAME='libpciaccess'
+PACKAGE_TARNAME='libpciaccess'
+PACKAGE_VERSION='0.18.1'
+PACKAGE_STRING='libpciaccess 0.18.1'
+PACKAGE_URL=''

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:35:39 UTC 2024

Added Files:
xsrc/external/mit/libpciaccess/dist: configure

Log Message:
pkgconfig hack.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libpciaccess/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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:34:30 UTC 2024

Modified Files:
xsrc/external/mit/fonttosfnt/dist: struct.c
xsrc/external/mit/libpciaccess/dist/src: common_device_name.c
Removed Files:
xsrc/external/mit/libpciaccess/dist: ChangeLog INSTALL Makefile.am
Makefile.in aclocal.m4 compile config.guess config.h.in config.sub
configure configure.ac depcomp install-sh ltmain.sh missing
xsrc/external/mit/libpciaccess/dist/include: Makefile.am Makefile.in
xsrc/external/mit/libpciaccess/dist/m4: ax_define_dir.m4 libtool.m4
ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/man: Makefile.am Makefile.in
xsrc/external/mit/libpciaccess/dist/scanpci: Makefile.am Makefile.in
xsrc/external/mit/libpciaccess/dist/src: Makefile.am Makefile.in

Log Message:
merge fonttosfnt 1.2.3, and libpciaccess 0.18.1.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fonttosfnt/dist/struct.c
cvs rdiff -u -r1.1.1.13 -r0 xsrc/external/mit/libpciaccess/dist/ChangeLog \
xsrc/external/mit/libpciaccess/dist/configure \
xsrc/external/mit/libpciaccess/dist/configure.ac
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libpciaccess/dist/INSTALL \
xsrc/external/mit/libpciaccess/dist/compile
cvs rdiff -u -r1.1.1.7 -r0 xsrc/external/mit/libpciaccess/dist/Makefile.am
cvs rdiff -u -r1.1.1.12 -r0 xsrc/external/mit/libpciaccess/dist/Makefile.in \
xsrc/external/mit/libpciaccess/dist/aclocal.m4
cvs rdiff -u -r1.1.1.11 -r0 xsrc/external/mit/libpciaccess/dist/config.guess \
xsrc/external/mit/libpciaccess/dist/config.sub
cvs rdiff -u -r1.1.1.10 -r0 xsrc/external/mit/libpciaccess/dist/config.h.in \
xsrc/external/mit/libpciaccess/dist/ltmain.sh
cvs rdiff -u -r1.1.1.8 -r0 xsrc/external/mit/libpciaccess/dist/depcomp \
xsrc/external/mit/libpciaccess/dist/install-sh \
xsrc/external/mit/libpciaccess/dist/missing
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libpciaccess/dist/include/Makefile.am
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libpciaccess/dist/include/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4
cvs rdiff -u -r1.7 -r0 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.6 -r0 xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libpciaccess/dist/man/Makefile.am
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libpciaccess/dist/man/Makefile.in
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in
cvs rdiff -u -r1.1.1.9 -r0 \
xsrc/external/mit/libpciaccess/dist/src/Makefile.am
cvs rdiff -u -r1.1.1.12 -r0 \
xsrc/external/mit/libpciaccess/dist/src/Makefile.in
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_device_name.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/fonttosfnt/dist/struct.c
diff -u xsrc/external/mit/fonttosfnt/dist/struct.c:1.4 xsrc/external/mit/fonttosfnt/dist/struct.c:1.5
--- xsrc/external/mit/fonttosfnt/dist/struct.c:1.4	Sun Nov  1 10:24:51 2020
+++ xsrc/external/mit/fonttosfnt/dist/struct.c	Thu Jul  4 08:34:29 2024
@@ -36,40 +36,42 @@ makeFont(void)
 if(font == NULL)
 return NULL;
 
-font->numNames = 0;
-font->names = NULL;
-font->flags = 0;
-font->weight = 500;
-font->width = 5;
-font->italicAngle = 0;
-font->pxMetrics.height = UNDEF;
-font->pxMetrics.maxX = UNDEF;
-font->pxMetrics.minX = UNDEF;
-font->pxMetrics.maxY = UNDEF;
-font->pxMetrics.minY = UNDEF;
-font->pxMetrics.xHeight = UNDEF;
-font->pxMetrics.capHeight = UNDEF;
-font->pxMetrics.maxAwidth = UNDEF;
-font->pxMetrics.awidth = UNDEF;
-font->pxMetrics.ascent = UNDEF;
-font->pxMetrics.descent = UNDEF;
-font->pxMetrics.underlinePosition = UNDEF;
-font->pxMetrics.underlineThickness = UNDEF;
-font->metrics.height = UNDEF;
-font->metrics.maxX = UNDEF;
-font->metrics.minX = UNDEF;
-font->metrics.maxY = UNDEF;
-font->metrics.minY = UNDEF;
-font->metrics.xHeight = UNDEF;
-font->metrics.capHeight = UNDEF;
-font->metrics.maxAwidth = UNDEF;
-font->metrics.awidth = UNDEF;
-font->metrics.ascent = UNDEF;
-font->metrics.descent = UNDEF;
-font->metrics.underlinePosition = UNDEF;
-font->metrics.underlineThickness = UNDEF;
-font->foundry = makeName("UNKN");
-font->strikes = NULL;
+*font = (FontRec) {
+.numNames = 0,
+.names = NULL,
+   

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:34:30 UTC 2024

Modified Files:
xsrc/external/mit/fonttosfnt/dist: struct.c
xsrc/external/mit/libpciaccess/dist/src: common_device_name.c
Removed Files:
xsrc/external/mit/libpciaccess/dist: ChangeLog INSTALL Makefile.am
Makefile.in aclocal.m4 compile config.guess config.h.in config.sub
configure configure.ac depcomp install-sh ltmain.sh missing
xsrc/external/mit/libpciaccess/dist/include: Makefile.am Makefile.in
xsrc/external/mit/libpciaccess/dist/m4: ax_define_dir.m4 libtool.m4
ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/man: Makefile.am Makefile.in
xsrc/external/mit/libpciaccess/dist/scanpci: Makefile.am Makefile.in
xsrc/external/mit/libpciaccess/dist/src: Makefile.am Makefile.in

Log Message:
merge fonttosfnt 1.2.3, and libpciaccess 0.18.1.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fonttosfnt/dist/struct.c
cvs rdiff -u -r1.1.1.13 -r0 xsrc/external/mit/libpciaccess/dist/ChangeLog \
xsrc/external/mit/libpciaccess/dist/configure \
xsrc/external/mit/libpciaccess/dist/configure.ac
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libpciaccess/dist/INSTALL \
xsrc/external/mit/libpciaccess/dist/compile
cvs rdiff -u -r1.1.1.7 -r0 xsrc/external/mit/libpciaccess/dist/Makefile.am
cvs rdiff -u -r1.1.1.12 -r0 xsrc/external/mit/libpciaccess/dist/Makefile.in \
xsrc/external/mit/libpciaccess/dist/aclocal.m4
cvs rdiff -u -r1.1.1.11 -r0 xsrc/external/mit/libpciaccess/dist/config.guess \
xsrc/external/mit/libpciaccess/dist/config.sub
cvs rdiff -u -r1.1.1.10 -r0 xsrc/external/mit/libpciaccess/dist/config.h.in \
xsrc/external/mit/libpciaccess/dist/ltmain.sh
cvs rdiff -u -r1.1.1.8 -r0 xsrc/external/mit/libpciaccess/dist/depcomp \
xsrc/external/mit/libpciaccess/dist/install-sh \
xsrc/external/mit/libpciaccess/dist/missing
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libpciaccess/dist/include/Makefile.am
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libpciaccess/dist/include/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4
cvs rdiff -u -r1.7 -r0 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.6 -r0 xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libpciaccess/dist/man/Makefile.am
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libpciaccess/dist/man/Makefile.in
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am
cvs rdiff -u -r1.1.1.8 -r0 \
xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in
cvs rdiff -u -r1.1.1.9 -r0 \
xsrc/external/mit/libpciaccess/dist/src/Makefile.am
cvs rdiff -u -r1.1.1.12 -r0 \
xsrc/external/mit/libpciaccess/dist/src/Makefile.in
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_device_name.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/xkbcomp/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:27:34 UTC 2024

Modified Files:
xsrc/external/mit/xkbcomp/dist: listing.c xkbcomp.c

Log Message:
avoid a redefinition error.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xkbcomp/dist/listing.c
cvs rdiff -u -r1.1.1.9 -r1.2 xsrc/external/mit/xkbcomp/dist/xkbcomp.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/xkbcomp/dist/listing.c
diff -u xsrc/external/mit/xkbcomp/dist/listing.c:1.1.1.6 xsrc/external/mit/xkbcomp/dist/listing.c:1.2
--- xsrc/external/mit/xkbcomp/dist/listing.c:1.1.1.6	Thu Jul  4 08:14:26 2024
+++ xsrc/external/mit/xkbcomp/dist/listing.c	Thu Jul  4 08:27:34 2024
@@ -70,7 +70,6 @@ SOFTWARE.
 
 **/
 
-#include "utils.h"
 #include 
 #include 
 #include 

Index: xsrc/external/mit/xkbcomp/dist/xkbcomp.c
diff -u xsrc/external/mit/xkbcomp/dist/xkbcomp.c:1.1.1.9 xsrc/external/mit/xkbcomp/dist/xkbcomp.c:1.2
--- xsrc/external/mit/xkbcomp/dist/xkbcomp.c:1.1.1.9	Thu Jul  4 08:14:27 2024
+++ xsrc/external/mit/xkbcomp/dist/xkbcomp.c	Thu Jul  4 08:27:34 2024
@@ -24,7 +24,6 @@
 
  /
 
-#include "utils.h"
 #include 
 #include 
 #include 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:27:34 UTC 2024

Modified Files:
xsrc/external/mit/xkbcomp/dist: listing.c xkbcomp.c

Log Message:
avoid a redefinition error.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xkbcomp/dist/listing.c
cvs rdiff -u -r1.1.1.9 -r1.2 xsrc/external/mit/xkbcomp/dist/xkbcomp.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:   Thu Jul  4 08:18:12 UTC 2024

Modified Files:
xsrc/external/mit/imake/include: config.h
xsrc/external/mit/mkfontscale/dist: hash.c ident.c list.c mkfontscale.c
xsrc/external/mit/xkbcomp/dist: expr.c utils.h

Log Message:
merge imake 1.0.10, mkfontscale 1.2.3, and xkbcomp 1.4.7.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/imake/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/mkfontscale/dist/hash.c \
xsrc/external/mit/mkfontscale/dist/list.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/mkfontscale/dist/ident.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkbcomp/dist/expr.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkbcomp/dist/utils.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/imake/include/config.h
diff -u xsrc/external/mit/imake/include/config.h:1.7 xsrc/external/mit/imake/include/config.h:1.8
--- xsrc/external/mit/imake/include/config.h:1.7	Fri Nov 11 07:55:19 2022
+++ xsrc/external/mit/imake/include/config.h	Thu Jul  4 08:18:11 2024
@@ -41,7 +41,7 @@
 #define PACKAGE_NAME "imake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "imake 1.0.9"
+#define PACKAGE_STRING "imake 1.0.10"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "imake"
@@ -50,7 +50,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.9"
+#define PACKAGE_VERSION "1.0.10"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -59,10 +59,10 @@
 #define PACKAGE_VERSION_MINOR 0
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 9
+#define PACKAGE_VERSION_PATCHLEVEL 10
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.0.9"
+#define VERSION "1.0.10"

Index: xsrc/external/mit/mkfontscale/dist/hash.c
diff -u xsrc/external/mit/mkfontscale/dist/hash.c:1.2 xsrc/external/mit/mkfontscale/dist/hash.c:1.3
--- xsrc/external/mit/mkfontscale/dist/hash.c:1.2	Mon Mar 17 09:01:38 2014
+++ xsrc/external/mit/mkfontscale/dist/hash.c	Thu Jul  4 08:18:11 2024
@@ -37,17 +37,17 @@
 static unsigned
 hash(const char *string)
 {
-int i;
 unsigned u = 0;
-for(i = 0; string[i] != '\0'; i++)
-u = (u<<5) + (u >> (LOG2_NUMBUCKETS - 5)) + (unsigned char)string[i];
+
+for (int i = 0; string[i] != '\0'; i++)
+u = (u << 5) + (u >> (LOG2_NUMBUCKETS - 5)) + (unsigned char) string[i];
 return (u & (NUMBUCKETS - 1));
 }
 
 static void
 str_tolower(char *s)
 {
-while(*s != '\0') {
+while (*s != '\0') {
 *s = tolower(*s);
 s++;
 }
@@ -62,12 +62,9 @@ makeHashTable(void)
 void
 destroyHashTable(HashTablePtr table)
 {
-int i;
-HashBucketPtr bp;
-
-for(i = 0; i < NUMBUCKETS; i++) {
-while(table[i]) {
-bp = table[i];
+for (int i = 0; i < NUMBUCKETS; i++) {
+while (table[i]) {
+HashBucketPtr bp = table[i];
 table[i] = table[i]->next;
 free(bp->key);
 free(bp->value);
@@ -81,9 +78,9 @@ char *
 getHash(HashTablePtr table, const char *key)
 {
 unsigned int i = hash(key);
-HashBucketPtr bp;
-for(bp = table[i]; bp; bp = bp->next) {
-if(strcasecmp(bp->key, key) == 0)
+
+for (HashBucketPtr bp = table[i]; bp; bp = bp->next) {
+if (strcasecmp(bp->key, key) == 0)
 return bp->value;
 }
 return NULL;
@@ -95,14 +92,17 @@ putHash(HashTablePtr table, char *key, c
 unsigned int i = hash(key);
 char *keycopy = NULL, *valuecopy = NULL;
 HashBucketPtr bp;
-for(bp = table[i]; bp; bp = bp->next) {
-if(strcasecmp(bp->key, key) == 0) {
-if(prio > bp->prio) {
+
+for (bp = table[i]; bp; bp = bp->next) {
+if (strcasecmp(bp->key, key) == 0) {
+if (prio > bp->prio) {
 keycopy = strdup(key);
-if(keycopy == NULL) goto fail;
+if (keycopy == NULL)
+goto fail;
 str_tolower(keycopy);
 valuecopy = strdup(value);
-if(valuecopy == NULL) goto fail;
+if (valuecopy == NULL)
+goto fail;
 free(bp->key);
 free(bp->value);
 bp->key = keycopy;
@@ -112,14 +112,14 @@ putHash(HashTablePtr table, char *key, c
 }
 }
 keycopy = strdup(key);
-if(keycopy == NULL)
+if (keycopy == NULL)
 goto fail;
 str_tolower(keycopy);
 valuecopy = strdup(value);
-if(valuecopy == NULL)
+if (valuecopy == NULL)
 goto fail;
 bp = malloc(sizeof(HashBucketRec));
-if(bp == 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 08:18:12 UTC 2024

Modified Files:
xsrc/external/mit/imake/include: config.h
xsrc/external/mit/mkfontscale/dist: hash.c ident.c list.c mkfontscale.c
xsrc/external/mit/xkbcomp/dist: expr.c utils.h

Log Message:
merge imake 1.0.10, mkfontscale 1.2.3, and xkbcomp 1.4.7.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/imake/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/mkfontscale/dist/hash.c \
xsrc/external/mit/mkfontscale/dist/list.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/mkfontscale/dist/ident.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkbcomp/dist/expr.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkbcomp/dist/utils.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:   Thu Jul  4 06:47:13 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c

Log Message:
fix merge botch.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_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-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.14 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.15
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.14	Thu Jul  4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Thu Jul  4 06:47:13 2024
@@ -2663,7 +2663,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
if(!pNv->RandRRotation) {
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
-#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
   "Driver rotation enabled, RandR disabled\n");
 #else

Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c:1.4	Thu Jul  4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c	Thu Jul  4 06:47:13 2024
@@ -1212,7 +1212,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
 	   }
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR();
-#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
   "Driver rotation enabled, RandR disabled\n");
 #else

Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.6 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.7
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.6	Thu Jul  4 06:40:39 2024
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c	Thu Jul  4 06:47:13 2024
@@ -1238,7 +1238,6 @@ static Bool SavagePreInit(ScrnInfoPtr pS
 	psav->rotate = 1;
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
 xf86DisableRandR();
-#endif
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
 		   "Rotating screen clockwise"
"- acceleration and RandR disabled\n");
@@ -1252,7 +1251,6 @@ static Bool SavagePreInit(ScrnInfoPtr pS
 	psav->rotate = -1;
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
 xf86DisableRandR();
-#endif
 xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Rotating screen counter clockwise"
" - acceleration and RandR disabled\n");

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 06:47:13 UTC 2024

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c

Log Message:
fix merge botch.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 06:40:40 UTC 2024

Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
xsrc/external/mit/xf86-input-elographics/include: config.h
xsrc/external/mit/xf86-video-chips/dist: compile
xsrc/external/mit/xf86-video-chips/dist/src: ct_BltHiQV.h ct_accel.c
ct_driver.c
xsrc/external/mit/xf86-video-chips/dist/util: AsmMacros.h
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c g80_exa.c
g80_type.h nv_driver.c nv_setup.c nv_type.h nv_xaa.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dri.c
savage_driver.c savage_driver.h savage_exa.c
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h smi_driver.c
smi_output.c
xsrc/external/mit/xf86-video-vboxvideo/dist/src: Makefile.am
Makefile.in VBoxVideoIPRT.h edid.c pointer.c
xsrc/external/mit/xf86-video-vboxvideo/include: config.h
Removed Files:
xsrc/external/mit/xf86-video-siliconmotion/dist: README
xsrc/external/mit/xf86-video-vboxvideo/dist: README
xsrc/external/mit/xf86-video-vboxvideo/dist/src: helpers.c

Log Message:
merge xf86-input-elographics 1.4.4, xf86-video-chips 1.5.0,
xf86-video-nv 2.1.23, xf86-video-savage 2.4.1,
xf86-video-siliconmotion 1.7.10, xf86-video-vboxvideo 1.0.1.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-elographics/include/config.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-chips/dist/compile
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c
cvs rdiff -u -r1.29 -r1.30 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h \
xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-siliconmotion/dist/README
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-vboxvideo/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c
cvs rdiff -u -r1.2 -r0 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-vboxvideo/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-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.8 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.9
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.8	Sun Jan  8 21:34:49 2023
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c	Thu Jul  4 06:40:39 2024
@@ -266,7 +266,7 @@ xf86EloGetPacket(unsigned char	*buffer,
*/
   ErrorF("Elographics: Dropping one byte in an attempt to synchronize: '%c' 0x%X\n",
 	 buffer[0], buffer[0]);
-  memcpy(&buffer[0], &buffer[1], num_bytes-1);
+  memmove(&buffer[0], &buffer[1], num_bytes-1);
 }
 else {
   /*

Index: xsrc/external/mit/xf86-input-elographics/include/config.h
diff -u xsrc/external/mit/xf86-input-elographics/include/config.h:1.6 xsrc/external/mit/xf86-input-elographics/include/config.h:1.7
--- xsrc/external/mit/xf86-input-elographics/incl

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 06:40:40 UTC 2024

Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c
xsrc/external/mit/xf86-input-elographics/include: config.h
xsrc/external/mit/xf86-video-chips/dist: compile
xsrc/external/mit/xf86-video-chips/dist/src: ct_BltHiQV.h ct_accel.c
ct_driver.c
xsrc/external/mit/xf86-video-chips/dist/util: AsmMacros.h
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c g80_exa.c
g80_type.h nv_driver.c nv_setup.c nv_type.h nv_xaa.c riva_driver.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dri.c
savage_driver.c savage_driver.h savage_exa.c
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h smi_driver.c
smi_output.c
xsrc/external/mit/xf86-video-vboxvideo/dist/src: Makefile.am
Makefile.in VBoxVideoIPRT.h edid.c pointer.c
xsrc/external/mit/xf86-video-vboxvideo/include: config.h
Removed Files:
xsrc/external/mit/xf86-video-siliconmotion/dist: README
xsrc/external/mit/xf86-video-vboxvideo/dist: README
xsrc/external/mit/xf86-video-vboxvideo/dist/src: helpers.c

Log Message:
merge xf86-input-elographics 1.4.4, xf86-video-chips 1.5.0,
xf86-video-nv 2.1.23, xf86-video-savage 2.4.1,
xf86-video-siliconmotion 1.7.10, xf86-video-vboxvideo 1.0.1.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-elographics/include/config.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-chips/dist/compile
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c
cvs rdiff -u -r1.29 -r1.30 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h \
xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c \
xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-siliconmotion/dist/README
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-vboxvideo/dist/README
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/VBoxVideoIPRT.h \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/edid.c \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/pointer.c
cvs rdiff -u -r1.2 -r0 \
xsrc/external/mit/xf86-video-vboxvideo/dist/src/helpers.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-vboxvideo/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:   Thu Jul  4 05:17:50 UTC 2024

Modified Files:
xsrc/external/mit/libXaw/dist/src: Pixmap.c Text.c TextAction.c
Removed Files:
xsrc/external/mit/libXaw/dist/src: sharedlib.c
xsrc/external/mit/libpthread-stubs/dist: config.guess config.h.in
config.sub depcomp ltmain.sh stubs.c

Log Message:
merge libXaw 1.0.16, libfontenc 1.1.8, libpthread-stubs 0.5, and
util-macros 1.20.1.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXaw/dist/src/Pixmap.c \
xsrc/external/mit/libXaw/dist/src/TextAction.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXaw/dist/src/Text.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXaw/dist/src/sharedlib.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libpthread-stubs/dist/config.guess \
xsrc/external/mit/libpthread-stubs/dist/config.h.in \
xsrc/external/mit/libpthread-stubs/dist/config.sub \
xsrc/external/mit/libpthread-stubs/dist/depcomp \
xsrc/external/mit/libpthread-stubs/dist/ltmain.sh \
xsrc/external/mit/libpthread-stubs/dist/stubs.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.3 xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.4
--- xsrc/external/mit/libXaw/dist/src/Pixmap.c:1.3	Thu Mar 23 05:26:15 2023
+++ xsrc/external/mit/libXaw/dist/src/Pixmap.c	Thu Jul  4 05:17:50 2024
@@ -469,14 +469,15 @@ _XawFindCache(XawCache *xaw,
 static XawCache *
 _XawGetCache(XawCache *xaw, Screen *screen, Colormap colormap, int depth)
 {
-  XawCache *s_cache, *c_cache, *d_cache, *cache, *pcache;
+  XawCache *cache;
 
   cache = _XawFindCache(xaw, screen, colormap, depth, FIND_ALL);
 
   if (!cache)
 {
-  s_cache = _XawFindCache(xaw,
-			  screen, colormap, depth, FIND_SCREEN);
+  XawCache *c_cache, *d_cache, *pcache;
+  XawCache *s_cache = _XawFindCache(xaw,
+	screen, colormap, depth, FIND_SCREEN);
   if (!s_cache)
 	{
 	  pcache = (XawCache *)XtMalloc(sizeof(XawCache));
@@ -664,7 +665,7 @@ GetResourcePixmapPath(Display *display)
 XrmRepresentation rep_type;
 XrmValue value;
 static char *default_path =
-	"%H/%T/%N:%P/include/X11/%T/%N:/usr/X11R6/include/X11/%T/%N:/usr/include/X11/%T/%N:%N";
+	(char*)"%H/%T/%N:%P/include/X11/%T/%N:/usr/X11R6/include/X11/%T/%N:/usr/include/X11/%T/%N:%N";
 
 xrm_name[0] = XrmPermStringToQuark("pixmapFilePath");
 xrm_name[1] = NULLQUARK;
@@ -713,7 +714,7 @@ GetFileName(XawParams *params, Screen *s
 {
   if (!sub[0].substitution)
 	sub[0].substitution = getenv("HOME");
-  sub[1].substitution = (char *)params->name;
+  sub[1].substitution = (_XtString)params->name;
   if (pixmap_path == NULL)
 	GetResourcePixmapPath(DisplayOfScreen(screen));
   return XtFindFile(pixmap_path, sub, XtNumber(sub), NULL);
@@ -728,7 +729,6 @@ BitmapLoader(XawParams *params, Screen *
 {
   Pixel fg, bg;
   XColor color, exact;
-  Pixmap pixmap;
   unsigned int width, height;
   unsigned char *data = NULL;
   int hotX, hotY;
@@ -765,10 +765,11 @@ BitmapLoader(XawParams *params, Screen *
   if (XReadBitmapFileData(filename, &width, &height, &data,
 			  &hotX, &hotY) == BitmapSuccess)
 {
-  pixmap = XCreatePixmapFromBitmapData(DisplayOfScreen(screen),
-	   RootWindowOfScreen(screen),
-	   (char *)data,
-	   width, height, fg, bg, (unsigned)depth);
+  Pixmap pixmap =
+	  XCreatePixmapFromBitmapData(DisplayOfScreen(screen),
+  RootWindowOfScreen(screen),
+  (char *)data,
+  width, height, fg, bg, (unsigned)depth);
   if (data)
 	XFree(data);
   *pixmap_return = pixmap;
@@ -833,7 +834,7 @@ GradientLoader(XawParams *params, Screen
 
   value = NULL;
   if ((argval = XawFindArgVal(params, "start")) != NULL)
-value = (char *)argval->value;
+value = (char*)argval->value;
   if (value && !XAllocNamedColor(DisplayOfScreen(screen), colormap, value,
 			&start, &color))
 return (False);
@@ -844,7 +845,7 @@ GradientLoader(XawParams *params, Screen
 }
   value = NULL;
   if ((argval = XawFindArgVal(params, "end")) != NULL)
-value = (char *)argval->value;
+value = (char*)argval->value;
   if (value && !XAllocNamedColor(DisplayOfScreen(screen), colormap, value,
 			&end, &color))
 return (False);
Index: xsrc/external/mit/libXaw/dist/src/TextAction.c
diff -u xsrc/external/mit/libXaw/dist/src/TextAction.c:1.3 xsrc/external/mit/libXaw/dist/src/TextAction.c:1.4
--- xsrc/external/mit/libXaw/dist/src/TextAction.c:1.3	Thu Mar 23 05:26:15 2023
+++ xsrc/external/mit/libXaw/dist/src/TextAction.c	Thu Jul  4 05:17:50 2024
@@ -403,14 +403,14 @@ _SelectionReceived(Widget w, XtPointer c
 
 StartAction(ctx, NULL);
 if (XawTextFormat(ctx, XawFmtWide)) {
-	XTextProperty textprop;
 	wchar_t **wlist;
 	int count;
-
-	textprop.e

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 05:17:50 UTC 2024

Modified Files:
xsrc/external/mit/libXaw/dist/src: Pixmap.c Text.c TextAction.c
Removed Files:
xsrc/external/mit/libXaw/dist/src: sharedlib.c
xsrc/external/mit/libpthread-stubs/dist: config.guess config.h.in
config.sub depcomp ltmain.sh stubs.c

Log Message:
merge libXaw 1.0.16, libfontenc 1.1.8, libpthread-stubs 0.5, and
util-macros 1.20.1.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXaw/dist/src/Pixmap.c \
xsrc/external/mit/libXaw/dist/src/TextAction.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXaw/dist/src/Text.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXaw/dist/src/sharedlib.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libpthread-stubs/dist/config.guess \
xsrc/external/mit/libpthread-stubs/dist/config.h.in \
xsrc/external/mit/libpthread-stubs/dist/config.sub \
xsrc/external/mit/libpthread-stubs/dist/depcomp \
xsrc/external/mit/libpthread-stubs/dist/ltmain.sh \
xsrc/external/mit/libpthread-stubs/dist/stubs.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:   Thu Jul  4 00:58:16 UTC 2024

Modified Files:
xsrc/external/mit/xlsfonts/dist: xlsfonts.c
xsrc/external/mit/xmh/include: config.h
xsrc/external/mit/xsm/dist: choose.c
Removed Files:
xsrc/external/mit/xorg-docs/dist: README compile
xsrc/external/mit/xorg-docs/dist/specs/Xext: Makefile.am Makefile.in
lbxalg.xml

Log Message:
merge xlsfonts 1.0.8, xmh 1.0.5, xorg-docs 1.7.3, and xsm 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlsfonts/dist/xlsfonts.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xmh/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xorg-docs/dist/README \
xsrc/external/mit/xorg-docs/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-docs/dist/specs/Xext/Makefile.am \
xsrc/external/mit/xorg-docs/dist/specs/Xext/lbxalg.xml
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xorg-docs/dist/specs/Xext/Makefile.in
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xsm/dist/choose.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/xlsfonts/dist/xlsfonts.c
diff -u xsrc/external/mit/xlsfonts/dist/xlsfonts.c:1.3 xsrc/external/mit/xlsfonts/dist/xlsfonts.c:1.4
--- xsrc/external/mit/xlsfonts/dist/xlsfonts.c:1.3	Mon Jul 11 08:42:43 2022
+++ xsrc/external/mit/xlsfonts/dist/xlsfonts.c	Thu Jul  4 00:58:15 2024
@@ -36,6 +36,14 @@ in this Software without prior written a
 #include 
 #include "dsimple.h"
 
+#ifdef HAVE_BSD_STDLIB_H
+#include 
+#endif
+
+#ifndef HAVE_REALLOCARRAY
+#define reallocarray(old, num, size) realloc(old, (num) * (size))
+#endif
+
 #define N_START INT_MAX /* Maximum # of fonts to start with (should
  * always be be > 1 as modern OSes like
  * Solaris 8 already have more than 9000 XLFD
@@ -58,7 +66,7 @@ static int  font_cnt  = 
 static int  min_max;
 
 typedef struct {
-char *name;
+const char *name;
 XFontStruct *info;
 } FontList;
 
@@ -73,7 +81,7 @@ static int  IgnoreError(Display *disp, X
 static void PrintProperty(XFontProp *prop);
 static void ComputeFontType(XFontStruct *fs);
 static void print_character_metrics(register XFontStruct *info);
-static void do_query_font(Display *dpy, char *name);
+static void do_query_font(Display *dpy, const char *name);
 
 void
 usage(const char *errmsg)
@@ -191,57 +199,70 @@ main(int argc, char **argv)
 static void
 get_list(const char *pattern)
 {
-int available = nnames + 1, i;
-char **fonts;
 XFontStruct *info;
 
-/* Get list of fonts matching pattern */
-for (;;) {
-if (open_instead_of_list) {
-info = XLoadQueryFont(dpy, pattern);
-
-if (info) {
-fonts = __UNCONST(&pattern);
-available = 1;
-XUnloadFont(dpy, info->fid);
-}
-else {
-fonts = NULL;
-}
-break;
-}
-
-if (long_list == L_MEDIUM)
-fonts = XListFontsWithInfo(dpy, pattern, nnames, &available, &info);
-else
-fonts = XListFonts(dpy, pattern, nnames, &available);
-if (fonts == NULL || available < nnames)
-break;
-if (long_list == L_MEDIUM)
-XFreeFontInfo(fonts, info, available);
-else
-XFreeFontNames(fonts);
-nnames = available * 2;
-}
-
-if (fonts == NULL) {
-fprintf(stderr, "%s: pattern \"%s\" unmatched\n",
-program_name, pattern);
-return;
-}
+if (open_instead_of_list) {
+info = XLoadQueryFont(dpy, pattern);
 
-font_list = realloc(font_list, (font_cnt + available) * sizeof(FontList));
-if (font_list == NULL)
-Fatal_Error("Out of memory!");
-for (i = 0; i < available; i++) {
-font_list[font_cnt].name = fonts[i];
-if (long_list == L_MEDIUM)
-font_list[font_cnt].info = info + i;
-else
+if (info == NULL) {
+fprintf(stderr, "%s: pattern \"%s\" unmatched\n",
+program_name, pattern);
+return;
+}
+
+font_list = reallocarray(font_list, (font_cnt + 1), sizeof(FontList));
+if (font_list == NULL)
+Fatal_Error("Out of memory!");
+font_list[font_cnt].name = pattern;
+if (long_list == L_MEDIUM) {
+font_list[font_cnt].info = info;
+XUnloadFont(dpy, info->fid);
+}
+else {
 font_list[font_cnt].info = NULL;
-
+XFreeFont(dpy, info);
+}
 font_cnt++;
 }
+else {
+/* Get list of fonts matching pattern */
+int available = nnames + 1;
+char **fonts;
+
+for (;;) {
+if (long_list == L_MEDIUM)
+fonts = X

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 00:58:16 UTC 2024

Modified Files:
xsrc/external/mit/xlsfonts/dist: xlsfonts.c
xsrc/external/mit/xmh/include: config.h
xsrc/external/mit/xsm/dist: choose.c
Removed Files:
xsrc/external/mit/xorg-docs/dist: README compile
xsrc/external/mit/xorg-docs/dist/specs/Xext: Makefile.am Makefile.in
lbxalg.xml

Log Message:
merge xlsfonts 1.0.8, xmh 1.0.5, xorg-docs 1.7.3, and xsm 1.0.6.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xlsfonts/dist/xlsfonts.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xmh/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xorg-docs/dist/README \
xsrc/external/mit/xorg-docs/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-docs/dist/specs/Xext/Makefile.am \
xsrc/external/mit/xorg-docs/dist/specs/Xext/lbxalg.xml
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xorg-docs/dist/specs/Xext/Makefile.in
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xsm/dist/choose.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:   Thu Jul  4 00:26:57 UTC 2024

Modified Files:
xsrc/external/mit/xbiff/dist: compile
xsrc/external/mit/xbiff/include: config.h
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xman/dist: handler.c misc.c search.c vendor.h
xsrc/external/mit/xmore/dist: compile

Log Message:
merge xbiff 1.0.5, xconsole 1.1.0, xditview 1.0.7, xedit 1.2.4,
xev 1.2.6, xeyes 1.3.0, xload 1.2.0, xman 1.2.0, xmessage 1.0.7,
and xmore 1.0.4.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xbiff/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xbiff/include/config.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xman/dist/handler.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/search.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xman/dist/vendor.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmore/dist/compile

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Thu Jul  4 00:26:57 UTC 2024

Modified Files:
xsrc/external/mit/xbiff/dist: compile
xsrc/external/mit/xbiff/include: config.h
xsrc/external/mit/xconsole/dist: xconsole.c
xsrc/external/mit/xman/dist: handler.c misc.c search.c vendor.h
xsrc/external/mit/xmore/dist: compile

Log Message:
merge xbiff 1.0.5, xconsole 1.1.0, xditview 1.0.7, xedit 1.2.4,
xev 1.2.6, xeyes 1.3.0, xload 1.2.0, xman 1.2.0, xmessage 1.0.7,
and xmore 1.0.4.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xbiff/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xbiff/include/config.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xman/dist/handler.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/search.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xman/dist/vendor.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xmore/dist/compile

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

Modified files:

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

Index: xsrc/external/mit/xbiff/include/config.h
diff -u xsrc/external/mit/xbiff/include/config.h:1.2 xsrc/external/mit/xbiff/include/config.h:1.3
--- xsrc/external/mit/xbiff/include/config.h:1.2	Mon Jul 15 04:54:47 2019
+++ xsrc/external/mit/xbiff/include/config.h	Thu Jul  4 00:26:57 2024
@@ -44,7 +44,7 @@
 #define PACKAGE_NAME "xbiff"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xbiff 1.0.4"
+#define PACKAGE_STRING "xbiff 1.0.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xbiff"
@@ -53,7 +53,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.4"
+#define PACKAGE_VERSION "1.0.5"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -62,10 +62,10 @@
 #define PACKAGE_VERSION_MINOR 0
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 4
+#define PACKAGE_VERSION_PATCHLEVEL 5
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.0.4"
+#define VERSION "1.0.5"

Index: xsrc/external/mit/xconsole/dist/xconsole.c
diff -u xsrc/external/mit/xconsole/dist/xconsole.c:1.6 xsrc/external/mit/xconsole/dist/xconsole.c:1.7
--- xsrc/external/mit/xconsole/dist/xconsole.c:1.6	Mon Jul 11 08:49:36 2022
+++ xsrc/external/mit/xconsole/dist/xconsole.c	Thu Jul  4 00:26:57 2024
@@ -157,15 +157,8 @@ static XrmOptionDescRec options[] = {
 # endif
 #endif
 
-#if defined(_AIX)
-#  define USE_PTS
-#endif
-
 #if !defined (USE_FILE) || defined (linux)
 # include 
-# ifdef hpux
-#  include 
-# endif
 # if defined (SVR4) ||

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul  3 08:55:38 UTC 2024

Modified Files:
xsrc/external/mit/makedepend/dist: def.h

Log Message:
merge makedepend-1.0.9.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/makedepend/dist/def.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/makedepend/dist/def.h
diff -u xsrc/external/mit/makedepend/dist/def.h:1.3 xsrc/external/mit/makedepend/dist/def.h:1.4
--- xsrc/external/mit/makedepend/dist/def.h:1.3	Mon Dec 19 00:44:57 2022
+++ xsrc/external/mit/makedepend/dist/def.h	Wed Jul  3 08:55:38 2024
@@ -28,8 +28,6 @@ in this Software without prior written a
 # include "makedepend-config.h"
 #endif
 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -38,16 +36,45 @@ in this Software without prior written a
 #include 
 #include 
 
+/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */
+#ifndef __has_attribute
+# define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
+#endif
+
+#ifndef _X_ATTRIBUTE_PRINTF
+#if __has_attribute(__format__) \
+|| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
+# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
+#else /* not gcc >= 2.3 */
+# define _X_ATTRIBUTE_PRINTF(x,y)
+#endif
+#endif
+
+#ifndef _X_NORETURN
+#if __has_attribute(noreturn) \
+|| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
+|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+# define _X_NORETURN __attribute((noreturn))
+#else
+# define _X_NORETURN
+#endif /* GNUC  */
+#endif
+
+#ifndef HAVE_REALLOCARRAY
+#define reallocarray(ptr, num, size)realloc(ptr, (num) * (size))
+#endif
+#define mallocarray(num, size)  reallocarray(NULL, num, size)
+
 #define MAXDEFINES	512
 #define MAXFILES	2048
-#define MAXINCFILES	128	/* "-include" files */
-#define MAXDIRS		512	/* -I flags */
+#define MAXINCFILES	128 /* "-include" files */
+#define MAXDIRS		512 /* -I flags */
 #define PATHMAX		4096/* realpath */
-#define SYMTABINC	10	/* must be > 1 for define() to work right */
+#define SYMTABINC	10  /* must be > 1 for define() to work right */
 #define	TRUE		1
 #define	FALSE		0
 
-/* the following must match the directives table in main.c */
+/* the following must match the directives table in parse.c */
 #define	IF		0
 #define	IFDEF		1
 #define	IFNDEF		2
@@ -65,15 +92,16 @@ in this Software without prior written a
 #define EJECT   14
 #define WARNING 15
 #define INCLUDENEXT 16
-#define IFFALSE 17 /* pseudo value --- never matched */
-#define ELIFFALSE   18 /* pseudo value --- never matched */
-#define INCLUDEDOT  19 /* pseudo value --- never matched */
-#define IFGUESSFALSE20 /* pseudo value --- never matched */
-#define ELIFGUESSFALSE  21 /* pseudo value --- never matched */
-#define INCLUDENEXTDOT  22 /* pseudo value --- never matched */
+#define IFFALSE 17  /* pseudo value --- never matched */
+#define ELIFFALSE   18  /* pseudo value --- never matched */
+#define INCLUDEDOT  19  /* pseudo value --- never matched */
+#define IFGUESSFALSE20  /* pseudo value --- never matched */
+#define ELIFGUESSFALSE  21  /* pseudo value --- never matched */
+#define INCLUDENEXTDOT  22  /* pseudo value --- never matched */
 
 #ifdef DEBUG
-extern int	_debugmask;
+extern int _debugmask;
+
 /*
  * debug levels are:
  *
@@ -88,108 +116,100 @@ extern int	_debugmask;
 #define	debug(level,arg) do { /**/ } while (0)
 #endif /* DEBUG */
 
-typedef	unsigned char boolean;
+typedef unsigned char boolean;
 
 struct symtab {
-	char	*s_name;
-	char	*s_value;
+char *s_name;
+char *s_value;
 };
 
 /* possible i_flag */
-#define DEFCHECKED	(1<<0)	/* whether defines have been checked */
-#define NOTIFIED	(1<<1)	/* whether we have revealed includes */
-#define MARKED		(1<<2)	/* whether it's in the makefile */
-#define SEARCHED	(1<<3)	/* whether we have read this */
-#define FINISHED	(1<<4)	/* whether we are done reading this */
-#define INCLUDED_SYM	(1<<5)	/* whether #include SYMBOL was found
-   Can't use i_list if TRUE */
-struct	inclist {
-	char		*i_incstring;	/* string from #include line */
-	char		*i_file;	/* path name of the include file */
-	struct inclist	**i_list;	/* list of files it itself includes */
-	struct symtab	**i_defs;	/* symbol table for this file and its
-	   children when merged */
-	int		i_listlen;	/* length of i_list */
-	int		i_ndefs;	/* current # defines */
-	boolean		*i_merged;  /* whether we have merged child
-	   defines */
-	unsigned char   i_flags;
+#define DEFCHECKED	(1<<0)  /* whether defines have been checked */
+#define NOTIFIED	(1<<1)  /* whether we have revealed includes */
+#define MARKED		(1<<2)  /* whether it's in the makefile */
+#define SEARCHED	(1<<

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul  3 08:55:38 UTC 2024

Modified Files:
xsrc/external/mit/makedepend/dist: def.h

Log Message:
merge makedepend-1.0.9.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/makedepend/dist/def.h

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul  3 06:46:37 UTC 2024

Modified Files:
xsrc/external/mit/libXext/dist/src: XEVI.c Xge.c
xsrc/external/mit/libXvMC/dist/src: XvMC.c

Log Message:
merge libXext-1.3.6 and libXvMC-1.0.14.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXext/dist/src/XEVI.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libXext/dist/src/Xge.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libXvMC/dist/src/XvMC.c

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

Modified files:

Index: xsrc/external/mit/libXext/dist/src/XEVI.c
diff -u xsrc/external/mit/libXext/dist/src/XEVI.c:1.3 xsrc/external/mit/libXext/dist/src/XEVI.c:1.4
--- xsrc/external/mit/libXext/dist/src/XEVI.c:1.3	Sat Oct 29 21:02:03 2022
+++ xsrc/external/mit/libXext/dist/src/XEVI.c	Wed Jul  3 06:46:37 2024
@@ -173,7 +173,7 @@ Status XeviGetVisualInfo(
 	sz_xInfo = rep.n_info * sz_xExtendedVisualInfo;
 	sz_conflict = rep.n_conflicts * sizeof(VisualID);
 	sz_xConflict = rep.n_conflicts * sz_VisualID32;
-	*evi_return = Xcalloc(sz_info + sz_conflict, 1);
+	*evi_return = Xcalloc(1, sz_info + sz_conflict);
 	temp_xInfo = Xmalloc(sz_xInfo);
 	temp_conflict = Xmalloc(sz_xConflict);
 } else {

Index: xsrc/external/mit/libXext/dist/src/Xge.c
diff -u xsrc/external/mit/libXext/dist/src/Xge.c:1.7 xsrc/external/mit/libXext/dist/src/Xge.c:1.8
--- xsrc/external/mit/libXext/dist/src/Xge.c:1.7	Sat Oct 29 21:02:03 2022
+++ xsrc/external/mit/libXext/dist/src/Xge.c	Wed Jul  3 06:46:37 2024
@@ -188,13 +188,14 @@ _xgeGetExtensionVersion(Display* dpy,
 
 if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
 {
-Xfree(info);
 return NULL;
 }
 
 vers = Xmalloc(sizeof(XGEVersionRec));
-vers->major_version = rep.majorVersion;
-vers->minor_version = rep.minorVersion;
+if (vers != NULL) {
+vers->major_version = rep.majorVersion;
+vers->minor_version = rep.minorVersion;
+}
 return vers;
 }
 
@@ -207,7 +208,7 @@ _xgeDpyClose(Display* dpy, XExtCodes* co
 {
 XExtDisplayInfo *info = _xgeFindDisplay(dpy);
 
-if (info->data != NULL) {
+if (info != NULL && info->data != NULL) {
 XGEData* xge_data = (XGEData*)info->data;
 
 if (xge_data->extensions)

Index: xsrc/external/mit/libXvMC/dist/src/XvMC.c
diff -u xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.8 xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.9
--- xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.8	Tue Jul 12 01:23:01 2022
+++ xsrc/external/mit/libXvMC/dist/src/XvMC.c	Wed Jul  3 06:46:37 2024
@@ -22,40 +22,37 @@ static XExtensionInfo _xvmc_info_data;
 static XExtensionInfo *xvmc_info = &_xvmc_info_data;
 static const char *xvmc_extension_name = XvMCName;
 
-static const char *xvmc_error_list[] =
-{
-   "BadContext",
-   "BadSurface",
-   "BadSubpicture"
+static const char *xvmc_error_list[] = {
+"BadContext",
+"BadSurface",
+"BadSubpicture"
 };
 
-static XEXT_GENERATE_CLOSE_DISPLAY (xvmc_close_display, xvmc_info)
-
-
-static XEXT_GENERATE_ERROR_STRING (xvmc_error_string, xvmc_extension_name,
-   XvMCNumErrors, xvmc_error_list)
-
+static XEXT_GENERATE_CLOSE_DISPLAY(xvmc_close_display, xvmc_info)
+static XEXT_GENERATE_ERROR_STRING(xvmc_error_string, xvmc_extension_name,
+  XvMCNumErrors, xvmc_error_list)
 
 static XExtensionHooks xvmc_extension_hooks = {
-NULL,   /* create_gc */
-NULL,   /* copy_gc */
-NULL,   /* flush_gc */
-NULL,   /* free_gc */
-NULL,   /* create_font */
-NULL,   /* free_font */
-xvmc_close_display, /* close_display */
-NULL,   /* wire_to_event */
-NULL,   /* event_to_wire */
-NULL,   /* error */
-xvmc_error_string   /* error_string */
+NULL,   /* create_gc */
+NULL,   /* copy_gc */
+NULL,   /* flush_gc */
+NULL,   /* free_gc */
+NULL,   /* create_font */
+NULL,   /* free_font */
+xvmc_close_display, /* close_display */
+NULL,   /* wire_to_event */
+NULL,   /* event_to_wire */
+NULL,   /* error */
+xvmc_error_string   /* error_string */
 };
 
-static XEXT_GENERATE_FIND_DISPLAY (xvmc_find_display, xvmc_info,
-   xvmc_extension_name,
-   &xvmc_extension_hooks,
-   XvMCNumEvents, NULL)
+static XEXT_GENERATE_FIND_DISPLAY(xvmc_find_display, xvmc_info,
+

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul  3 06:46:37 UTC 2024

Modified Files:
xsrc/external/mit/libXext/dist/src: XEVI.c Xge.c
xsrc/external/mit/libXvMC/dist/src: XvMC.c

Log Message:
merge libXext-1.3.6 and libXvMC-1.0.14.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXext/dist/src/XEVI.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libXext/dist/src/Xge.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libXvMC/dist/src/XvMC.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/src/xcms

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul  2 07:31:12 UTC 2024

Modified Files:
xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c

Log Message:
restore vax fp code removed here in libX11 1.8.8.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.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/src/xcms/cmsTrig.c
diff -u xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c:1.5 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c:1.6
--- xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c:1.5	Tue Jul  2 07:29:21 2024
+++ xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c	Tue Jul  2 07:31:12 2024
@@ -71,7 +71,11 @@ _XcmsModuloF(
 #define XCMS_SIXTHPI		0.523598775598298820
 #define XCMS_RADIANS(d)		((d) * XCMS_PI / 180.0)
 #define XCMS_DEGREES(r)		((r) * 180.0 / XCMS_PI)
+#ifdef __vax__
+#define XCMS_X6_UNDERFLOWS	(3.784659e-07)  /* X**6 almost underflows*/
+#else
 #define XCMS_X6_UNDERFLOWS	(4.209340e-52)	/* X**6 almost underflows */
+#endif
 #define XCMS_X16_UNDERFLOWS	(5.421010e-20)	/* X**16 almost underflows*/
 #define XCMS_CHAR_BIT		8
 #define XCMS_LONG_MAX		0x7FFF

CVS commit: xsrc/external/mit/libX11/dist/src/xcms

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jul  2 07:31:12 UTC 2024

Modified Files:
xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c

Log Message:
restore vax fp code removed here in libX11 1.8.8.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.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:   Tue Jul  2 07:29:21 UTC 2024

Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure
configure.ac
xsrc/external/mit/libX11/dist/include/X11: Xlib.h Xlibint.h
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src: CrGlCur.c XlibInt.c globals.c
xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c

Log Message:
merge libX11 1.8.9.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/README.md \
xsrc/external/mit/libX11/dist/aclocal.m4
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/include/X11/Xlib.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/include/X11/Xlibint.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/CrGlCur.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/globals.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.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/dist/hw/xfree86

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jun 21 21:34:48 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c

Log Message:
fix build on alpha.

some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.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/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.21
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20	Fri Jul 15 04:10:41 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h	Fri Jun 21 21:34:48 2024
@@ -952,6 +952,9 @@ inl(unsigned PORT_SIZE port)
 #endif
 
 #ifdef __alpha__
+
+#include 
+
 static inline int
 xf86ReadMmio8(void *Base, unsigned long Offset)
 {

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6	Sat Aug  5 06:03:26 2017
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c	Fri Jun 21 21:34:48 2024
@@ -212,26 +212,3 @@ xf86DisableIO()
 }
 
 #endif  /* USE_ALPHA_PIO */
-
-extern int readDense8(void *Base, register unsigned long Offset);
-extern int readDense16(void *Base, register unsigned long Offset);
-extern int readDense32(void *Base, register unsigned long Offset);
-extern void
- writeDense8(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense16(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense32(int Value, void *Base, register unsigned long Offset);
-
-void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
-= writeDense8;
-void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
-= writeDense16;
-void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
-= writeDense32;
-int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
-= readDense8;
-int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
-= readDense16;
-int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
-= readDense32;

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jun 21 21:34:48 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c

Log Message:
fix build on alpha.

some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.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/dist/hw/xfree86/modes

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Jun 10 22:51:01 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Modes.c

Log Message:
make sure we fill in the name field in generated / converted modes
fixes PR 58321, tested by tsutsui@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.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/dist/hw/xfree86/modes/xf86Modes.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c:1.1.1.8	Fri Jul 15 02:12:51 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.c	Mon Jun 10 22:51:01 2024
@@ -818,6 +818,7 @@ xf86CVTMode(int HDisplay, int VDisplay, 
 Mode->VTotal = libxcvt_mode_info->vtotal;
 Mode->VRefresh   = libxcvt_mode_info->vrefresh;
 Mode->Flags  = libxcvt_mode_info->mode_flags;
+xf86SetModeDefaultName(Mode);
 
 free(libxcvt_mode_info);
 

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Jun 10 22:51:01 UTC 2024

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Modes.c

Log Message:
make sure we fill in the name field in generated / converted modes
fixes PR 58321, tested by tsutsui@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.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:   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, &intr->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, &payload, 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(&b->nb, &instr->dest.ssa, result_size);
   dest->elems[1]->def = nir_channels(&b->nb, &instr->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], &instr->dest.ssa);
@@ -3514,7 +3515,8 @@ vtn_handle_image(struct vtn_builder *b, 
  if (intrin->dest.ssa.bit_size != 32)
 

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(&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff,
+  shaYoff);
+if (sizeof(FbBits) != sizeof

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, &keySyms, 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(&rmlvo);
+ 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,
+   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(DeviceIn

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 *
-	(pScrn->bitsPerPixe

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: xsrc/external/mit/xo

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
 generat

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 to

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