CVS commit: src/sys/dev/pci

2021-09-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Sep 11 19:56:51 UTC 2021

Modified Files:
src/sys/dev/pci: pci_subr.c

Log Message:
add 32.0GT/s to the list of pcie speeds (PCIe 5.x.)


To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/dev/pci/pci_subr.c

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

Modified files:

Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.229 src/sys/dev/pci/pci_subr.c:1.230
--- src/sys/dev/pci/pci_subr.c:1.229	Tue Aug 17 22:00:31 2021
+++ src/sys/dev/pci/pci_subr.c	Sat Sep 11 19:56:51 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.229 2021/08/17 22:00:31 andvar Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.230 2021/09/11 19:56:51 mrg Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.229 2021/08/17 22:00:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.230 2021/09/11 19:56:51 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -1743,7 +1743,9 @@ pci_print_pcie_compl_timeout(uint32_t va
 	}
 }
 
-static const char * const pcie_linkspeeds[] = {"2.5", "5.0", "8.0", "16.0"};
+static const char * const pcie_linkspeeds[] = {
+	"2.5", "5.0", "8.0", "16.0", "32.0"
+};
 
 /*
  * Print link speed. This function is used for the following register bits:



CVS commit: src/sys/dev/pci

2021-09-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Sep 11 19:56:51 UTC 2021

Modified Files:
src/sys/dev/pci: pci_subr.c

Log Message:
add 32.0GT/s to the list of pcie speeds (PCIe 5.x.)


To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/dev/pci/pci_subr.c

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



CVS commit: src/sys/dev/pci

2021-09-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Sep  9 08:11:43 UTC 2021

Modified Files:
src/sys/dev/pci: pcireg.h

Log Message:
fix part of the previous: Link Capability Max Speed is a value not
a bitmask.  pointed out by msaitoh@.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/pci/pcireg.h

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



CVS commit: src/sys/dev/pci

2021-09-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Sep  9 08:11:43 UTC 2021

Modified Files:
src/sys/dev/pci: pcireg.h

Log Message:
fix part of the previous: Link Capability Max Speed is a value not
a bitmask.  pointed out by msaitoh@.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/pci/pcireg.h

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

Modified files:

Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.157 src/sys/dev/pci/pcireg.h:1.158
--- src/sys/dev/pci/pcireg.h:1.157	Thu Sep  9 02:12:48 2021
+++ src/sys/dev/pci/pcireg.h	Thu Sep  9 08:11:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcireg.h,v 1.157 2021/09/09 02:12:48 mrg Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.158 2021/09/09 08:11:42 mrg Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -1017,12 +1017,12 @@ typedef u_int8_t pci_revision_t;
 #define PCIE_DCSR_EMGPWRREDD	__BIT(6 + 16)  /* Emg. Pwr. Reduct. Detected */
 #define PCIE_LCAP	0x0c	/* Link Capabilities Register */
 #define PCIE_LCAP_MAX_SPEED	__BITS(3, 0)   /* Max Link Speed */
-#define  PCIE_LCAP_MAX_SPEED_2	__BIT(0)   /* 2.5GT/s */
-#define  PCIE_LCAP_MAX_SPEED_5	__BIT(1)   /* 5GT/s */
-#define  PCIE_LCAP_MAX_SPEED_8	__BIT(3)   /* 8GT/s */
-#define  PCIE_LCAP_MAX_SPEED_16	__BIT(4)   /* 16GT/s */
-#define  PCIE_LCAP_MAX_SPEED_32	__BIT(5)   /* 32GT/s */
-#define  PCIE_LCAP_MAX_SPEED_64	__BIT(6)   /* 64GT/s */
+#define  PCIE_LCAP_MAX_SPEED_2	1	   /* 2.5GT/s */
+#define  PCIE_LCAP_MAX_SPEED_5	2	   /* 5GT/s */
+#define  PCIE_LCAP_MAX_SPEED_8	3	   /* 8GT/s */
+#define  PCIE_LCAP_MAX_SPEED_16	4	   /* 16GT/s */
+#define  PCIE_LCAP_MAX_SPEED_32	5	   /* 32GT/s */
+#define  PCIE_LCAP_MAX_SPEED_64	6	   /* 64GT/s */
 #define PCIE_LCAP_MAX_WIDTH	__BITS(9, 4)   /* Maximum Link Width */
 #define PCIE_LCAP_ASPM		__BITS(11, 10) /* Active State Link PM Supp. */
 #define PCIE_LCAP_L0S_EXIT	__BITS(14, 12) /* L0s Exit Latency */



CVS commit: src/sys/dev/pci

2021-09-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Sep  9 02:12:48 UTC 2021

Modified Files:
src/sys/dev/pci: pcireg.h

Log Message:
add some bits in the pci Link Capabilities Register, and also the similar
set in the Link Capabilities 2 Register.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/dev/pci/pcireg.h

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

Modified files:

Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.156 src/sys/dev/pci/pcireg.h:1.157
--- src/sys/dev/pci/pcireg.h:1.156	Tue Aug 17 22:00:32 2021
+++ src/sys/dev/pci/pcireg.h	Thu Sep  9 02:12:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcireg.h,v 1.156 2021/08/17 22:00:32 andvar Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.157 2021/09/09 02:12:48 mrg Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -1017,6 +1017,12 @@ typedef u_int8_t pci_revision_t;
 #define PCIE_DCSR_EMGPWRREDD	__BIT(6 + 16)  /* Emg. Pwr. Reduct. Detected */
 #define PCIE_LCAP	0x0c	/* Link Capabilities Register */
 #define PCIE_LCAP_MAX_SPEED	__BITS(3, 0)   /* Max Link Speed */
+#define  PCIE_LCAP_MAX_SPEED_2	__BIT(0)   /* 2.5GT/s */
+#define  PCIE_LCAP_MAX_SPEED_5	__BIT(1)   /* 5GT/s */
+#define  PCIE_LCAP_MAX_SPEED_8	__BIT(3)   /* 8GT/s */
+#define  PCIE_LCAP_MAX_SPEED_16	__BIT(4)   /* 16GT/s */
+#define  PCIE_LCAP_MAX_SPEED_32	__BIT(5)   /* 32GT/s */
+#define  PCIE_LCAP_MAX_SPEED_64	__BIT(6)   /* 64GT/s */
 #define PCIE_LCAP_MAX_WIDTH	__BITS(9, 4)   /* Maximum Link Width */
 #define PCIE_LCAP_ASPM		__BITS(11, 10) /* Active State Link PM Supp. */
 #define PCIE_LCAP_L0S_EXIT	__BITS(14, 12) /* L0s Exit Latency */
@@ -1136,6 +1142,12 @@ typedef u_int8_t pci_revision_t;
 #define PCIE_DCSR2_EETLP	__BIT(15)  /* End-End TLP Prefix Blcking */
 #define PCIE_LCAP2	0x2c	/* Link Capabilities 2 Register */
 #define PCIE_LCAP2_SUP_LNKSV	__BITS(7, 1)   /* Supported Link Speeds Vect */
+#define  PCIE_LCAP2_SUP_LNKS2	__BIT(1)   /* Supported Speed 2.5GT/ */
+#define  PCIE_LCAP2_SUP_LNKS5	__BIT(2)   /* Supported Speed 5GT/ */
+#define  PCIE_LCAP2_SUP_LNKS8	__BIT(3)   /* Supported Speed 8GT/ */
+#define  PCIE_LCAP2_SUP_LNKS16	__BIT(4)   /* Supported Speed 16GT/ */
+#define  PCIE_LCAP2_SUP_LNKS32	__BIT(5)   /* Supported Speed 32GT/ */
+#define  PCIE_LCAP2_SUP_LNKS64	__BIT(6)   /* Supported Speed 64GT/ */
 #define PCIE_LCAP2_CROSSLNK	__BIT(8)   /* Crosslink Supported */
 #define PCIE_LCAP2_LOWSKPOS_GENSUPPSV __BITS(15, 9)
   /* Lower SKP OS Generation Supp. Spd. Vect */



CVS commit: src/sys/dev/pci

2021-09-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Sep  9 02:12:48 UTC 2021

Modified Files:
src/sys/dev/pci: pcireg.h

Log Message:
add some bits in the pci Link Capabilities Register, and also the similar
set in the Link Capabilities 2 Register.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/dev/pci/pcireg.h

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



CVS commit: src/sys/dev/pci

2021-09-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Sep  6 02:43:37 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1419 -r1.1420 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1418 -r1.1419 src/sys/dev/pci/pcidevs_data.h

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

Modified files:

Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1419 src/sys/dev/pci/pcidevs.h:1.1420
--- src/sys/dev/pci/pcidevs.h:1.1419	Fri Sep  3 00:45:33 2021
+++ src/sys/dev/pci/pcidevs.h	Mon Sep  6 02:43:36 2021
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1419 2021/09/03 00:45:33 mrg Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1420 2021/09/06 02:43:36 mrg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1432 2021/09/03 00:44:49 mrg Exp
+ *	NetBSD: pcidevs,v 1.1433 2021/09/06 02:43:06 mrg Exp
  */
 
 /*
@@ -2130,7 +2130,7 @@
 #define	PCI_PRODUCT_ATI_RADEON_HD8180	0x9839		/* Radeon HD 8180 */
 #define	PCI_PRODUCT_ATI_RADEON_HD8250	0x983d		/* Radeon HD 8250/8280G */
 #define	PCI_PRODUCT_ATI_RADEON_KABINI_HDA	0x9840		/* Kabini HDMI/DP Audio */
-#define	PCI_PRODUCT_ATI_RADEON_R3	0x9850		/* Radeon R3 Graphics */
+#define	PCI_PRODUCT_ATI_RADEON_R2_3	0x9850		/* Radeon R2 Graphics */
 #define	PCI_PRODUCT_ATI_RADEON_R4R5	0x9851		/* Radeon R4/R5 Graphics */
 #define	PCI_PRODUCT_ATI_RADEON_R2_1	0x9852		/* Radeon R2 Graphics */
 #define	PCI_PRODUCT_ATI_RADEON_R2_2	0x9853		/* Radeon R2 Graphics */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1418 src/sys/dev/pci/pcidevs_data.h:1.1419
--- src/sys/dev/pci/pcidevs_data.h:1.1418	Fri Sep  3 00:45:33 2021
+++ src/sys/dev/pci/pcidevs_data.h	Mon Sep  6 02:43:36 2021
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1418 2021/09/03 00:45:33 mrg Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1419 2021/09/06 02:43:36 mrg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1432 2021/09/03 00:44:49 mrg Exp
+ *	NetBSD: pcidevs,v 1.1433 2021/09/06 02:43:06 mrg Exp
  */
 
 /*
@@ -3371,14 +3371,14 @@ static const uint32_t pci_products[] = {
 	9623, 8152, 13585, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_KABINI_HDA, 
 	13596, 13603, 7021, 0,
-	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R3, 
-	9623, 13533, 1716, 0,
-	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R4R5, 
+	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R2_3, 
 	9623, 13611, 1716, 0,
+	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R4R5, 
+	9623, 13614, 1716, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R2_1, 
-	9623, 13617, 1716, 0,
+	9623, 13611, 1716, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R2_2, 
-	9623, 13617, 1716, 0,
+	9623, 13611, 1716, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R2_R3_R3E_R4, 
 	9623, 13620, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R6, 
@@ -3386,7 +3386,7 @@ static const uint32_t pci_products[] = {
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R1ER2E, 
 	9623, 13632, 1716, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_XX2200MR2, 
-	9623, 13640, 13644, 13653, 13617, 1716, 0,
+	9623, 13640, 13644, 13653, 13611, 1716, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R5_R6_R7, 
 	9623, 13658, 0,
 	PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_R2R3R4R5, 
@@ -10214,7 +10214,7 @@ static const uint32_t pci_products[] = {
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_IIO_DEBUG_12, 
 	28667, 23920, 23765, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_R2_0, 
-	28667, 13617, 8140, 23938, 0,
+	28667, 13611, 8140, 23938, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_UBOX_0, 
 	22911, 28644, 26332, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_UBOX_1, 
@@ -10246,7 +10246,7 @@ static const uint32_t pci_products[] = {
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_HA0_0, 
 	28667, 23933, 23938, 8086, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_R2_1, 
-	28667, 13617, 8140, 23938, 0,
+	28667, 13611, 8140, 23938, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_QPI_0, 
 	28667, 23964, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEOND_QPI_1, 
@@ -18360,7 +18360,7 @@ static const char pci_words[] = { "." 
 	"7310\0" /* 1 refs @ 13518 */
 	"7290\0" /* 1 refs @ 13523 */
 	"8400\0" /* 2 refs @ 13528 */
-	"R3\0" /* 4 refs @ 13533 */
+	"R3\0" /* 3 refs @ 13533 */
 	"8400E\0" /* 1 refs @ 13536 */
 	"8330\0" /* 1 refs @ 13542 */
 	"8330E\0" /* 1 refs @ 13547 */
@@ -18373,8 +18373,8 @@ static const char pci_words[] = { "." 
 	"8250/8280G\0" /* 1 refs @ 13585 */
 	"Kabini\0" /* 1 refs @ 13596 */
 	"HDMI/DP\0" /* 2 refs @ 13603 */
-	"R4/R5\0" /* 1 refs @ 13611 */
-	"R2\0" /* 5 refs @ 13617 */
+	"R2\0" /* 6 refs @ 13611 */
+	

CVS commit: src/sys/dev/pci

2021-09-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Sep  6 02:43:37 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1419 -r1.1420 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1418 -r1.1419 src/sys/dev/pci/pcidevs_data.h

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



CVS commit: src/sys/dev/pci

2021-09-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Sep  6 02:43:06 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
the CPU ident and AMD both say this is "R2 Graphics", not R3.


To generate a diff of this commit:
cvs rdiff -u -r1.1432 -r1.1433 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1432 src/sys/dev/pci/pcidevs:1.1433
--- src/sys/dev/pci/pcidevs:1.1432	Fri Sep  3 00:44:49 2021
+++ src/sys/dev/pci/pcidevs	Mon Sep  6 02:43:06 2021
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1432 2021/09/03 00:44:49 mrg Exp $
+$NetBSD: pcidevs,v 1.1433 2021/09/06 02:43:06 mrg Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2123,7 +2123,7 @@ product ATI RADEON_HD8240	0x9838	Radeon 
 product ATI RADEON_HD8180	0x9839	Radeon HD 8180
 product ATI RADEON_HD8250	0x983d	Radeon HD 8250/8280G
 product ATI RADEON_KABINI_HDA	0x9840	Kabini HDMI/DP Audio
-product ATI RADEON_R3		0x9850	Radeon R3 Graphics
+product ATI RADEON_R2_3		0x9850	Radeon R2 Graphics
 product ATI RADEON_R4R5		0x9851	Radeon R4/R5 Graphics
 product ATI RADEON_R2_1		0x9852	Radeon R2 Graphics
 product ATI RADEON_R2_2		0x9853	Radeon R2 Graphics



CVS commit: src/sys/dev/pci

2021-09-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Sep  6 02:43:06 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
the CPU ident and AMD both say this is "R2 Graphics", not R3.


To generate a diff of this commit:
cvs rdiff -u -r1.1432 -r1.1433 src/sys/dev/pci/pcidevs

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

2021-09-04 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Sep  5 03:57:27 UTC 2021

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/amd/common: ac_llvm_util.c
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi:
si_pipe.c

Log Message:
avoid xnack, and -fp32-denormals, and +fp64-denormals options for
amdgpu / radeonsi driver.  these options don't work with llvm 13,
and generate warnings for all GL apps.

mesa 21 has entirely different code here.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.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/amd/common/ac_llvm_util.c
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c:1.1.1.1	Sun Jul 11 20:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c	Sun Sep  5 03:57:27 2021
@@ -151,11 +151,12 @@ static LLVMTargetMachineRef ac_create_ta
 	LLVMTargetRef target = ac_get_llvm_target(triple);
 
 	snprintf(features, sizeof(features),
-		 "+DumpCode,-fp32-denormals,+fp64-denormals%s%s%s%s%s%s",
+		 "+DumpCode%s%s%s%s%s%s%s",
+		 HAVE_LLVM >= 0x0B00 ? "" : ",-fp32-denormals,+fp64-denormals",
 		 HAVE_LLVM >= 0x0800 ? "" : ",+vgpr-spilling",
 		 tm_options & AC_TM_SISCHED ? ",+si-scheduler" : "",
-		 tm_options & AC_TM_FORCE_ENABLE_XNACK ? ",+xnack" : "",
-		 tm_options & AC_TM_FORCE_DISABLE_XNACK ? ",-xnack" : "",
+		 (tm_options & AC_TM_FORCE_ENABLE_XNACK) && HAVE_LLVM <= 0x0800 ? ",+xnack" : "",
+		 (tm_options & AC_TM_FORCE_DISABLE_XNACK) && HAVE_LLVM <= 0x0800 ? ",-xnack" : "",
 		 tm_options & AC_TM_PROMOTE_ALLOCA_TO_SCRATCH ? ",-promote-alloca" : "",
 		 tm_options & AC_TM_NO_LOAD_STORE_OPT ? ",-load-store-opt" : "");
 

Index: xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c
diff -u xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c:1.1.1.2 xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c:1.1.1.2	Sun Jul 11 20:36:27 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c	Sun Sep  5 03:57:27 2021
@@ -120,8 +120,8 @@ static void si_init_compiler(struct si_s
 	enum ac_target_machine_options tm_options =
 		(sscreen->debug_flags & DBG(SI_SCHED) ? AC_TM_SISCHED : 0) |
 		(sscreen->debug_flags & DBG(GISEL) ? AC_TM_ENABLE_GLOBAL_ISEL : 0) |
-		(sscreen->info.chip_class >= GFX9 ? AC_TM_FORCE_ENABLE_XNACK : 0) |
-		(sscreen->info.chip_class < GFX9 ? AC_TM_FORCE_DISABLE_XNACK : 0) |
+		(sscreen->info.chip_class >= VI ? AC_TM_FORCE_ENABLE_XNACK : 0) |
+		(sscreen->info.chip_class < VI ? AC_TM_FORCE_DISABLE_XNACK : 0) |
 		(!sscreen->llvm_has_working_vgpr_indexing ? AC_TM_PROMOTE_ALLOCA_TO_SCRATCH : 0) |
 		(sscreen->debug_flags & DBG(CHECK_IR) ? AC_TM_CHECK_IR : 0) |
 		(create_low_opt_compiler ? AC_TM_CREATE_LOW_OPT : 0);



CVS commit: xsrc/external/mit/MesaLib.old/dist/src

2021-09-04 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Sep  5 03:57:27 UTC 2021

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/amd/common: ac_llvm_util.c
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi:
si_pipe.c

Log Message:
avoid xnack, and -fp32-denormals, and +fp64-denormals options for
amdgpu / radeonsi driver.  these options don't work with llvm 13,
and generate warnings for all GL apps.

mesa 21 has entirely different code here.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c

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



CVS commit: src/sys/dev/pci

2021-09-04 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep  5 03:47:24 UTC 2021

Modified Files:
src/sys/dev/pci: pci_usrreq.c

Log Message:
make sure PCI_IOC_DRVNAMEONBUS doesn't access NULL pointers.

hopefully fixes PR#55744.  it's not entirely clear why this does
not affect most systems, as there's usually some PCI devices that
do not have attached drivers, eg:

006:00:0: AMD Family17h/7xh Reserved SPP (non-essential instrumentation, 
subclass 0x00)

on my system i'm testing on.

XXX: pullup-8, pullup-9.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/pci_usrreq.c

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

Modified files:

Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.30 src/sys/dev/pci/pci_usrreq.c:1.31
--- src/sys/dev/pci/pci_usrreq.c:1.30	Sat Sep 24 23:12:54 2016
+++ src/sys/dev/pci/pci_usrreq.c	Sun Sep  5 03:47:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_usrreq.c,v 1.30 2016/09/24 23:12:54 mrg Exp $	*/
+/*	$NetBSD: pci_usrreq.c,v 1.31 2021/09/05 03:47:24 mrg Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.30 2016/09/24 23:12:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.31 2021/09/05 03:47:24 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -127,6 +127,8 @@ pciioctl(dev_t dev, u_long cmd, void *da
 
 		for (i = 0; i < pci_cd.cd_ndevs; i++) {
 			sc = device_lookup_private(_cd, i);
+			if (sc == NULL)
+continue;
 			if (sc->sc_bus == dnameonbus->bus)
 break;	/* found the right bus */
 		}



CVS commit: src/sys/dev/pci

2021-09-04 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep  5 03:47:24 UTC 2021

Modified Files:
src/sys/dev/pci: pci_usrreq.c

Log Message:
make sure PCI_IOC_DRVNAMEONBUS doesn't access NULL pointers.

hopefully fixes PR#55744.  it's not entirely clear why this does
not affect most systems, as there's usually some PCI devices that
do not have attached drivers, eg:

006:00:0: AMD Family17h/7xh Reserved SPP (non-essential instrumentation, 
subclass 0x00)

on my system i'm testing on.

XXX: pullup-8, pullup-9.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/pci_usrreq.c

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



CVS commit: src/sys

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 01:23:33 UTC 2021

Modified Files:
src/sys/arch/arm/rockchip: rk_platform.c
src/sys/dev/ic: ahcisata_core.c

Log Message:
revert "make ahcisata(4) work on rk3399 (rockpro64)" from 23-06-2021.

this problem is known to affect more than AHCI, and a more general
solution has been commited now.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ic/ahcisata_core.c

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

Modified files:

Index: src/sys/arch/arm/rockchip/rk_platform.c
diff -u src/sys/arch/arm/rockchip/rk_platform.c:1.13 src/sys/arch/arm/rockchip/rk_platform.c:1.14
--- src/sys/arch/arm/rockchip/rk_platform.c:1.13	Wed Jun 23 00:56:41 2021
+++ src/sys/arch/arm/rockchip/rk_platform.c	Fri Sep  3 01:23:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.13 2021/06/23 00:56:41 mrg Exp $ */
+/* $NetBSD: rk_platform.c,v 1.14 2021/09/03 01:23:33 mrg Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill 
@@ -31,7 +31,7 @@
 #include "opt_console.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.13 2021/06/23 00:56:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.14 2021/09/03 01:23:33 mrg Exp $");
 
 #include 
 #include 
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: rk_platform.
 #include 
 #include 
 
-#include 
 
 #include 
 #include 
@@ -72,17 +71,6 @@ rk_platform_init_attach_args(struct fdt_
 static void
 rk_platform_device_register(device_t self, void *aux)
 {
-	prop_dictionary_t dict = device_properties(self);
-
-	if (device_is_a(self, "ahcisata")) {
-		/*
-		 * Marvel 9230 AHCI SATA controllers take between 1213 and 1216
-		 * milliseconds to reset, exceeding the AHCI spec of 1000.
-		 */
-		if (!prop_dictionary_set_uint32(dict, "ahci-reset-ms", 2000))
-			printf("%s: Failed to set \"ahci-reset-ms\" property"
-			   " on ahcisata\n", __func__);
-	}
 }
 
 static void

Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.100 src/sys/dev/ic/ahcisata_core.c:1.101
--- src/sys/dev/ic/ahcisata_core.c:1.100	Sat Aug  7 16:19:11 2021
+++ src/sys/dev/ic/ahcisata_core.c	Fri Sep  3 01:23:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_core.c,v 1.100 2021/08/07 16:19:11 thorpej Exp $	*/
+/*	$NetBSD: ahcisata_core.c,v 1.101 2021/09/03 01:23:33 mrg Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.100 2021/08/07 16:19:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.101 2021/09/03 01:23:33 mrg Exp $");
 
 #include 
 #include 
@@ -144,31 +144,19 @@ static int
 ahci_reset(struct ahci_softc *sc)
 {
 	int i;
-	uint32_t timeout_ms = 1000;	/* default to 1s timeout */
-	prop_dictionary_t dict;
 
 	/* reset controller */
 	AHCI_WRITE(sc, AHCI_GHC, AHCI_GHC_HR);
-
-	/* some systems (rockchip rk3399) need extra reset time for ahcisata. */
-	dict = device_properties(sc->sc_atac.atac_dev);
-	if (dict)
-		prop_dictionary_get_uint32(dict, "ahci-reset-ms", _ms);
-
-	/* wait for reset to complete */
-	for (i = 0; i < timeout_ms; i++) {
+	/* wait up to 1s for reset to complete */
+	for (i = 0; i < 1000; i++) {
 		delay(1000);
 		if ((AHCI_READ(sc, AHCI_GHC) & AHCI_GHC_HR) == 0)
 			break;
 	}
-	if ((AHCI_READ(sc, AHCI_GHC) & AHCI_GHC_HR) != 0) {
-		aprint_error_dev(sc->sc_atac.atac_dev, "reset failed\n");
+	if ((AHCI_READ(sc, AHCI_GHC) & AHCI_GHC_HR)) {
+		aprint_error("%s: reset failed\n", AHCINAME(sc));
 		return -1;
 	}
-	if (i > 1000) {
-		aprint_normal_dev(sc->sc_atac.atac_dev,
-		"reset took %d milliseconds\n", i);
-	}
 	/* enable ahci mode */
 	ahci_enable(sc);
 



CVS commit: src/sys

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 01:23:33 UTC 2021

Modified Files:
src/sys/arch/arm/rockchip: rk_platform.c
src/sys/dev/ic: ahcisata_core.c

Log Message:
revert "make ahcisata(4) work on rk3399 (rockpro64)" from 23-06-2021.

this problem is known to affect more than AHCI, and a more general
solution has been commited now.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ic/ahcisata_core.c

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



CVS commit: src/sys/arch/arm

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 01:21:48 UTC 2021

Modified Files:
src/sys/arch/arm/dts: rk3399-rockpro64.dts
src/sys/arch/arm/rockchip: rk3399_pcie.c

Log Message:
rk3399 pcie: pay attention to the "bus-scan-delay-ms" property.

our existing pinebookpro DTS, but not the other rk3399 ones, have
this property set to "1000" (it's the same in linux 5.14 DTS.)

as there are already static 100ms + upto 1000ms, count how many
are done, and only delay more to complete one second.

this allows reverting this device-specific change:

   http://mail-index.netbsd.org/source-changes/2021/06/23/msg130402.html

and makes other sorts of storage cards more likely to work as well.

tested on rockpro64.

XXX:  consider moving dts setting into rk3399.dtsi.

ok jmcneill jak

inspired by 
https://gitlab.manjaro.org/manjaro-arm/packages/core/linux/-/blob/master/0013-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/dts/rk3399-rockpro64.dts
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/rockchip/rk3399_pcie.c

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

Modified files:

Index: src/sys/arch/arm/dts/rk3399-rockpro64.dts
diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.11 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.12
--- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.11	Sun May 17 19:57:25 2020
+++ src/sys/arch/arm/dts/rk3399-rockpro64.dts	Fri Sep  3 01:21:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399-rockpro64.dts,v 1.11 2020/05/17 19:57:25 riastradh Exp $ */
+/* $NetBSD: rk3399-rockpro64.dts,v 1.12 2021/09/03 01:21:48 mrg Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -185,6 +185,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <_clkreqn>;
 	vpcie3v3-supply = <_pcie>;
+	bus-scan-delay-ms = <1000>;
 	status = "okay";
 };
 

Index: src/sys/arch/arm/rockchip/rk3399_pcie.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.15 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.16
--- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.15	Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/rockchip/rk3399_pcie.c	Fri Sep  3 01:21:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.15 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.16 2021/09/03 01:21:48 mrg Exp $ */
 /*
  * Copyright (c) 2018 Mark Kettenis 
  *
@@ -17,7 +17,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.15 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.16 2021/09/03 01:21:48 mrg Exp $");
 
 #include 
 #include 
@@ -206,10 +206,11 @@ rkpcie_attach(device_t parent, device_t 
 	struct pcihost_softc * const phsc = >sc_phsc;
 	struct fdt_attach_args *faa = aux;
 	struct fdtbus_gpio_pin *ep_gpio;
-	u_int max_link_speed, num_lanes;
+	u_int max_link_speed, num_lanes, bus_scan_delay_ms;
 	struct fdtbus_phy *phy[4];
 	const u_int *bus_range;
 	uint32_t status;
+	uint32_t delayed_ms = 0;
 	int timo, len;
 
 	phsc->sc_dev = self;
@@ -258,6 +259,14 @@ rkpcie_attach(device_t parent, device_t 
 	if (of_getprop_uint32(phandle, "num-lanes", _lanes) != 0)
 		num_lanes = 1;
 
+	/*
+	 * If the DT has a "bus-scan-delay-ms" property, delay attaching the
+	 * PCI bus this many microseconds.
+	 */
+	if (of_getprop_uint32(phandle, "bus-scan-delay-ms",
+	_scan_delay_ms) != 0)
+		bus_scan_delay_ms = 0;
+
 again:
 	fdtbus_gpio_write(ep_gpio, 0);
 
@@ -281,6 +290,7 @@ again:
 	reset_assert(phandle, "pipe");
 
 	delay(1000);	/* TPERST. use 1ms */
+	delayed_ms += 1;
 	
 	reset_deassert(phandle, "pm");
 	reset_deassert(phandle, "aclk");
@@ -315,6 +325,7 @@ again:
 
 	fdtbus_gpio_write(ep_gpio, 1);
 	delay(2);	/* 20 ms according to PCI-e BS "Conventional Reset" */
+	delayed_ms += 20;
 
 	/* Start link training. */
 	HWRITE4(sc, PCIE_CLIENT_BASIC_STRAP_CONF, PCBSC_LINK_TRAIN_EN);
@@ -324,6 +335,7 @@ again:
 		if (PCBS1_LINK_ST(status) == PCBS1_LS_DL_DONE)
 			break;
 		delay(1000);
+		delayed_ms += 1;
 	}
 	if (timo == 0) {
 		device_printf(self, "link training timeout (link_st %u)\n",
@@ -342,6 +354,7 @@ again:
 			if ((status & PCIE_CORE_PL_CONF_SPEED_MASK) == PCIE_CORE_PL_CONF_SPEED_5G)
 break;
 			delay(1000);
+			delayed_ms += 1;
 		}
 		if (timo == 0) {
 			device_printf(self, "Gen2 link training timeout\n");
@@ -350,6 +363,7 @@ again:
 		}
 	}
 	delay(8);	/* wait 100 ms before CSR access. already waited 20. */
+	delayed_ms += 80;
 
 	fdtbus_gpio_release(ep_gpio);
 
@@ -408,6 +422,15 @@ again:
 	sc->sc_phsc.sc_pc.pc_conf_write = rkpcie_conf_write;
 	sc->sc_phsc.sc_pc.pc_conf_hook = rkpcie_conf_hook;
 
+	if (bus_scan_delay_ms > delayed_ms) {
+		uint32_t ms = bus_scan_delay_ms - delayed_ms;
+
+		aprint_verbose_dev(phsc->sc_dev,
+		"waiting %u extra ms for reset (already waited %u)\n",
+		ms, delayed_ms);
+		delay(ms * 1000);
+	}
+
 	mutex_init(>sc_conf_lock, MUTEX_DEFAULT, IPL_HIGH);
 	

CVS commit: src/sys/arch/arm

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 01:21:48 UTC 2021

Modified Files:
src/sys/arch/arm/dts: rk3399-rockpro64.dts
src/sys/arch/arm/rockchip: rk3399_pcie.c

Log Message:
rk3399 pcie: pay attention to the "bus-scan-delay-ms" property.

our existing pinebookpro DTS, but not the other rk3399 ones, have
this property set to "1000" (it's the same in linux 5.14 DTS.)

as there are already static 100ms + upto 1000ms, count how many
are done, and only delay more to complete one second.

this allows reverting this device-specific change:

   http://mail-index.netbsd.org/source-changes/2021/06/23/msg130402.html

and makes other sorts of storage cards more likely to work as well.

tested on rockpro64.

XXX:  consider moving dts setting into rk3399.dtsi.

ok jmcneill jak

inspired by 
https://gitlab.manjaro.org/manjaro-arm/packages/core/linux/-/blob/master/0013-rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/dts/rk3399-rockpro64.dts
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/rockchip/rk3399_pcie.c

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



CVS commit: src/sys/dev/pci

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 00:45:34 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1418 -r1.1419 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1417 -r1.1418 src/sys/dev/pci/pcidevs_data.h

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

diffs are larger than 1MB and have been omitted


CVS commit: src/sys/dev/pci

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 00:45:34 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1418 -r1.1419 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1417 -r1.1418 src/sys/dev/pci/pcidevs_data.h

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



CVS commit: src/sys/dev/pci

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 00:44:49 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add a whole bunch of radeon devices.

now all the radeons i have are here (and dozens i don't :)


To generate a diff of this commit:
cvs rdiff -u -r1.1431 -r1.1432 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1431 src/sys/dev/pci/pcidevs:1.1432
--- src/sys/dev/pci/pcidevs:1.1431	Mon Aug 30 20:51:27 2021
+++ src/sys/dev/pci/pcidevs	Fri Sep  3 00:44:49 2021
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1431 2021/08/30 20:51:27 andvar Exp $
+$NetBSD: pcidevs,v 1.1432 2021/09/03 00:44:49 mrg Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1678,76 +1678,298 @@ product ATI RADEON_R423_5D57	0x5d57	Rade
 product ATI RADEON_X850XT_S	0x5d72	Radeon X850 XT Secondary
 product ATI RADEON_X700		0x5e4b	Radeon X700 Pro
 product ATI RADEON_X700_S	0x5e6b	Radeon X700 Pro Secondary
+product ATI RADEON_HD8670A_1	0x6600	Radeon HD 8670A/8670M/8750M
+product ATI RADEON_HD8730M	0x6601	Radeon HD 8730M
+product ATI RADEON_R7_M265	0x6604	Radeon R7 M265/M365X/M465
+product ATI RADEON_R7_M260X	0x6605	Radeon R7 M260X
 product ATI RADEON_HD8790M	0x6606	Radeon HD 8790M
-product ATI RADEON_HD8530M	0x6607	Radeon HD 8530M
-product ATI RADEON_HD8600	0x6610	Radeon HD 8600
-product ATI RADEON_HD8570	0x6611	Radeon HD 8570
-product ATI RADEON_HD8500	0x6613	Radeon HD 8500
+product ATI RADEON_HD8530M	0x6607	Radeon HD 8530M / R5 M240
+product ATI RADEON_FP_W2100	0x6608	FirePro W2100
+product ATI RADEON_HD8600	0x6610	Radeon HD 8670 / R7 250/350
+product ATI RADEON_HD8570	0x6611	Radeon HD 8570 / R7 240/340 / Radeon 520 OEM
+product ATI RADEON_HD8500	0x6613	Radeon R7 240/340
+product ATI RADEON_FP_M6100	0x6640	FirePro M6100
+product ATI RADEON_HD8930M	0x6641	Radeon HD 8930M
+product ATI RADEON_R9M280X	0x6646	Radeon R9 M280X
+product ATI RADEON_R9M270X	0x6647	Radeon R9 M270X/M280X
+product ATI RADEON_FP_W5100	0x6649	FirePro W5100
+product ATI RADEON_R7_260X	0x6658	Radeon R7 260X/360
+product ATI RADEON_HD7790	0x665C	Radeon HD 7790/8770 / R7 360 / R9 260/360 OEM
+product ATI RADEON_R7_200	0x665D	Radeon R7 200 Series
+product ATI RADEON_R7_360	0x665F	Radeon R7 360 / R9 360 OEM
+product ATI RADEON_HD8670A_2	0x6660	Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile
+product ATI RADEON_HD8570A	0x6663	Radeon HD 8570A/8570M
+product ATI RADEON_R5_M240	0x6664	Radeon R5 M240
+product ATI RADEON_R5_M230	0x6665	Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile
+product ATI RADEON_R5_M230_2	0x6667	Radeon R5 M230
+product ATI RADEON_HD8550M	0x666F	Radeon HD 8550M / R5 M230
+product ATI RADEON_INSTINCT	0x66A0	Radeon Instinct
+product ATI RADEON_VEGA20_1	0x66A1	Vega 20
+product ATI RADEON_VEGA20_2	0x66A2	Vega 20
+product ATI RADEON_VEGA20_3	0x66A3	Vega 20
+product ATI RADEON_VEGA20_PRO	0x66A7	Radeon Pro Vega 20
+product ATI RADEON_VII_1	0x66AF	Radeon VII
+product ATI RADEON_FP_V7900	0x6704	FirePro V7900
+product ATI RADEON_FP_V5900	0x6707	FirePro V5900
 product ATI RADEON_HD6970	0x6718	Radeon HD 6970
 product ATI RADEON_HD6950	0x6719	Radeon HD 6950
 product ATI RADEON_HD6990_1	0x671c	Radeon HD 6990
 product ATI RADEON_HD6990_2	0x671d	Radeon HD 6990
 product ATI RADEON_HD6930	0x671f	Radeon HD 6930
-product ATI RADEON_HD6970M	0x6720	Radeon HD 6970M
+product ATI RADEON_HD6970M	0x6720	Radeon HD 6970M/6990M
 product ATI RADEON_HD6900M	0x6725	Radeon HD 6900M
 product ATI RADEON_HD6870	0x6738	Radeon HD 6870
 product ATI RADEON_HD6850	0x6739	Radeon HD 6850
 product ATI RADEON_HD6790	0x673e	Radeon HD 6790
-product ATI RADEON_HD6730M	0x6740	Radeon HD 6730M
-product ATI RADEON_HD6600M	0x6741	Radeon HD 6600M
-product ATI RADEON_HD6610M	0x6742	Radeon HD 6610M
-product ATI RADEON_HD6650A	0x6750	Radeon HD 6650A
-product ATI RADEON_HD7670A	0x6751	Radeon HD 7670A
-product ATI RADEON_HD6670	0x6758	Radeon HD 6670
-product ATI RADEON_HD6570	0x6759	Radeon HD 6570
+product ATI RADEON_HD6730M	0x6740	Radeon HD 6730M/6770M/7690M XT
+product ATI RADEON_HD6600M	0x6741	Radeon HD 6630M/6650M/6750M/7670M/7690M
+product ATI RADEON_HD6610M	0x6742	Radeon HD 6610M/7610M
+product ATI RADEON_E6760	0x6743	Radeon E6760
+product ATI RADEON_FP_V4900	0x6749	FirePro V4900
+product ATI RADEON_FP_V4300	0x674A	FirePro V3900
+product ATI RADEON_HD6650A	0x6750	Radeon HD 6650A/7650A
+product ATI RADEON_HD7670A	0x6751	Radeon HD 7650A/7670A
+product ATI RADEON_HD6670	0x6758	Radeon HD 6670/7670
+product ATI RADEON_HD6570	0x6759	Radeon HD 6570/7570/8550
+product ATI RADEON_HD7600	0x675b	Radeon HD 7600 Series
 product ATI RADEON_HD7570	0x675d	Radeon HD 7570
-product ATI RADEON_HD6510	0x675f	Radeon HD 6510
-product ATI RADEON_HD6400M	0x6760	Radeon HD 6400M
+product ATI RADEON_HD6510	0x675f	Radeon HD 5570/6510/7510/8510
+product ATI RADEON_HD6400M	0x6760	Radeon HD 6400M/7400M 

CVS commit: src/sys/dev/pci

2021-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Sep  3 00:44:49 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add a whole bunch of radeon devices.

now all the radeons i have are here (and dozens i don't :)


To generate a diff of this commit:
cvs rdiff -u -r1.1431 -r1.1432 src/sys/dev/pci/pcidevs

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



CVS commit: src/sys/dev/usb

2021-08-31 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 31 08:22:28 UTC 2021

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
add missing newline and fix conditional for askroot/single user
hand over delay message.  PR#56366.


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.285 src/sys/dev/usb/ehci.c:1.286
--- src/sys/dev/usb/ehci.c:1.285	Tue Jan  5 18:00:21 2021
+++ src/sys/dev/usb/ehci.c	Tue Aug 31 08:22:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.285 2021/01/05 18:00:21 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.286 2021/08/31 08:22:28 mrg Exp $ */
 
 /*
  * Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.285 2021/01/05 18:00:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.286 2021/08/31 08:22:28 mrg Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -2655,8 +2655,8 @@ ehci_disown_sched_callback(ehci_softc_t 
 	mutex_exit(>sc_complock);
 
 	config_pending_incr(sc->sc_dev);
-	aprint_normal("delaying %s by %u seconds due to USB owner change.",
-	(boothowto & RB_ASKNAME) == 0 ? "ask root" : "single user",
+	aprint_normal("delaying %s by %u seconds due to USB owner change.\n",
+	(boothowto & RB_ASKNAME) != 0 ? "ask root" : "single user",
 	ehci_disown_delay_seconds);
 }
 



CVS commit: src/sys/dev/usb

2021-08-31 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 31 08:22:28 UTC 2021

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
add missing newline and fix conditional for askroot/single user
hand over delay message.  PR#56366.


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/dev/usb/ehci.c

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



re: CVS commit: src/sys/arch/evbarm/conf

2021-08-30 Thread matthew green
hi.


nice work on BE marvell :)

"Rin Okuyama" writes:
> Module Name:  src
> Committed By: rin
> Date: Mon Aug 30 00:12:15 UTC 2021
>
> Modified Files:
>   src/sys/arch/evbarm/conf: MARVELL_NAS
>
> Log Message:
> Enable FFS_EI and DISKLABEL_EI as this SoC supports both endians now.

personally, i think we should do these everywhere that isn't
size constrained.  they're useful for accessing other platform
disks quite often on all netbsd systems.


.mrg.


re: CVS commit: src

2021-08-30 Thread matthew green
"Roland Illig" writes:
> Module Name:  src
> Committed By: rillig
> Date: Sun Aug 29 09:29:32 UTC 2021
>
> Modified Files:
>   src/tests/usr.bin/xlint/lint1: msg_220.c msg_220.exp
>   src/usr.bin/xlint/common: lint.h
>   src/usr.bin/xlint/lint1: lex.c
>
> Log Message:
> lint: allow 'fallthrough' as alternative spelling of FALLTHROUGH

if you would like to see what GCC allows here, it's pretty involved.
see external/gpl3/gcc/dist/libcpp/lex.c:fallthrough_comment_p().

if the comments are to be believed, it does:

  /* -Wimplicit-fallthrough=2 looks for (case insensitive)
 .*falls?[ \t-]*thr(u|ough).* regex.  */

  /* Whole comment contents (regex):
 lint -fallthrough[ \t]*

  /* Whole comment contents (regex):
 [ \t]*FALLTHR(U|OUGH)[ \t]*

  /* Whole comment contents (regex):
 [ \t.!]*(ELSE,? |INTENTIONAL(LY)? )?FALL(S | |-)?THR(OUGH|U)[ 
\t.!]*(-[^\n\r]*)?
 [ \t.!]*(Else,? |Intentional(ly)? )?Fall((s | |-)[Tt]|t)hr(ough|u)[ 
\t.!]*(-[^\n\r]*)?
 [ \t.!]*([Ee]lse,? |[Ii]ntentional(ly)? )?fall(s | |-)?thr(ough|u)[ 
\t.!]*(-[^\n\r]*)?



.mrg.


CVS commit: src/sys/dev/pci

2021-08-30 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 08:53:47 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1416 -r1.1417 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1415 -r1.1416 src/sys/dev/pci/pcidevs_data.h

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



CVS commit: src/sys/dev/pci

2021-08-30 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 08:53:29 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add a bunch of nvidia devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1429 -r1.1430 src/sys/dev/pci/pcidevs

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



CVS commit: src/sys/dev/pci

2021-08-30 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 08:53:29 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add a bunch of nvidia devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1429 -r1.1430 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1429 src/sys/dev/pci/pcidevs:1.1430
--- src/sys/dev/pci/pcidevs:1.1429	Mon Aug 30 00:06:04 2021
+++ src/sys/dev/pci/pcidevs	Mon Aug 30 08:53:29 2021
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1429 2021/08/30 00:06:04 mrg Exp $
+$NetBSD: pcidevs,v 1.1430 2021/08/30 08:53:29 mrg Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7130,11 +7130,58 @@ product NVIDIA	GEFORCE_610M	0x1058	GeFor
 product NVIDIA	GEFORCE_610M2	0x1059	GeForce 610M
 product NVIDIA	GT610M		0x105A	GeForce GT 610M
 product NVIDIA	GF_GTX680	0x1180 	GeForce GTX 680
+product NVIDIA	GF_GTX560_Ti	0x1200	GeForce GTX 560 Ti
+product NVIDIA	GF_GTX560	0x1201	GeForce GTX 560
+product NVIDIA	GF_GTX560_TiOEM	0x1202	GeForce GTX 560 Ti OEM
+product NVIDIA	GF_GTX460_SEv2	0x1203	GeForce GTX 460 SE v2
+product NVIDIA	GF_GTX460_V2	0x1205	GeForce GTX 460 v2
+product NVIDIA	GF_GTX555	0x1206	GeForce GTX 555
+product NVIDIA	GF_GT645_OEM	0x1207	GeForce GT 645 OEM
+product NVIDIA	GF_GTX560_SE	0x1208	GeForce GTX 560 SE
+product NVIDIA	GF_GTX570M	0x1210	GeForce GTX 570M
+product NVIDIA	GF_GTX580M	0x1211	GeForce GTX 580M
+product NVIDIA	GF_GTX680M	0x1212	GeForce GTX 675M
+product NVIDIA	GF_GTX670M	0x1213	GeForce GTX 670M
+product NVIDIA	GF_GT545_OEM	0x1241	GeForce GTX 545 OEM
+product NVIDIA	GF_GTX545	0x1243	GeForce GTX 545
 product NVIDIA	GF116		0x1244	GeForce GTX 550 Ti
+product NVIDIA	GF_GTS450_R2	0x1245	GeForce GTS 450 Rev. 2
+product NVIDIA	GF_GT550M	0x1246	GeForce GT 550M
+product NVIDIA	GF_GT555M	0x1247	GeForce GT 555M/635M
+product NVIDIA	GF_GT635M	0x1248	GeForce GT 555M/635M
+product NVIDIA	GF_GTS450_R3	0x1249	GeForce GTS 450 Rev. 3
+product NVIDIA	GF_GT640_OEM	0x124B	GeForce GT 640 OEM
+product NVIDIA	GF_GT550M_2	0x124D	GeForce GT 555M/635M
+product NVIDIA	GF_GT560M	0x1251	GeForce GT 560M
+product NVIDIA	GF_GT635	0x1280	GeForce GT 635
+product NVIDIA	GF_GT710	0x1281	GeForce GT 710
+product NVIDIA	GF_GT640_R2	0x1282	GeForce GT 640 Rev.2
+product NVIDIA	GF_GT630_R2	0x1284	GeForce GT 630 Rev.2
+product NVIDIA	GF_GT720	0x1286	GeForce GT 720
+product NVIDIA	GF_GT730	0x1287	GeForce GT 730
+product NVIDIA	GF_GT720_2	0x1288	GeForce GT 720
+product NVIDIA	GF_GT710_2	0x1289	GeForce GT 710
+product NVIDIA	GF_GK208B	0x128A	GK208B
+product NVIDIA	GF_GT710_3	0x128B	GeForce GT 710
+product NVIDIA	GF_GK208B_2	0x128C	GK208B
+product NVIDIA	GF_GTX750_Ti	0x1380	GeForce GTX 750 Ti
+product NVIDIA	GF_GTX750	0x1381	GeForce GTX 750
+product NVIDIA	GF_GTX745	0x1382	GeForce GTX 745
+product NVIDIA	GF_GTX710	0x1389	GeForce GTX 745
+product NVIDIA	GF_845M		0x1390	GeForce 845M
+product NVIDIA	GF_GTX850M	0x1391	GeForce GTX 850M
+product NVIDIA	GF_GTX860M	0x1392	GeForce GTX 860M
+product NVIDIA	GF_840M		0x1393	GeForce 840M
+product NVIDIA	GF_845M_2	0x1398	GeForce 845M
+product NVIDIA	GF_945M		0x1399	GeForce 945M
+product NVIDIA	GF_GTX950M	0x139A	GeForce GTX 950M
+product NVIDIA	GF_GTX960M	0x139B	GeForce GTX 960M
+product NVIDIA	GF_940M		0x139C	GeForce 940M
+product NVIDIA	GF_GTX750_Ti_2	0x139D	GeForce GTX 750 Ti
 product NVIDIA	GF_GTX960	0x1401 	GeForce GTX 960
 product NVIDIA	GF_GTX950	0x1402 	GeForce GTX 950
 product NVIDIA	GF_GTX960_2	0x1406 	GeForce GTX 960
-product NVIDIA	GF_GTX750	0x1407 	GeForce GTX 750
+product NVIDIA	GF_GTX750_2	0x1407 	GeForce GTX 750
 product NVIDIA	GF_GTX950_2	0x1427 	GeForce GTX 950
 product NVIDIA	QUADRO_M2000	0x1430 	Quadro M2000
 product NVIDIA	TESLA_M4	0x1431 	Tesla M4
@@ -7177,51 +7224,156 @@ product NVIDIA	GF_GTX1050_TiM	0x1c8c 	Ge
 product NVIDIA	GF_GTX1050_M	0x1c8d 	GeForce GTX 1050 Mobile
 product NVIDIA	GF_GTX1030	0x1d01 	GeForce GT 1030
 product NVIDIA	GF_MX150	0x1d10 	GeForce MX150
+product NVIDIA	GF_MX230	0x1d11 	GeForce MX230
+product NVIDIA	GF_MX150_2	0x1d12 	GeForce MX150
+product NVIDIA	GF_MX250	0x1d13 	GeForce MX250
+product NVIDIA	GF_MX330	0x1d16 	GeForce MX330
+product NVIDIA	QUADRO_P520M	0x1d33 	Quadro P500 Mobile
+product NVIDIA	QUADRO_P520	0x1d34 	Quadro P520
+product NVIDIA	GF_MX250_2	0x1d52 	GeForce MX250
+product NVIDIA	GF_MX330_2	0x1d56 	GeForce MX330
 product NVIDIA	TITAN_V		0x1d81 	GV100 TITAN V
-product NVIDIA	TESLA_V100SXM16	0x1db1 	Tesla V100 SXM2 16GB
-product NVIDIA	TESLA_V100PCI16	0x1db4 	Tesla V100 PCIe 16GB
-product NVIDIA	TESLA_V100SXM32	0x1db5 	Tesla V100 SXM2 32GB
-product NVIDIA 	TESLA_V100PCI32	0x1db6 	Tesla V100 PCIe 32GB
+product NVIDIA	TESLA_V100S16	0x1db1 	Tesla V100 SXM2 16GB
+product NVIDIA	TESLA_V100D16	0x1db2 	Tesla V100 DGXS 16GB
+product NVIDIA	TESLA_V100F16	0x1db3 	Tesla V100 FHHL 16GB
+product NVIDIA	TESLA_V100P16	0x1db4 	Tesla 

CVS commit: src/sys/dev/pci

2021-08-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 00:06:27 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1415 -r1.1416 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1414 -r1.1415 src/sys/dev/pci/pcidevs_data.h

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

diffs are larger than 1MB and have been omitted


CVS commit: src/sys/dev/pci

2021-08-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 00:06:04 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add radeon x1550.


To generate a diff of this commit:
cvs rdiff -u -r1.1428 -r1.1429 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1428 src/sys/dev/pci/pcidevs:1.1429
--- src/sys/dev/pci/pcidevs:1.1428	Sat Jul 17 07:11:35 2021
+++ src/sys/dev/pci/pcidevs	Mon Aug 30 00:06:04 2021
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1428 2021/07/17 07:11:35 mrg Exp $
+$NetBSD: pcidevs,v 1.1429 2021/08/30 00:06:04 mrg Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1739,6 +1739,7 @@ product ATI RADEON_HD5600_RD	0x68c1	Rade
 product ATI RADEON_HD5570	0x68d9	Radeon HD 5570
 product ATI RADEON_HD5450	0x68f9	Radeon HD 5450
 product ATI RADEON_X1300	0x7146	Radeon X1300 Series (RV515)
+product ATI RADEON_X1550	0x7147	Radeon X1550 Series (RV505)
 product ATI RADEON_X1300_S	0x7166	Radeon X1300 Series (RV515) Secondary
 product ATI RADEON_X1600XT	0x71c0	Radeon X1600 XT
 product ATI RADEON_X1600	0x71c5	Radeon Mobility X1600



CVS commit: src/sys/dev/pci

2021-08-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 00:06:27 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1415 -r1.1416 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1414 -r1.1415 src/sys/dev/pci/pcidevs_data.h

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



CVS commit: src/sys/dev/pci

2021-08-29 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 30 00:06:04 UTC 2021

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add radeon x1550.


To generate a diff of this commit:
cvs rdiff -u -r1.1428 -r1.1429 src/sys/dev/pci/pcidevs

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



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

2021-08-26 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 27 01:32:09 UTC 2021

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

Log Message:
sync with generated config.h

turns on HAVE_FBGLYPHS and HAVE_GBM_BO_USE_LINEAR.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-amdgpu/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.11 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.12
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.11	Tue Aug 24 06:28:25 2021
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h	Fri Aug 27 01:32:09 2021
@@ -13,13 +13,13 @@
 #define HAVE_DRI3_H 1
 
 /* Have fbGlyphs API */
-/* #define HAVE_FBGLYPHS 1 */
+#define HAVE_FBGLYPHS 1
 
 /* Have GBM_BO_USE_LINEAR */
-/* #define HAVE_GBM_BO_USE_LINEAR 1 */
+#define HAVE_GBM_BO_USE_LINEAR 1
 
 /* Have glamor_egl_destroy_textured_pixmap API */
-/* #define HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP 1 */
+/* #undef HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP */
 
 /* Have glamor_finish API */
 #undef HAVE_GLAMOR_FINISH



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

2021-08-26 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 27 01:32:09 UTC 2021

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

Log Message:
sync with generated config.h

turns on HAVE_FBGLYPHS and HAVE_GBM_BO_USE_LINEAR.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-amdgpu/include/config.h

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



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

2021-08-26 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 27 01:01:19 UTC 2021

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

Log Message:
restore the set version call in amdgpu_open_drm_master().

now this works again with reredrum branch.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.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-amdgpu/dist/src/amdgpu_probe.c
diff -u xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c:1.1.1.7 xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c:1.2
--- xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c:1.1.1.7	Mon Aug 23 21:18:40 2021
+++ xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c	Fri Aug 27 01:01:18 2021
@@ -196,10 +196,29 @@ static Bool amdgpu_open_drm_master(ScrnI
    struct xf86_platform_device *platform_dev,
    AMDGPUEntPtr pAMDGPUEnt)
 {
+	drmSetVersion sv;
+	int err;
+
 	pAMDGPUEnt->fd = amdgpu_kernel_open_fd(pScrn, pci_dev, platform_dev, pAMDGPUEnt);
 	if (pAMDGPUEnt->fd == -1)
 		return FALSE;
 
+	/* Check that what we opened was a master or a master-capable FD,
+	 * by setting the version of the interface we'll use to talk to it.
+	 * (see DRIOpenDRMMaster() in DRI1)
+	 */
+	sv.drm_di_major = 1;
+	sv.drm_di_minor = 1;
+	sv.drm_dd_major = -1;
+	sv.drm_dd_minor = -1;
+	err = drmSetInterfaceVersion(pAMDGPUEnt->fd, );
+	if (err != 0) {
+		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			   "[drm] failed to set drm interface version.\n");
+		amdgpu_kernel_close_fd(pAMDGPUEnt);
+		return FALSE;
+	}
+
 	/* Check that what we opened is a master or a master-capable FD */
 	if (!local_drmIsMaster(pAMDGPUEnt->fd)) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,



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

2021-08-26 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Fri Aug 27 01:01:19 UTC 2021

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

Log Message:
restore the set version call in amdgpu_open_drm_master().

now this works again with reredrum branch.


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

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



re: CVS commit: src/sys

2021-08-24 Thread matthew green
> - For alpha and sparc64, don't define MUTEX_CAS() in terms of their own
>   _lock_cas(), which has its own memory barriers; the call sites in
>   kern_mutex.c already have the appropriate memory barrier calls.  Thus,
>   alpha and sparc64 can use default definition.

this seems to leave _lock_cas() unused on both platforms, should
the backing code for _lock_cas() be removed now?

i didn't look closely at other ports (though sh3 looks OK as-is.)

thanks.


.mrg.


CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:53:26 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES ssl-bozo.c

Log Message:
extend the list of available ciphers to include most of the
openssl "HIGH" with some additional disables.  retain the current
list of bad options.  should deal with PR#51278.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/ssl-bozo.c

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

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.50 src/libexec/httpd/CHANGES:1.51
--- src/libexec/httpd/CHANGES:1.50	Tue Aug 24 09:47:36 2021
+++ src/libexec/httpd/CHANGES	Tue Aug 24 09:53:26 2021
@@ -1,8 +1,11 @@
-$NetBSD: CHANGES,v 1.50 2021/08/24 09:47:36 mrg Exp $
+$NetBSD: CHANGES,v 1.51 2021/08/24 09:53:26 mrg Exp $
 
 changes in bozohttpd 20210824:
 	o  new "-m tlsversion" option to set the minimum TLS version
 	   available.  partially from .
+	o  extend the list of available ciphers to include most of the
+	   openssl "HIGH" with some additional disables.  retain the current
+	   list of bad options.  should deal with PR#51278.
 
 changes in bozohttpd 20210504:
 	o  don't assume host BUFSIZ is sufficent.  small BUFSIZ leads to

Index: src/libexec/httpd/ssl-bozo.c
diff -u src/libexec/httpd/ssl-bozo.c:1.30 src/libexec/httpd/ssl-bozo.c:1.31
--- src/libexec/httpd/ssl-bozo.c:1.30	Tue Aug 24 09:47:36 2021
+++ src/libexec/httpd/ssl-bozo.c	Tue Aug 24 09:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl-bozo.c,v 1.30 2021/08/24 09:47:36 mrg Exp $	*/
+/*	$NetBSD: ssl-bozo.c,v 1.31 2021/08/24 09:53:26 mrg Exp $	*/
 
 /*	$eterna: ssl-bozo.c,v 1.15 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -51,10 +51,15 @@
 
 #ifndef BOZO_SSL_CIPHERS
 #define BOZO_SSL_CIPHERS 	\
-	"AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:"		\
-	"AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:"		\
-	"AES:"			\
-	"-SHA:"			\
+	"HIGH:"			\
+	"-SHA:-ADH:"		\
+	"-PSK-AES128-CCM:-PSK-AES256-CCM:"			\
+	"-DHE-PSK-AES128-CCM8:-DHE-PSK-AES256-CCM8:"		\
+	"-AES128-CCM8:-AES256-CCM8:"\
+	"-DHE-RSA-AES128-CCM8:-DHE-RSA-AES256-CCM8:"		\
+	"-PSK-AES128-CCM8:-PSK-AES256-CCM8:"			\
+	"-CAMELLIA128:-CAMELLIA256:"\
+	"-RSA-PSK-CHACHA20-POLY1305:"\
 	"!aNULL:!eNULL:"	\
 	"!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:"			\
 	"!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:"		\



CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:53:26 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES ssl-bozo.c

Log Message:
extend the list of available ciphers to include most of the
openssl "HIGH" with some additional disables.  retain the current
list of bad options.  should deal with PR#51278.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/ssl-bozo.c

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



CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:47:36 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c bozohttpd.h main.c
ssl-bozo.c

Log Message:
implement tls minimum version setting.

mostly from su...@nimmagadda.net in PR#55830, though i moved the
member into the main http structure, so that it doesn't trigger
sslinfo being allocated via command line without the rest of the
ssl being setup (which then leads to crashes.)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.88 -r1.89 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.135 -r1.136 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.69 -r1.70 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.28 -r1.29 src/libexec/httpd/main.c
cvs rdiff -u -r1.29 -r1.30 src/libexec/httpd/ssl-bozo.c

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

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.49 src/libexec/httpd/CHANGES:1.50
--- src/libexec/httpd/CHANGES:1.49	Wed May  5 07:41:48 2021
+++ src/libexec/httpd/CHANGES	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,8 @@
-$NetBSD: CHANGES,v 1.49 2021/05/05 07:41:48 mrg Exp $
+$NetBSD: CHANGES,v 1.50 2021/08/24 09:47:36 mrg Exp $
+
+changes in bozohttpd 20210824:
+	o  new "-m tlsversion" option to set the minimum TLS version
+	   available.  partially from .
 
 changes in bozohttpd 20210504:
 	o  don't assume host BUFSIZ is sufficent.  small BUFSIZ leads to

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.88 src/libexec/httpd/bozohttpd.8:1.89
--- src/libexec/httpd/bozohttpd.8:1.88	Sun Feb 28 05:19:52 2021
+++ src/libexec/httpd/bozohttpd.8	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bozohttpd.8,v 1.88 2021/02/28 05:19:52 mrg Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.89 2021/08/24 09:47:36 mrg Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 27, 2021
+.Dd August 24, 2021
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -39,6 +39,7 @@
 .Op Fl I Ar port
 .Op Fl L Ar prefix script
 .Op Fl M Ar suffix type encoding encoding11
+.Op Fl m Ar version
 .Op Fl P Ar pidfile
 .Op Fl R Ar readme
 .Op Fl S Ar version
@@ -221,6 +222,18 @@ the empty string is used instead.
 Multiple
 .Fl M
 options may be passed.
+.It Fl m Ar version
+Set the minimum supported SSL protocol
+.Ar version .
+The valid values of
+.Ar version
+are
+.Dq TLSv1.1 ,
+.Dq TLSv1.2 ,
+and
+.Dq TLSv1.3 .
+The default version is
+.Dq TLSv1.1 .
 .It Fl n
 Stops
 .Nm
@@ -646,7 +659,7 @@ The focus has always been simplicity and
 and regular code audits.
 This manual documents
 .Nm
-version 20210227.
+version 20210824.
 .Sh AUTHORS
 .An -nosplit
 .Nm
@@ -769,6 +782,10 @@ option (pidfile support) and provided so
 provided many various fixes, including cgi-bin fixes and enhancements,
 HTTP basic authorization support and much code clean up
 .It
+.An Sunil Nimmagadda
+.Aq Mt su...@nimmagadda.net
+provided runtime TLS version control
+.It
 .An Rajeev V. Pillai
 .Aq Mt rajeev_v_pil...@yahoo.com
 provided several fixes for virtual hosting and directory indexing and
@@ -819,7 +836,6 @@ provided http authorization fixes
 .It
 .Aq Mt x...@kittenz.org
 provided chroot and change-to-user support, and other various fixes
-
 .It
 .An S.P.Zeidler
 .Aq Mt s...@netbsd.org

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.135 src/libexec/httpd/bozohttpd.c:1.136
--- src/libexec/httpd/bozohttpd.c:1.135	Tue Aug 24 05:39:39 2021
+++ src/libexec/httpd/bozohttpd.c	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.135 2021/08/24 05:39:39 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.136 2021/08/24 09:47:36 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -108,7 +108,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20210504"
+#define SERVER_SOFTWARE		"bozohttpd/20210824"
 #endif
 #ifndef PUBLIC_HTML
 #define PUBLIC_HTML		"public_html"

Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.69 src/libexec/httpd/bozohttpd.h:1.70
--- src/libexec/httpd/bozohttpd.h:1.69	Wed May  5 07:41:48 2021
+++ src/libexec/httpd/bozohttpd.h	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.h,v 1.69 2021/05/05 07:41:48 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.70 2021/08/24 09:47:36 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -130,6 +130,7 @@ typedef struct bozohttpd_t {
 	unsigned	initial_timeout;/* first line timeout */
 	unsigned	header_timeout;	/* header lines timeout */
 	unsigned	request_timeout;/* total session timeout */
+	char		*ssl_min_proto;	/* minimum ssl protocol level */
 #ifndef NO_LUA_SUPPORT
 	int		 

CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:47:36 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c bozohttpd.h main.c
ssl-bozo.c

Log Message:
implement tls minimum version setting.

mostly from su...@nimmagadda.net in PR#55830, though i moved the
member into the main http structure, so that it doesn't trigger
sslinfo being allocated via command line without the rest of the
ssl being setup (which then leads to crashes.)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.88 -r1.89 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.135 -r1.136 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.69 -r1.70 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.28 -r1.29 src/libexec/httpd/main.c
cvs rdiff -u -r1.29 -r1.30 src/libexec/httpd/ssl-bozo.c

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



CVS commit: src/share/mk

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 06:29:18 UTC 2021

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
xorg-server is now at 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/share/mk/bsd.x11.mk

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

Modified files:

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.140 src/share/mk/bsd.x11.mk:1.141
--- src/share/mk/bsd.x11.mk:1.140	Sun Jul 11 00:13:49 2021
+++ src/share/mk/bsd.x11.mk	Tue Aug 24 06:29:18 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.140 2021/07/11 00:13:49 mrg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.141 2021/08/24 06:29:18 mrg Exp $
 
 .include 
 
@@ -133,7 +133,7 @@ XORG_SERVER_MINOR=	10
 XORG_SERVER_TEENY=	6
 .else
 XORG_SERVER_MINOR=	20
-XORG_SERVER_TEENY=	12
+XORG_SERVER_TEENY=	13
 .endif
 
 XVENDORNAMESHORT=	'"X.Org"'



CVS commit: src/share/mk

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 06:29:18 UTC 2021

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
xorg-server is now at 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/share/mk/bsd.x11.mk

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



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

2021-08-24 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 06:28:25 UTC 2021

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

Log Message:
update for new amdgpu.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-amdgpu/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.10 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.11
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.10	Sun Feb 23 06:33:19 2020
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h	Tue Aug 24 06:28:25 2021
@@ -88,7 +88,7 @@
 #define PACKAGE_NAME "xf86-video-amdgpu"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-amdgpu 19.1.0"
+#define PACKAGE_STRING "xf86-video-amdgpu 21.0.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-amdgpu"
@@ -97,13 +97,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "19.1.0"
+#define PACKAGE_VERSION "21.0.0"
 
 /* Major version of this package */
-#define PACKAGE_VERSION_MAJOR 19
+#define PACKAGE_VERSION_MAJOR 21
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 1
+#define PACKAGE_VERSION_MINOR 0
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -118,7 +118,7 @@
 #define USE_SYS_ENDIAN_H 1
 
 /* Version number of package */
-#define VERSION "19.1.0"
+#define VERSION "21.0.0"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE



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

2021-08-24 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 06:28:25 UTC 2021

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

Log Message:
update for new amdgpu.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-amdgpu/include/config.h

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



CVS commit: src/libexec/httpd

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 05:39:39 UTC 2021

Modified Files:
src/libexec/httpd: bozohttpd.c

Log Message:
rework the bindport setting, inspired by part of the patch
from PR#56367 (thanks JP.)


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/libexec/httpd/bozohttpd.c

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

Modified files:

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.134 src/libexec/httpd/bozohttpd.c:1.135
--- src/libexec/httpd/bozohttpd.c:1.134	Tue Aug 24 05:29:27 2021
+++ src/libexec/httpd/bozohttpd.c	Tue Aug 24 05:39:39 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.134 2021/08/24 05:29:27 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.135 2021/08/24 05:39:39 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -148,7 +148,7 @@
 #include "bozohttpd.h"
 
 #ifndef SSL_TIMEOUT
-#define	SSL_TIMEOUT		"30"	/* wait for 30 seconds for ssl handshake  */
+#define	SSL_TIMEOUT		"30"	/* ssl handshake: 30 seconds timeout */
 #endif
 #ifndef INITIAL_TIMEOUT
 #define	INITIAL_TIMEOUT		"30"	/* wait for 30 seconds initially */
@@ -670,23 +670,14 @@ bozo_read_request(bozohttpd_t *httpd)
 	 * Override the bound port from the request value, so it works even
 	 * if passed through a proxy that doesn't rewrite the port.
 	 */
+	port = NULL;
 	if (httpd->bindport) {
 		if (strcmp(httpd->bindport, BOZO_HTTP_PORT) != 0)
 			port = httpd->bindport;
-		else
-			port = NULL;
-	} else {
-		if (getsockname(0, (struct sockaddr *)(void *), ) < 0)
-			port = NULL;
-		else {
-			if (getnameinfo((struct sockaddr *)(void *), slen,
-	NULL, 0, bufport, sizeof bufport,
-	NI_NUMERICSERV) == 0)
-port = bufport;
-			else
-port = NULL;
-		}
-	}
+	} else if (getsockname(0, (struct sockaddr *)(void *), ) == 0 &&
+		   getnameinfo((struct sockaddr *)(void *), slen, NULL, 0,
+			   bufport, sizeof bufport, NI_NUMERICSERV) == 0)
+		port = bufport;
 	if (port != NULL)
 		request->hr_serverport = bozostrdup(httpd, request, port);
 



CVS commit: src/libexec/httpd

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 05:39:39 UTC 2021

Modified Files:
src/libexec/httpd: bozohttpd.c

Log Message:
rework the bindport setting, inspired by part of the patch
from PR#56367 (thanks JP.)


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/libexec/httpd/bozohttpd.c

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



CVS commit: src/libexec/httpd

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 05:29:27 UTC 2021

Modified Files:
src/libexec/httpd: bozohttpd.c main.c

Log Message:
remove unused parameters, and clean up incompatible options.

from 


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.27 -r1.28 src/libexec/httpd/main.c

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

Modified files:

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.133 src/libexec/httpd/bozohttpd.c:1.134
--- src/libexec/httpd/bozohttpd.c:1.133	Sat Aug 21 11:55:24 2021
+++ src/libexec/httpd/bozohttpd.c	Tue Aug 24 05:29:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.133 2021/08/21 11:55:24 andvar Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.134 2021/08/24 05:29:27 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -241,7 +241,7 @@ bozo_set_pref(bozohttpd_t *httpd, bozopr
 }
 
 static void
-bozo_clear_prefs(bozohttpd_t *httpd, bozoprefs_t *prefs)
+bozo_clear_prefs(bozoprefs_t *prefs)
 {
 	size_t	i;
 
@@ -2722,7 +2722,7 @@ bozo_setup(bozohttpd_t *httpd, bozoprefs
 void
 bozo_cleanup(bozohttpd_t *httpd, bozoprefs_t *prefs)
 {
-	bozo_clear_prefs(httpd, prefs);
+	bozo_clear_prefs(prefs);
 
 	free(httpd->virthostname);
 	free(httpd->errorbuf);

Index: src/libexec/httpd/main.c
diff -u src/libexec/httpd/main.c:1.27 src/libexec/httpd/main.c:1.28
--- src/libexec/httpd/main.c:1.27	Sat Feb 27 12:36:46 2021
+++ src/libexec/httpd/main.c	Tue Aug 24 05:29:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.27 2021/02/27 12:36:46 mrg Exp $	*/
+/*	$NetBSD: main.c,v 1.28 2021/08/24 05:29:27 mrg Exp $	*/
 
 /*	$eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $	*/
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp 	*/
@@ -102,7 +102,9 @@ usage(bozohttpd_t *httpd, char *progname
 		bozowarn(httpd, "   -P pidfile\t\tpid file path");
 	if (have_user)
 		bozowarn(httpd, "   -p dir\t\t\"public_html\" directory name");
-
+	if (have_dirindex)
+		bozowarn(httpd, "   -R readme\t\tput readme file in footer "
+"of directory index");
 	if (have_core) {
 		bozowarn(httpd, "   -S version\t\tset server version string");
 		bozowarn(httpd, "   -s\t\t\talways log to stderr");
@@ -113,20 +115,17 @@ usage(bozohttpd_t *httpd, char *progname
 	}
 	if (have_user)
 		bozowarn(httpd, "   -u\t\t\tenable ~user/public_html support");
-
 	if (have_core) {
 		bozowarn(httpd, "   -V\t\t\tUnknown virtual hosts go to "
 "`slashdir'");
 		bozowarn(httpd, "   -v virtualroot\tenable virtual host "
 "support in this directory");
 	}
-
 	if (have_dirindex)
 		bozowarn(httpd, "   -X\t\t\tdirectory index support");
 	if (have_core)
 		bozowarn(httpd, "   -x index\t\tdefault \"index.html\" "
 "file name");
-
 	if (have_ssl) {
 		bozowarn(httpd, "   -Z cert privkey\tspecify path to server "
 "certificate and private key file\n"
@@ -303,6 +302,9 @@ main(int argc, char **argv)
 			break;
 
 		case 'R':
+			if (!have_dirindex)
+goto no_dirindex_support;
+
 			bozo_set_pref(, , "directory index readme",
   optarg);
 			break;



CVS commit: src/libexec/httpd

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 05:29:27 UTC 2021

Modified Files:
src/libexec/httpd: bozohttpd.c main.c

Log Message:
remove unused parameters, and clean up incompatible options.

from 


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.27 -r1.28 src/libexec/httpd/main.c

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



CVS commit: src/external/mit/xorg/lib/libGLU

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 03:10:11 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libGLU: Makefile

Log Message:
don't install glu_mangle.h


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/libGLU/Makefile

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

Modified files:

Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.21 src/external/mit/xorg/lib/libGLU/Makefile:1.22
--- src/external/mit/xorg/lib/libGLU/Makefile:1.21	Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/libGLU/Makefile	Tue Aug 24 03:10:11 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2021/07/11 20:52:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.22 2021/08/24 03:10:11 mrg Exp $
 
 .include 
 
@@ -128,7 +128,7 @@ SRCS=		${SRCS.libutil} ${SRCS.libtess} \
 CFLAGS+=	-fno-strict-aliasing -fvisibility=hidden -pthread
 
 .PATH:		${X11SRCDIR.glu}/include/GL
-INCS=	glu.h glu_mangle.h
+INCS=	glu.h
 INCSDIR=${X11INCDIR}/GL
 
 LIBDPLIBS=	Xext	${.CURDIR}/../libXext \



CVS commit: src/external/mit/xorg/lib/libGLU

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 03:10:11 UTC 2021

Modified Files:
src/external/mit/xorg/lib/libGLU: Makefile

Log Message:
don't install glu_mangle.h


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/libGLU/Makefile

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



CVS commit: src/distrib/sets/lists/xcomp

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 00:12:32 UTC 2021

Modified Files:
src/distrib/sets/lists/xcomp: mi

Log Message:
glu_mangle.h is obsolete now.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/distrib/sets/lists/xcomp/mi

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

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.225 src/distrib/sets/lists/xcomp/mi:1.226
--- src/distrib/sets/lists/xcomp/mi:1.225	Sun Jul 11 20:48:48 2021
+++ src/distrib/sets/lists/xcomp/mi	Tue Aug 24 00:12:32 2021
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.225 2021/07/11 20:48:48 mrg Exp $
+#	 $NetBSD: mi,v 1.226 2021/08/24 00:12:32 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -19,7 +19,7 @@
 ./usr/X11R7/include/GL/glcorearb.h			xcomp-xorgproto-include	xorg
 ./usr/X11R7/include/GL/glext.hxcomp-xorgproto-include	xorg
 ./usr/X11R7/include/GL/glu.hxcomp-xorgproto-include	xorg
-./usr/X11R7/include/GL/glu_mangle.h			xcomp-xorgproto-include	xorg
+./usr/X11R7/include/GL/glu_mangle.h			xcomp-obsolete	obsolete
 ./usr/X11R7/include/GL/glut.hxcomp-obsolete	obsolete
 ./usr/X11R7/include/GL/glutf90.h			xcomp-obsolete	obsolete
 ./usr/X11R7/include/GL/glx.hxcomp-xorgproto-include	xorg



CVS commit: src/distrib/sets/lists/xcomp

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 00:12:32 UTC 2021

Modified Files:
src/distrib/sets/lists/xcomp: mi

Log Message:
glu_mangle.h is obsolete now.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/distrib/sets/lists/xcomp/mi

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



CVS commit: xsrc/external/mit/glu/dist/include/GL

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 00:06:32 UTC 2021

Modified Files:
xsrc/external/mit/glu/dist/include/GL: glu.h
Removed Files:
xsrc/external/mit/glu/dist/include/GL: glu_mangle.h

Log Message:
merge glu 9.0.2.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/glu/dist/include/GL/glu.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/glu/dist/include/GL/glu_mangle.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/glu/dist/include/GL/glu.h
diff -u xsrc/external/mit/glu/dist/include/GL/glu.h:1.3 xsrc/external/mit/glu/dist/include/GL/glu.h:1.4
--- xsrc/external/mit/glu/dist/include/GL/glu.h:1.3	Thu May 26 07:59:26 2016
+++ xsrc/external/mit/glu/dist/include/GL/glu.h	Tue Aug 24 00:06:32 2021
@@ -31,10 +31,6 @@
 #ifndef __glu_h__
 #define __glu_h__
 
-#if defined(USE_MGL_NAMESPACE)
-#include "glu_mangle.h"
-#endif
-
 #include 
 
 #ifndef GLAPIENTRY



CVS commit: xsrc/external/mit/glu/dist/include/GL

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 00:06:32 UTC 2021

Modified Files:
xsrc/external/mit/glu/dist/include/GL: glu.h
Removed Files:
xsrc/external/mit/glu/dist/include/GL: glu_mangle.h

Log Message:
merge glu 9.0.2.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/glu/dist/include/GL/glu.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/glu/dist/include/GL/glu_mangle.h

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



CVS import: xsrc/external/mit/glu/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 00:05:43 UTC 2021

Update of /cvsroot/xsrc/external/mit/glu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv20616

Log Message:
initial import of glu-9.0.2

Status:

Vendor Tag: xorg
Release Tags:   glu-9-0-2

N xsrc/external/mit/glu/dist/compile
U xsrc/external/mit/glu/dist/configure.ac
U xsrc/external/mit/glu/dist/configure
U xsrc/external/mit/glu/dist/Makefile.am
N xsrc/external/mit/glu/dist/meson_options.txt
U xsrc/external/mit/glu/dist/ltmain.sh
U xsrc/external/mit/glu/dist/glu.pc.in
U xsrc/external/mit/glu/dist/depcomp
U xsrc/external/mit/glu/dist/config.guess
U xsrc/external/mit/glu/dist/missing
U xsrc/external/mit/glu/dist/Makefile.in
U xsrc/external/mit/glu/dist/config.sub
N xsrc/external/mit/glu/dist/meson.build
U xsrc/external/mit/glu/dist/install-sh
U xsrc/external/mit/glu/dist/aclocal.m4
C xsrc/external/mit/glu/dist/include/GL/glu.h
N xsrc/external/mit/glu/dist/src/meson.build
U xsrc/external/mit/glu/dist/src/libtess/render.c
U xsrc/external/mit/glu/dist/src/libtess/memalloc.h
U xsrc/external/mit/glu/dist/src/libtess/priorityq.c
U xsrc/external/mit/glu/dist/src/libtess/memalloc.c
U xsrc/external/mit/glu/dist/src/libtess/priorityq-sort.h
U xsrc/external/mit/glu/dist/src/libtess/render.h
U xsrc/external/mit/glu/dist/src/libtess/sweep.h
U xsrc/external/mit/glu/dist/src/libtess/dict.h
U xsrc/external/mit/glu/dist/src/libtess/mesh.h
U xsrc/external/mit/glu/dist/src/libtess/tessmono.c
U xsrc/external/mit/glu/dist/src/libtess/dict.c
U xsrc/external/mit/glu/dist/src/libtess/normal.c
U xsrc/external/mit/glu/dist/src/libtess/tess.h
U xsrc/external/mit/glu/dist/src/libtess/priorityq-heap.c
U xsrc/external/mit/glu/dist/src/libtess/priorityq.h
U xsrc/external/mit/glu/dist/src/libtess/tessmono.h
U xsrc/external/mit/glu/dist/src/libtess/geom.c
U xsrc/external/mit/glu/dist/src/libtess/normal.h
U xsrc/external/mit/glu/dist/src/libtess/priorityq-heap.h
U xsrc/external/mit/glu/dist/src/libtess/dict-list.h
U xsrc/external/mit/glu/dist/src/libtess/tess.c
U xsrc/external/mit/glu/dist/src/libtess/sweep.c
U xsrc/external/mit/glu/dist/src/libtess/geom.h
U xsrc/external/mit/glu/dist/src/libtess/mesh.c
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleComp.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/directedLine.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyDBG.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampledLine.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyUtil.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/directedLine.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoChain.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompRight.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionX.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/zlassert.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoTriangulation.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampledLine.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoPolyPart.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleMonoPoly.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/gridWrap.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyDBG.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/primitiveStream.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionY.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/primitiveStream.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompTop.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionY.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleMonoPoly.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/gridWrap.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/rectBlock.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/mystdio.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/searchTree.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyUtil.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/quicksort.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleComp.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompBot.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoPolyPart.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoTriangulation.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/glimports.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/searchTree.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionX.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoChain.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/mystdlib.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompRight.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompBot.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/rectBlock.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompTop.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/definitions.h
U 

CVS import: xsrc/external/mit/glu/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 00:05:43 UTC 2021

Update of /cvsroot/xsrc/external/mit/glu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv20616

Log Message:
initial import of glu-9.0.2

Status:

Vendor Tag: xorg
Release Tags:   glu-9-0-2

N xsrc/external/mit/glu/dist/compile
U xsrc/external/mit/glu/dist/configure.ac
U xsrc/external/mit/glu/dist/configure
U xsrc/external/mit/glu/dist/Makefile.am
N xsrc/external/mit/glu/dist/meson_options.txt
U xsrc/external/mit/glu/dist/ltmain.sh
U xsrc/external/mit/glu/dist/glu.pc.in
U xsrc/external/mit/glu/dist/depcomp
U xsrc/external/mit/glu/dist/config.guess
U xsrc/external/mit/glu/dist/missing
U xsrc/external/mit/glu/dist/Makefile.in
U xsrc/external/mit/glu/dist/config.sub
N xsrc/external/mit/glu/dist/meson.build
U xsrc/external/mit/glu/dist/install-sh
U xsrc/external/mit/glu/dist/aclocal.m4
C xsrc/external/mit/glu/dist/include/GL/glu.h
N xsrc/external/mit/glu/dist/src/meson.build
U xsrc/external/mit/glu/dist/src/libtess/render.c
U xsrc/external/mit/glu/dist/src/libtess/memalloc.h
U xsrc/external/mit/glu/dist/src/libtess/priorityq.c
U xsrc/external/mit/glu/dist/src/libtess/memalloc.c
U xsrc/external/mit/glu/dist/src/libtess/priorityq-sort.h
U xsrc/external/mit/glu/dist/src/libtess/render.h
U xsrc/external/mit/glu/dist/src/libtess/sweep.h
U xsrc/external/mit/glu/dist/src/libtess/dict.h
U xsrc/external/mit/glu/dist/src/libtess/mesh.h
U xsrc/external/mit/glu/dist/src/libtess/tessmono.c
U xsrc/external/mit/glu/dist/src/libtess/dict.c
U xsrc/external/mit/glu/dist/src/libtess/normal.c
U xsrc/external/mit/glu/dist/src/libtess/tess.h
U xsrc/external/mit/glu/dist/src/libtess/priorityq-heap.c
U xsrc/external/mit/glu/dist/src/libtess/priorityq.h
U xsrc/external/mit/glu/dist/src/libtess/tessmono.h
U xsrc/external/mit/glu/dist/src/libtess/geom.c
U xsrc/external/mit/glu/dist/src/libtess/normal.h
U xsrc/external/mit/glu/dist/src/libtess/priorityq-heap.h
U xsrc/external/mit/glu/dist/src/libtess/dict-list.h
U xsrc/external/mit/glu/dist/src/libtess/tess.c
U xsrc/external/mit/glu/dist/src/libtess/sweep.c
U xsrc/external/mit/glu/dist/src/libtess/geom.h
U xsrc/external/mit/glu/dist/src/libtess/mesh.c
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleComp.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/directedLine.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyDBG.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampledLine.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyUtil.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/directedLine.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoChain.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompRight.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionX.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/zlassert.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoTriangulation.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampledLine.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoPolyPart.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleMonoPoly.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/gridWrap.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyDBG.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/primitiveStream.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionY.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/primitiveStream.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompTop.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionY.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleMonoPoly.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/gridWrap.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/rectBlock.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/mystdio.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/searchTree.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/polyUtil.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/quicksort.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleComp.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompBot.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoPolyPart.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoTriangulation.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/glimports.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/searchTree.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/partitionX.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/monoChain.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/mystdlib.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompRight.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompBot.cc
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/rectBlock.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/sampleCompTop.h
U xsrc/external/mit/glu/dist/src/libnurbs/nurbtess/definitions.h
U 

CVS commit: src/sys/dev/ic

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 23:55:43 UTC 2021

Modified Files:
src/sys/dev/ic: amdccp.c

Log Message:
avoid an infinite loop if reading data fails.

system hung hard on an "AMD E2-7110 APU with AMD Radeon R2 Graphics"
CPU, as the read fails continually and the loop continues.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/amdccp.c

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

Modified files:

Index: src/sys/dev/ic/amdccp.c
diff -u src/sys/dev/ic/amdccp.c:1.2 src/sys/dev/ic/amdccp.c:1.3
--- src/sys/dev/ic/amdccp.c:1.2	Thu Apr 30 03:40:53 2020
+++ src/sys/dev/ic/amdccp.c	Mon Aug 23 23:55:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp.c,v 1.2 2020/04/30 03:40:53 riastradh Exp $ */
+/* $NetBSD: amdccp.c,v 1.3 2021/08/23 23:55:43 mrg Exp $ */
 
 /*
  * Copyright (c) 2018 Jonathan A. Kollasch
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: amdccp.c,v 1.2 2020/04/30 03:40:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp.c,v 1.3 2021/08/23 23:55:43 mrg Exp $");
 
 #include 
 #include 
@@ -77,13 +77,19 @@ amdccp_rnd_callback(size_t bytes_wanted,
 	while (bytes_wanted) {
 		const size_t nbytes = MIN(bytes_wanted, sizeof(buf));
 		const size_t nwords = howmany(nbytes, sizeof(buf[0]));
+
 		for (cnt = 0; cnt < nwords; cnt++) {
 			buf[cnt] = amdccp_rnd_read(sc);
 			if (buf[cnt] == 0) {
 break;
 			}
 		}
+		if (cnt == 0) {
+			break;
+		}
+
 		const size_t cntby = cnt * sizeof(buf[0]);
+
 		rnd_add_data_sync(>sc_rndsource, buf, cntby, cntby * NBBY);
 		bytes_wanted -= MIN(bytes_wanted, cntby);
 	}



CVS commit: src/sys/dev/ic

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 23:55:43 UTC 2021

Modified Files:
src/sys/dev/ic: amdccp.c

Log Message:
avoid an infinite loop if reading data fails.

system hung hard on an "AMD E2-7110 APU with AMD Radeon R2 Graphics"
CPU, as the read fails continually and the loop continues.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/amdccp.c

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



CVS commit: src/distrib/sets/lists

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 23:08:50 UTC 2021

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
amdgpu_drv.so got bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.132 -r1.133 src/distrib/sets/lists/xserver/md.i386

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

Modified files:

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.53 src/distrib/sets/lists/xdebug/md.amd64:1.54
--- src/distrib/sets/lists/xdebug/md.amd64:1.53	Tue Apr 27 03:09:16 2021
+++ src/distrib/sets/lists/xdebug/md.amd64	Mon Aug 23 23:08:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.53 2021/04/27 03:09:16 mrg Exp $
+# $NetBSD: md.amd64,v 1.54 2021/08/23 23:08:50 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.axdebug-libI810XvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib,compatx11file
@@ -77,7 +77,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19.debug	xdebug-xf86-video-amdgpu-debug		xorg,debug,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19.debug	xdebug-obsolete		xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.21.debug	xdebug-xf86-video-amdgpu-debug		xorg,debug,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120

Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.49 src/distrib/sets/lists/xdebug/md.i386:1.50
--- src/distrib/sets/lists/xdebug/md.i386:1.49	Tue Apr 27 03:09:16 2021
+++ src/distrib/sets/lists/xdebug/md.i386	Mon Aug 23 23:08:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.49 2021/04/27 03:09:16 mrg Exp $
+# $NetBSD: md.i386,v 1.50 2021/08/23 23:08:50 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.axdebug-libI810XvMC-debuglib	xorg,debuglib
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib
@@ -87,7 +87,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19.debug	xdebug-xf86-video-amdgpu-debug		xorg,debug,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19.debug	xdebug-obsolete		xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.21.debug	xdebug-xf86-video-amdgpu-debug		xorg,debug,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.116 src/distrib/sets/lists/xserver/md.amd64:1.117
--- src/distrib/sets/lists/xserver/md.amd64:1.116	Thu Aug 19 09:05:22 2021
+++ src/distrib/sets/lists/xserver/md.amd64	Mon Aug 23 23:08:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.116 2021/08/19 09:05:22 mrg Exp $
+# $NetBSD: md.amd64,v 1.117 2021/08/23 23:08:50 mrg Exp $
 ./usr/X11R7/bin/X	xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg	xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt	xserver-xorg-server-bin	xorg
@@ -50,7 +50,8 @@
 ./usr/X11R7/lib/modules/dri/unichrome_dri.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/dri/unichrome_dri.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/amdgpu_drv.so		

CVS commit: src/distrib/sets/lists

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 23:08:50 UTC 2021

Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
amdgpu_drv.so got bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.132 -r1.133 src/distrib/sets/lists/xserver/md.i386

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



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:34:58 UTC 2021

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

Log Message:
updates for xorg-server 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/include/xf86Build.h
cvs rdiff -u -r1.23 -r1.24 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

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

Modified files:

Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.43 xsrc/external/mit/xorg-server/include/dix-config.h:1.44
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.43	Thu Aug 19 11:02:35 2021
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Mon Aug 23 22:34:58 2021
@@ -353,7 +353,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((12) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((13) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.13 xsrc/external/mit/xorg-server/include/version-config.h:1.14
--- xsrc/external/mit/xorg-server/include/version-config.h:1.13	Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/include/version-config.h	Mon Aug 23 22:34:58 2021
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.12"
+#define VENDOR_MAN_VERSION "Version 1.20.13"
 
 /* Vendor name */
 /* #define VENDOR_NAME "The X.Org Foundation" */
 
 /* Vendor release */
-#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((12) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((13) * 1000) + 0)
 
 #endif /* VERSION_CONFIG_H */
 

Index: xsrc/external/mit/xorg-server/include/xf86Build.h
diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.12 xsrc/external/mit/xorg-server/include/xf86Build.h:1.13
--- xsrc/external/mit/xorg-server/include/xf86Build.h:1.12	Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/include/xf86Build.h	Mon Aug 23 22:34:58 2021
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20210709
-#define BUILD_TIME 17
+#define BUILD_DATE 20210823
+#define BUILD_TIME 232323

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.23 xsrc/external/mit/xorg-server/include/xorg-config.h:1.24
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.23	Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Mon Aug 23 22:34:58 2021
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((12) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((13) * 1000) + 0)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.23 xsrc/external/mit/xorg-server/include/xorg-server.h:1.24
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.23	Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Mon Aug 23 22:34:58 2021
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((12) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((13) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:34:58 UTC 2021

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

Log Message:
updates for xorg-server 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/include/xf86Build.h
cvs rdiff -u -r1.23 -r1.24 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

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



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:32:40 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
present.c
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h

Log Message:
merge xorg-server 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/randr/randr.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/randr/randrstr.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.10 xsrc/external/mit/xorg-server/dist/configure:1.11
--- xsrc/external/mit/xorg-server/dist/configure:1.10	Sun Jul 11 00:13:26 2021
+++ xsrc/external/mit/xorg-server/dist/configure	Mon Aug 23 22:32:40 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.12.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.13.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.12'
-PACKAGE_STRING='xorg-server 1.20.12'
+PACKAGE_VERSION='1.20.13'
+PACKAGE_STRING='xorg-server 1.20.13'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2045,7 +2045,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 1.20.12 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2116,7 +2116,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.12:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.13:";;
esac
   cat <<\_ACEOF
 
@@ -2307,10 +2307,10 @@ Optional Packages:
   org.x)
   --with-bundle-version=VERSION
   Version to use for X11.app's CFBundleVersion
-  (default: 1.20.12)
+  (default: 1.20.13)
   --with-bundle-version-string=VERSION
   Version to use for X11.app's
-  CFBundleShortVersionString (default: 1.20.12)
+  CFBundleShortVersionString (default: 1.20.13)
   --with-sparkle-feed-url=URL
   URL for the Sparkle feed (default:
   https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2567,7 +2567,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.20.12
+xorg-server configure 1.20.13
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3276,7 +3276,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 1.20.12, which was
+It was created by xorg-server $as_me 1.20.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3624,7 +3624,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2021-07-08"
+RELEASE_DATE="2021-07-29"
 RELEASE_NAME="Lemon Pepper Chicken"
 
 
@@ -4138,7 +4138,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.20.12'
+ VERSION='1.20.13'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16502,7 +16502,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 	10.[012][,.]*)
 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
+	10.*|11.*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
   esac
 ;;
@@ -23773,7 +23773,7 @@ _ACEOF
 if test "${with_bundle_version+set}" = set; then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else
-   BUNDLE_VERSION="1.20.12"
+   BUNDLE_VERSION="1.20.13"
 fi
 
 
@@ -33618,7 +33618,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was 

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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:32:40 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
present.c
xsrc/external/mit/xorg-server/dist/randr: randr.c randrstr.h

Log Message:
merge xorg-server 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/randr/randr.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/randr/randrstr.h

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



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:31:01 UTC 2021

Update of /cvsroot/xsrc/external/mit/xorg-server/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv490

Log Message:
initial import of xorg-server-1.20.13

Status:

Vendor Tag: xorg
Release Tags:   xorg-server-1-20-13

U xsrc/external/mit/xorg-server/dist/Makefile.am
C xsrc/external/mit/xorg-server/dist/configure
C xsrc/external/mit/xorg-server/dist/configure.ac
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/README.md
U xsrc/external/mit/xorg-server/dist/meson_options.txt
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/ylwrap
U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/composite/meson.build
U xsrc/external/mit/xorg-server/dist/composite/Makefile.am
U xsrc/external/mit/xorg-server/dist/composite/compositeext.h
U xsrc/external/mit/xorg-server/dist/composite/Makefile.in
U xsrc/external/mit/xorg-server/dist/composite/compalloc.c
U xsrc/external/mit/xorg-server/dist/composite/compext.c
U xsrc/external/mit/xorg-server/dist/composite/compint.h
U xsrc/external/mit/xorg-server/dist/composite/compinit.c
U xsrc/external/mit/xorg-server/dist/composite/compoverlay.c
U xsrc/external/mit/xorg-server/dist/composite/compwindow.c
U xsrc/external/mit/xorg-server/dist/config/meson.build
U xsrc/external/mit/xorg-server/dist/config/Makefile.am
U xsrc/external/mit/xorg-server/dist/config/Makefile.in
U xsrc/external/mit/xorg-server/dist/config/config.c
U xsrc/external/mit/xorg-server/dist/config/config-backends.h
U xsrc/external/mit/xorg-server/dist/config/dbus-core.c
U xsrc/external/mit/xorg-server/dist/config/udev.c
U xsrc/external/mit/xorg-server/dist/config/hal.c
U xsrc/external/mit/xorg-server/dist/config/wscons.c
U xsrc/external/mit/xorg-server/dist/config/x11-input.fdi
U xsrc/external/mit/xorg-server/dist/config/fdi2iclass.py
U xsrc/external/mit/xorg-server/dist/config/10-quirks.conf
U xsrc/external/mit/xorg-server/dist/damageext/meson.build
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.am
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.in
U xsrc/external/mit/xorg-server/dist/damageext/damageext.c
U xsrc/external/mit/xorg-server/dist/damageext/damageextint.h
U xsrc/external/mit/xorg-server/dist/dbe/meson.build
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.am
U xsrc/external/mit/xorg-server/dist/dbe/dbestruct.h
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.in
U xsrc/external/mit/xorg-server/dist/dbe/dbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.h
U xsrc/external/mit/xorg-server/dist/dix/meson.build
U xsrc/external/mit/xorg-server/dist/dix/Makefile.am
U xsrc/external/mit/xorg-server/dist/dix/protocol.txt
U xsrc/external/mit/xorg-server/dist/dix/Makefile.in
U xsrc/external/mit/xorg-server/dist/dix/atom.c
U xsrc/external/mit/xorg-server/dist/dix/colormap.c
U xsrc/external/mit/xorg-server/dist/dix/cursor.c
U xsrc/external/mit/xorg-server/dist/dix/devices.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.h
U xsrc/external/mit/xorg-server/dist/dix/dixfonts.c
U xsrc/external/mit/xorg-server/dist/dix/main.c
U xsrc/external/mit/xorg-server/dist/dix/dixutils.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.h
U xsrc/external/mit/xorg-server/dist/dix/events.c
U xsrc/external/mit/xorg-server/dist/dix/eventconvert.c
U xsrc/external/mit/xorg-server/dist/dix/extension.c
U xsrc/external/mit/xorg-server/dist/dix/gc.c
U xsrc/external/mit/xorg-server/dist/dix/getevents.c
U xsrc/external/mit/xorg-server/dist/dix/globals.c
U xsrc/external/mit/xorg-server/dist/dix/glyphcurs.c
U xsrc/external/mit/xorg-server/dist/dix/grabs.c
U xsrc/external/mit/xorg-server/dist/dix/initatoms.c
U xsrc/external/mit/xorg-server/dist/dix/inpututils.c
U xsrc/external/mit/xorg-server/dist/dix/pixmap.c
U xsrc/external/mit/xorg-server/dist/dix/privates.c
U xsrc/external/mit/xorg-server/dist/dix/property.c
U 

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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:31:01 UTC 2021

Update of /cvsroot/xsrc/external/mit/xorg-server/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv490

Log Message:
initial import of xorg-server-1.20.13

Status:

Vendor Tag: xorg
Release Tags:   xorg-server-1-20-13

U xsrc/external/mit/xorg-server/dist/Makefile.am
C xsrc/external/mit/xorg-server/dist/configure
C xsrc/external/mit/xorg-server/dist/configure.ac
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/README.md
U xsrc/external/mit/xorg-server/dist/meson_options.txt
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/ylwrap
U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/composite/meson.build
U xsrc/external/mit/xorg-server/dist/composite/Makefile.am
U xsrc/external/mit/xorg-server/dist/composite/compositeext.h
U xsrc/external/mit/xorg-server/dist/composite/Makefile.in
U xsrc/external/mit/xorg-server/dist/composite/compalloc.c
U xsrc/external/mit/xorg-server/dist/composite/compext.c
U xsrc/external/mit/xorg-server/dist/composite/compint.h
U xsrc/external/mit/xorg-server/dist/composite/compinit.c
U xsrc/external/mit/xorg-server/dist/composite/compoverlay.c
U xsrc/external/mit/xorg-server/dist/composite/compwindow.c
U xsrc/external/mit/xorg-server/dist/config/meson.build
U xsrc/external/mit/xorg-server/dist/config/Makefile.am
U xsrc/external/mit/xorg-server/dist/config/Makefile.in
U xsrc/external/mit/xorg-server/dist/config/config.c
U xsrc/external/mit/xorg-server/dist/config/config-backends.h
U xsrc/external/mit/xorg-server/dist/config/dbus-core.c
U xsrc/external/mit/xorg-server/dist/config/udev.c
U xsrc/external/mit/xorg-server/dist/config/hal.c
U xsrc/external/mit/xorg-server/dist/config/wscons.c
U xsrc/external/mit/xorg-server/dist/config/x11-input.fdi
U xsrc/external/mit/xorg-server/dist/config/fdi2iclass.py
U xsrc/external/mit/xorg-server/dist/config/10-quirks.conf
U xsrc/external/mit/xorg-server/dist/damageext/meson.build
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.am
U xsrc/external/mit/xorg-server/dist/damageext/Makefile.in
U xsrc/external/mit/xorg-server/dist/damageext/damageext.c
U xsrc/external/mit/xorg-server/dist/damageext/damageextint.h
U xsrc/external/mit/xorg-server/dist/dbe/meson.build
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.am
U xsrc/external/mit/xorg-server/dist/dbe/dbestruct.h
U xsrc/external/mit/xorg-server/dist/dbe/Makefile.in
U xsrc/external/mit/xorg-server/dist/dbe/dbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.c
U xsrc/external/mit/xorg-server/dist/dbe/midbe.h
U xsrc/external/mit/xorg-server/dist/dix/meson.build
U xsrc/external/mit/xorg-server/dist/dix/Makefile.am
U xsrc/external/mit/xorg-server/dist/dix/protocol.txt
U xsrc/external/mit/xorg-server/dist/dix/Makefile.in
U xsrc/external/mit/xorg-server/dist/dix/atom.c
U xsrc/external/mit/xorg-server/dist/dix/colormap.c
U xsrc/external/mit/xorg-server/dist/dix/cursor.c
U xsrc/external/mit/xorg-server/dist/dix/devices.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.c
U xsrc/external/mit/xorg-server/dist/dix/dispatch.h
U xsrc/external/mit/xorg-server/dist/dix/dixfonts.c
U xsrc/external/mit/xorg-server/dist/dix/main.c
U xsrc/external/mit/xorg-server/dist/dix/dixutils.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.c
U xsrc/external/mit/xorg-server/dist/dix/enterleave.h
U xsrc/external/mit/xorg-server/dist/dix/events.c
U xsrc/external/mit/xorg-server/dist/dix/eventconvert.c
U xsrc/external/mit/xorg-server/dist/dix/extension.c
U xsrc/external/mit/xorg-server/dist/dix/gc.c
U xsrc/external/mit/xorg-server/dist/dix/getevents.c
U xsrc/external/mit/xorg-server/dist/dix/globals.c
U xsrc/external/mit/xorg-server/dist/dix/glyphcurs.c
U xsrc/external/mit/xorg-server/dist/dix/grabs.c
U xsrc/external/mit/xorg-server/dist/dix/initatoms.c
U xsrc/external/mit/xorg-server/dist/dix/inpututils.c
U xsrc/external/mit/xorg-server/dist/dix/pixmap.c
U xsrc/external/mit/xorg-server/dist/dix/privates.c
U xsrc/external/mit/xorg-server/dist/dix/property.c
U 

CVS commit: xsrc/external/mit/xorg-cf-files/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:23:03 UTC 2021

Modified Files:
xsrc/external/mit/xorg-cf-files/dist: site.def

Log Message:
keep ProjectRoot at the old default of /usr/X11R7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-cf-files/dist/site.def

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

Modified files:

Index: xsrc/external/mit/xorg-cf-files/dist/site.def
diff -u xsrc/external/mit/xorg-cf-files/dist/site.def:1.1.1.4 xsrc/external/mit/xorg-cf-files/dist/site.def:1.2
--- xsrc/external/mit/xorg-cf-files/dist/site.def:1.1.1.4	Mon Aug 23 22:21:45 2021
+++ xsrc/external/mit/xorg-cf-files/dist/site.def	Mon Aug 23 22:23:03 2021
@@ -72,7 +72,7 @@ XCOMM site:  $XFree86: xc/config/cf/site
 #ifdef AfterVendorCF
 
 #ifndef ProjectRoot
-#define ProjectRoot /usr/local
+#define ProjectRoot /usr/X11R7
 #endif
 
 #ifndef FontDir



CVS commit: xsrc/external/mit/xorg-cf-files/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:23:03 UTC 2021

Modified Files:
xsrc/external/mit/xorg-cf-files/dist: site.def

Log Message:
keep ProjectRoot at the old default of /usr/X11R7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-cf-files/dist/site.def

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



CVS import: xsrc/external/mit/xorg-cf-files/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:21:46 UTC 2021

Update of /cvsroot/xsrc/external/mit/xorg-cf-files/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv17016

Log Message:
initial import of xorg-cf-files-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   xorg-cf-files-1-0-7

U xsrc/external/mit/xorg-cf-files/dist/cross.rules
U xsrc/external/mit/xorg-cf-files/dist/Imake.rules
U xsrc/external/mit/xorg-cf-files/dist/Win32.cf
U xsrc/external/mit/xorg-cf-files/dist/QNX4.cf
U xsrc/external/mit/xorg-cf-files/dist/xf86.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Win32.rules
U xsrc/external/mit/xorg-cf-files/dist/OpenBSD.cf
U xsrc/external/mit/xorg-cf-files/dist/isc.cf
U xsrc/external/mit/xorg-cf-files/dist/Imake.cf
U xsrc/external/mit/xorg-cf-files/dist/ibmLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/site.def
U xsrc/external/mit/xorg-cf-files/dist/compile
U xsrc/external/mit/xorg-cf-files/dist/svr4.cf
U xsrc/external/mit/xorg-cf-files/dist/os2.rules
U xsrc/external/mit/xorg-cf-files/dist/sunLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/nto.cf
U xsrc/external/mit/xorg-cf-files/dist/xf86site.def
U xsrc/external/mit/xorg-cf-files/dist/sgi.cf
U xsrc/external/mit/xorg-cf-files/dist/xorg.cf
U xsrc/external/mit/xorg-cf-files/dist/COPYING
U xsrc/external/mit/xorg-cf-files/dist/linux.cf
U xsrc/external/mit/xorg-cf-files/dist/cygwin.tmpl
U xsrc/external/mit/xorg-cf-files/dist/ibmLib.rules
U xsrc/external/mit/xorg-cf-files/dist/cygwin.rules
U xsrc/external/mit/xorg-cf-files/dist/os2.cf
U xsrc/external/mit/xorg-cf-files/dist/macII.cf
U xsrc/external/mit/xorg-cf-files/dist/README
U xsrc/external/mit/xorg-cf-files/dist/DGUX.cf
U xsrc/external/mit/xorg-cf-files/dist/WinLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/config.guess
U xsrc/external/mit/xorg-cf-files/dist/bsdLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sony.cf
U xsrc/external/mit/xorg-cf-files/dist/ncr.cf
U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sgiLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/bsdiLib.rules
U xsrc/external/mit/xorg-cf-files/dist/svr3.cf
U xsrc/external/mit/xorg-cf-files/dist/nec.cf
U xsrc/external/mit/xorg-cf-files/dist/bsdi.cf
U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.rules
U xsrc/external/mit/xorg-cf-files/dist/missing
U xsrc/external/mit/xorg-cf-files/dist/Oki.cf
U xsrc/external/mit/xorg-cf-files/dist/lynx.cf
U xsrc/external/mit/xorg-cf-files/dist/fujitsu.cf
U xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
U xsrc/external/mit/xorg-cf-files/dist/ibm.cf
U xsrc/external/mit/xorg-cf-files/dist/gnuLib.rules
U xsrc/external/mit/xorg-cf-files/dist/mingw.cf
U xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf
U xsrc/external/mit/xorg-cf-files/dist/pegasus.cf
U xsrc/external/mit/xorg-cf-files/dist/xorgsite.def
U xsrc/external/mit/xorg-cf-files/dist/config.sub
U xsrc/external/mit/xorg-cf-files/dist/darwin.cf
U xsrc/external/mit/xorg-cf-files/dist/Server.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sco5.cf
U xsrc/external/mit/xorg-cf-files/dist/sun.cf
U xsrc/external/mit/xorg-cf-files/dist/OpenBSDLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sunLib.rules
U xsrc/external/mit/xorg-cf-files/dist/necLib.rules
U xsrc/external/mit/xorg-cf-files/dist/dmx.cf
U xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
U xsrc/external/mit/xorg-cf-files/dist/xorgversion.def
U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.rules
U xsrc/external/mit/xorg-cf-files/dist/site.def.in
U xsrc/external/mit/xorg-cf-files/dist/convex.cf
U xsrc/external/mit/xorg-cf-files/dist/x386.cf
U xsrc/external/mit/xorg-cf-files/dist/sco.cf
U xsrc/external/mit/xorg-cf-files/dist/gnuLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Library.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Threads.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Motif.tmpl
U xsrc/external/mit/xorg-cf-files/dist/osfLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/scoLib.rules
U xsrc/external/mit/xorg-cf-files/dist/darwinLib.rules
U xsrc/external/mit/xorg-cf-files/dist/mingw.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Makefile.in
U xsrc/external/mit/xorg-cf-files/dist/INSTALL
U xsrc/external/mit/xorg-cf-files/dist/cde.rules
U xsrc/external/mit/xorg-cf-files/dist/nto.rules
U xsrc/external/mit/xorg-cf-files/dist/os2Lib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/mach.cf
U xsrc/external/mit/xorg-cf-files/dist/Motif.rules
U xsrc/external/mit/xorg-cf-files/dist/moto.cf
U xsrc/external/mit/xorg-cf-files/dist/gnu.cf
U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sequent.cf
U xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.rules
U xsrc/external/mit/xorg-cf-files/dist/ServerLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/DragonFly.cf
U xsrc/external/mit/xorg-cf-files/dist/apollo.cf
U xsrc/external/mit/xorg-cf-files/dist/xf86.rules
U xsrc/external/mit/xorg-cf-files/dist/ultrix.cf
U 

CVS import: xsrc/external/mit/xorg-cf-files/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 22:21:46 UTC 2021

Update of /cvsroot/xsrc/external/mit/xorg-cf-files/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv17016

Log Message:
initial import of xorg-cf-files-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   xorg-cf-files-1-0-7

U xsrc/external/mit/xorg-cf-files/dist/cross.rules
U xsrc/external/mit/xorg-cf-files/dist/Imake.rules
U xsrc/external/mit/xorg-cf-files/dist/Win32.cf
U xsrc/external/mit/xorg-cf-files/dist/QNX4.cf
U xsrc/external/mit/xorg-cf-files/dist/xf86.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Win32.rules
U xsrc/external/mit/xorg-cf-files/dist/OpenBSD.cf
U xsrc/external/mit/xorg-cf-files/dist/isc.cf
U xsrc/external/mit/xorg-cf-files/dist/Imake.cf
U xsrc/external/mit/xorg-cf-files/dist/ibmLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/site.def
U xsrc/external/mit/xorg-cf-files/dist/compile
U xsrc/external/mit/xorg-cf-files/dist/svr4.cf
U xsrc/external/mit/xorg-cf-files/dist/os2.rules
U xsrc/external/mit/xorg-cf-files/dist/sunLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/nto.cf
U xsrc/external/mit/xorg-cf-files/dist/xf86site.def
U xsrc/external/mit/xorg-cf-files/dist/sgi.cf
U xsrc/external/mit/xorg-cf-files/dist/xorg.cf
U xsrc/external/mit/xorg-cf-files/dist/COPYING
U xsrc/external/mit/xorg-cf-files/dist/linux.cf
U xsrc/external/mit/xorg-cf-files/dist/cygwin.tmpl
U xsrc/external/mit/xorg-cf-files/dist/ibmLib.rules
U xsrc/external/mit/xorg-cf-files/dist/cygwin.rules
U xsrc/external/mit/xorg-cf-files/dist/os2.cf
U xsrc/external/mit/xorg-cf-files/dist/macII.cf
U xsrc/external/mit/xorg-cf-files/dist/README
U xsrc/external/mit/xorg-cf-files/dist/DGUX.cf
U xsrc/external/mit/xorg-cf-files/dist/WinLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/config.guess
U xsrc/external/mit/xorg-cf-files/dist/bsdLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sony.cf
U xsrc/external/mit/xorg-cf-files/dist/ncr.cf
U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sgiLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/bsdiLib.rules
U xsrc/external/mit/xorg-cf-files/dist/svr3.cf
U xsrc/external/mit/xorg-cf-files/dist/nec.cf
U xsrc/external/mit/xorg-cf-files/dist/bsdi.cf
U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.rules
U xsrc/external/mit/xorg-cf-files/dist/missing
U xsrc/external/mit/xorg-cf-files/dist/Oki.cf
U xsrc/external/mit/xorg-cf-files/dist/lynx.cf
U xsrc/external/mit/xorg-cf-files/dist/fujitsu.cf
U xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
U xsrc/external/mit/xorg-cf-files/dist/ibm.cf
U xsrc/external/mit/xorg-cf-files/dist/gnuLib.rules
U xsrc/external/mit/xorg-cf-files/dist/mingw.cf
U xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf
U xsrc/external/mit/xorg-cf-files/dist/pegasus.cf
U xsrc/external/mit/xorg-cf-files/dist/xorgsite.def
U xsrc/external/mit/xorg-cf-files/dist/config.sub
U xsrc/external/mit/xorg-cf-files/dist/darwin.cf
U xsrc/external/mit/xorg-cf-files/dist/Server.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sco5.cf
U xsrc/external/mit/xorg-cf-files/dist/sun.cf
U xsrc/external/mit/xorg-cf-files/dist/OpenBSDLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sunLib.rules
U xsrc/external/mit/xorg-cf-files/dist/necLib.rules
U xsrc/external/mit/xorg-cf-files/dist/dmx.cf
U xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
U xsrc/external/mit/xorg-cf-files/dist/xorgversion.def
U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.rules
U xsrc/external/mit/xorg-cf-files/dist/site.def.in
U xsrc/external/mit/xorg-cf-files/dist/convex.cf
U xsrc/external/mit/xorg-cf-files/dist/x386.cf
U xsrc/external/mit/xorg-cf-files/dist/sco.cf
U xsrc/external/mit/xorg-cf-files/dist/gnuLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Library.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Threads.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Motif.tmpl
U xsrc/external/mit/xorg-cf-files/dist/osfLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/scoLib.rules
U xsrc/external/mit/xorg-cf-files/dist/darwinLib.rules
U xsrc/external/mit/xorg-cf-files/dist/mingw.tmpl
U xsrc/external/mit/xorg-cf-files/dist/Makefile.in
U xsrc/external/mit/xorg-cf-files/dist/INSTALL
U xsrc/external/mit/xorg-cf-files/dist/cde.rules
U xsrc/external/mit/xorg-cf-files/dist/nto.rules
U xsrc/external/mit/xorg-cf-files/dist/os2Lib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/mach.cf
U xsrc/external/mit/xorg-cf-files/dist/Motif.rules
U xsrc/external/mit/xorg-cf-files/dist/moto.cf
U xsrc/external/mit/xorg-cf-files/dist/gnu.cf
U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/sequent.cf
U xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.rules
U xsrc/external/mit/xorg-cf-files/dist/ServerLib.tmpl
U xsrc/external/mit/xorg-cf-files/dist/DragonFly.cf
U xsrc/external/mit/xorg-cf-files/dist/apollo.cf
U xsrc/external/mit/xorg-cf-files/dist/xf86.rules
U xsrc/external/mit/xorg-cf-files/dist/ultrix.cf
U 

CVS commit: src/external/mit/xorg/bin/xeyes

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 22:14:31 UTC 2021

Modified Files:
src/external/mit/xorg/bin/xeyes: Makefile

Log Message:
updates for xeyes 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xeyes/Makefile

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

Modified files:

Index: src/external/mit/xorg/bin/xeyes/Makefile
diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.3 src/external/mit/xorg/bin/xeyes/Makefile:1.4
--- src/external/mit/xorg/bin/xeyes/Makefile:1.3	Thu Oct  1 21:22:47 2020
+++ src/external/mit/xorg/bin/xeyes/Makefile	Mon Aug 23 22:14:31 2021
@@ -1,14 +1,16 @@
-#	$NetBSD: Makefile,v 1.3 2020/10/01 21:22:47 nia Exp $
+#	$NetBSD: Makefile,v 1.4 2021/08/23 22:14:31 mrg Exp $
 
 .include 
 
-CPPFLAGS+=-DXRENDER
+CPPFLAGS+=-DXRENDER -DPRESENT
 
 PROG=	xeyes
 SRCS=	xeyes.c Eyes.c transform.c
 
-LDADD+=	-lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 -lm
-DPADD+=	${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
+LDADD+=	-lXi -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 -lm \
+	-lxcb-xfixes -lxcb-damage -lxcb-present -lX11-xcb
+DPADD+=	${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM} \
+	${LIBXCB_XFIXES} ${LIBXCB_DAMAGE} ${LIBXCB_PRESENT} ${LIBX11_XCB} 
 
 .PATH:	${X11SRCDIR.${PROG}}
 .PATH:	${X11SRCDIR.${PROG}}/man



CVS commit: src/external/mit/xorg/bin/xeyes

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 22:14:31 UTC 2021

Modified Files:
src/external/mit/xorg/bin/xeyes: Makefile

Log Message:
updates for xeyes 1.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xeyes/Makefile

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



CVS commit: src/share/mk

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 22:13:27 UTC 2021

Modified Files:
src/share/mk: bsd.prog.mk

Log Message:
define variables for the libxcb-* libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.prog.mk

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

Modified files:

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.338 src/share/mk/bsd.prog.mk:1.339
--- src/share/mk/bsd.prog.mk:1.338	Sun Aug 15 10:30:39 2021
+++ src/share/mk/bsd.prog.mk	Mon Aug 23 22:13:27 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.338 2021/08/15 10:30:39 christos Exp $
+#	$NetBSD: bsd.prog.mk,v 1.339 2021/08/23 22:13:27 mrg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -264,6 +264,14 @@ _X11LIBLIST= dps fntstubs fontcache font
 ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
 Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
 Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
+_XCBLIBLIST= \
+atom aux composite damage dpms dri2 dri3 event glx icccm image keysyms \
+present property randr record render_util render reply res screensaver \
+shape shm sync xf86dri xfixes xinerama xinput xkb xtest xv xvmc
+
+# Ugly one-offs
+LIBX11_XCB=	${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
+LIBXCB=	${DESTDIR}${X11USRLIBDIR}/libxcb.a
 
 .for _lib in ${_X11LIBLIST}
 .ifndef LIB${_lib:tu}
@@ -272,9 +280,13 @@ LIB${_lib:tu}=	${DESTDIR}${X11USRLIBDIR}
 .endif
 .endfor
 
-# Ugly one-offs
-LIBX11_XCB=	${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
-LIBXCB=	${DESTDIR}${X11USRLIBDIR}/libxcb.a
+# These ones have "_" in the variable name and "-" in the path.
+.for _lib in ${_XCBLIBLIST}
+.ifndef LIBXCB_${_lib:tu}
+LIBXCB_${_lib:tu}=	${DESTDIR}${X11USRLIBDIR}/libxcb-${_lib}.a
+.MADE:		${LIBXCB_${_lib:tu}}	# Note: ${DESTDIR} will be expanded
+.endif
+.endfor
 
 .if defined(RESCUEDIR)
 CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"



CVS commit: src/share/mk

2021-08-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 23 22:13:27 UTC 2021

Modified Files:
src/share/mk: bsd.prog.mk

Log Message:
define variables for the libxcb-* libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.prog.mk

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



CVS commit: xsrc/external/mit

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:28:59 UTC 2021

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

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


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

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

Modified files:

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

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

CVS commit: xsrc/external/mit

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:28:59 UTC 2021

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

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


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

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



CVS import: xsrc/external/mit/xwd/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:27:58 UTC 2021

Update of /cvsroot/xsrc/external/mit/xwd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8280

Log Message:
initial import of xwd-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   xwd-1-0-8

U xsrc/external/mit/xwd/dist/multiVis.h
U xsrc/external/mit/xwd/dist/dsimple.c
U xsrc/external/mit/xwd/dist/INSTALL
U xsrc/external/mit/xwd/dist/list.h
U xsrc/external/mit/xwd/dist/Makefile.in
U xsrc/external/mit/xwd/dist/aclocal.m4
U xsrc/external/mit/xwd/dist/wsutils.h
U xsrc/external/mit/xwd/dist/install-sh
U xsrc/external/mit/xwd/dist/configure.ac
U xsrc/external/mit/xwd/dist/Makefile.am
U xsrc/external/mit/xwd/dist/clientwin.c
U xsrc/external/mit/xwd/dist/config.h.in
U xsrc/external/mit/xwd/dist/dsimple.h
U xsrc/external/mit/xwd/dist/xwd.c
U xsrc/external/mit/xwd/dist/COPYING
U xsrc/external/mit/xwd/dist/list.c
U xsrc/external/mit/xwd/dist/compile
U xsrc/external/mit/xwd/dist/config.guess
U xsrc/external/mit/xwd/dist/multiVis.c
N xsrc/external/mit/xwd/dist/README.md
U xsrc/external/mit/xwd/dist/clientwin.h
U xsrc/external/mit/xwd/dist/configure
U xsrc/external/mit/xwd/dist/config.sub
U xsrc/external/mit/xwd/dist/depcomp
U xsrc/external/mit/xwd/dist/ChangeLog
U xsrc/external/mit/xwd/dist/missing
U xsrc/external/mit/xwd/dist/man/xwd.man
U xsrc/external/mit/xwd/dist/man/Makefile.am
U xsrc/external/mit/xwd/dist/man/Makefile.in

No conflicts created by this import



CVS import: xsrc/external/mit/xrdb/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:27:57 UTC 2021

Update of /cvsroot/xsrc/external/mit/xrdb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24979

Log Message:
initial import of xrdb-1.2.1

Status:

Vendor Tag: xorg
Release Tags:   xrdb-1-2-1

U xsrc/external/mit/xrdb/dist/INSTALL
U xsrc/external/mit/xrdb/dist/ChangeLog
U xsrc/external/mit/xrdb/dist/configure.ac
U xsrc/external/mit/xrdb/dist/config.sub
C xsrc/external/mit/xrdb/dist/xrdb.c
U xsrc/external/mit/xrdb/dist/config.h.in
U xsrc/external/mit/xrdb/dist/README.md
U xsrc/external/mit/xrdb/dist/configure
U xsrc/external/mit/xrdb/dist/compile
U xsrc/external/mit/xrdb/dist/AUTHORS
U xsrc/external/mit/xrdb/dist/Makefile.am
U xsrc/external/mit/xrdb/dist/config.guess
U xsrc/external/mit/xrdb/dist/COPYING
U xsrc/external/mit/xrdb/dist/depcomp
U xsrc/external/mit/xrdb/dist/missing
U xsrc/external/mit/xrdb/dist/Makefile.in
U xsrc/external/mit/xrdb/dist/aclocal.m4
U xsrc/external/mit/xrdb/dist/install-sh
U xsrc/external/mit/xrdb/dist/man/Makefile.in
U xsrc/external/mit/xrdb/dist/man/Makefile.am
U xsrc/external/mit/xrdb/dist/man/xrdb.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrdb/dist



CVS import: xsrc/external/mit/xwd/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:27:58 UTC 2021

Update of /cvsroot/xsrc/external/mit/xwd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8280

Log Message:
initial import of xwd-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   xwd-1-0-8

U xsrc/external/mit/xwd/dist/multiVis.h
U xsrc/external/mit/xwd/dist/dsimple.c
U xsrc/external/mit/xwd/dist/INSTALL
U xsrc/external/mit/xwd/dist/list.h
U xsrc/external/mit/xwd/dist/Makefile.in
U xsrc/external/mit/xwd/dist/aclocal.m4
U xsrc/external/mit/xwd/dist/wsutils.h
U xsrc/external/mit/xwd/dist/install-sh
U xsrc/external/mit/xwd/dist/configure.ac
U xsrc/external/mit/xwd/dist/Makefile.am
U xsrc/external/mit/xwd/dist/clientwin.c
U xsrc/external/mit/xwd/dist/config.h.in
U xsrc/external/mit/xwd/dist/dsimple.h
U xsrc/external/mit/xwd/dist/xwd.c
U xsrc/external/mit/xwd/dist/COPYING
U xsrc/external/mit/xwd/dist/list.c
U xsrc/external/mit/xwd/dist/compile
U xsrc/external/mit/xwd/dist/config.guess
U xsrc/external/mit/xwd/dist/multiVis.c
N xsrc/external/mit/xwd/dist/README.md
U xsrc/external/mit/xwd/dist/clientwin.h
U xsrc/external/mit/xwd/dist/configure
U xsrc/external/mit/xwd/dist/config.sub
U xsrc/external/mit/xwd/dist/depcomp
U xsrc/external/mit/xwd/dist/ChangeLog
U xsrc/external/mit/xwd/dist/missing
U xsrc/external/mit/xwd/dist/man/xwd.man
U xsrc/external/mit/xwd/dist/man/Makefile.am
U xsrc/external/mit/xwd/dist/man/Makefile.in

No conflicts created by this import



CVS import: xsrc/external/mit/xrdb/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:27:57 UTC 2021

Update of /cvsroot/xsrc/external/mit/xrdb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24979

Log Message:
initial import of xrdb-1.2.1

Status:

Vendor Tag: xorg
Release Tags:   xrdb-1-2-1

U xsrc/external/mit/xrdb/dist/INSTALL
U xsrc/external/mit/xrdb/dist/ChangeLog
U xsrc/external/mit/xrdb/dist/configure.ac
U xsrc/external/mit/xrdb/dist/config.sub
C xsrc/external/mit/xrdb/dist/xrdb.c
U xsrc/external/mit/xrdb/dist/config.h.in
U xsrc/external/mit/xrdb/dist/README.md
U xsrc/external/mit/xrdb/dist/configure
U xsrc/external/mit/xrdb/dist/compile
U xsrc/external/mit/xrdb/dist/AUTHORS
U xsrc/external/mit/xrdb/dist/Makefile.am
U xsrc/external/mit/xrdb/dist/config.guess
U xsrc/external/mit/xrdb/dist/COPYING
U xsrc/external/mit/xrdb/dist/depcomp
U xsrc/external/mit/xrdb/dist/missing
U xsrc/external/mit/xrdb/dist/Makefile.in
U xsrc/external/mit/xrdb/dist/aclocal.m4
U xsrc/external/mit/xrdb/dist/install-sh
U xsrc/external/mit/xrdb/dist/man/Makefile.in
U xsrc/external/mit/xrdb/dist/man/Makefile.am
U xsrc/external/mit/xrdb/dist/man/xrdb.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrdb/dist



CVS import: xsrc/external/mit/xeyes/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:27:55 UTC 2021

Update of /cvsroot/xsrc/external/mit/xeyes/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8928

Log Message:
initial import of xeyes-1.2.0

Status:

Vendor Tag: xorg
Release Tags:   xeyes-1-2-0

U xsrc/external/mit/xeyes/dist/transform.h
U xsrc/external/mit/xeyes/dist/Makefile.in
U xsrc/external/mit/xeyes/dist/INSTALL
U xsrc/external/mit/xeyes/dist/configure
N xsrc/external/mit/xeyes/dist/README.md
U xsrc/external/mit/xeyes/dist/xeyes.c
U xsrc/external/mit/xeyes/dist/Eyes.h
U xsrc/external/mit/xeyes/dist/config.sub
U xsrc/external/mit/xeyes/dist/Makefile.am
U xsrc/external/mit/xeyes/dist/config.guess
U xsrc/external/mit/xeyes/dist/ChangeLog
U xsrc/external/mit/xeyes/dist/eyesmask.bit
U xsrc/external/mit/xeyes/dist/depcomp
U xsrc/external/mit/xeyes/dist/config.h.in
U xsrc/external/mit/xeyes/dist/missing
U xsrc/external/mit/xeyes/dist/configure.ac
U xsrc/external/mit/xeyes/dist/transform.c
U xsrc/external/mit/xeyes/dist/aclocal.m4
C xsrc/external/mit/xeyes/dist/compile
U xsrc/external/mit/xeyes/dist/Eyes.c
U xsrc/external/mit/xeyes/dist/eyes.bit
U xsrc/external/mit/xeyes/dist/install-sh
U xsrc/external/mit/xeyes/dist/COPYING
U xsrc/external/mit/xeyes/dist/EyesP.h
U xsrc/external/mit/xeyes/dist/man/xeyes.man
U xsrc/external/mit/xeyes/dist/man/Makefile.am
U xsrc/external/mit/xeyes/dist/man/Makefile.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xeyes/dist



CVS import: xsrc/external/mit/xeyes/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:27:55 UTC 2021

Update of /cvsroot/xsrc/external/mit/xeyes/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8928

Log Message:
initial import of xeyes-1.2.0

Status:

Vendor Tag: xorg
Release Tags:   xeyes-1-2-0

U xsrc/external/mit/xeyes/dist/transform.h
U xsrc/external/mit/xeyes/dist/Makefile.in
U xsrc/external/mit/xeyes/dist/INSTALL
U xsrc/external/mit/xeyes/dist/configure
N xsrc/external/mit/xeyes/dist/README.md
U xsrc/external/mit/xeyes/dist/xeyes.c
U xsrc/external/mit/xeyes/dist/Eyes.h
U xsrc/external/mit/xeyes/dist/config.sub
U xsrc/external/mit/xeyes/dist/Makefile.am
U xsrc/external/mit/xeyes/dist/config.guess
U xsrc/external/mit/xeyes/dist/ChangeLog
U xsrc/external/mit/xeyes/dist/eyesmask.bit
U xsrc/external/mit/xeyes/dist/depcomp
U xsrc/external/mit/xeyes/dist/config.h.in
U xsrc/external/mit/xeyes/dist/missing
U xsrc/external/mit/xeyes/dist/configure.ac
U xsrc/external/mit/xeyes/dist/transform.c
U xsrc/external/mit/xeyes/dist/aclocal.m4
C xsrc/external/mit/xeyes/dist/compile
U xsrc/external/mit/xeyes/dist/Eyes.c
U xsrc/external/mit/xeyes/dist/eyes.bit
U xsrc/external/mit/xeyes/dist/install-sh
U xsrc/external/mit/xeyes/dist/COPYING
U xsrc/external/mit/xeyes/dist/EyesP.h
U xsrc/external/mit/xeyes/dist/man/xeyes.man
U xsrc/external/mit/xeyes/dist/man/Makefile.am
U xsrc/external/mit/xeyes/dist/man/Makefile.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xeyes/dist



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:20:37 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/dist/src: drmmode_display.h

Log Message:
merge xf86-video-amdgpu 21.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
diff -u xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.2 xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.3
--- xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.2	Mon May 31 21:44:19 2021
+++ xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h	Mon Aug 23 21:20:37 2021
@@ -96,12 +96,6 @@ enum drmmode_scanout_status {
 	DRMMODE_SCANOUT_VBLANK_FAILED = 1u << 1,
 };
 
-struct drmmode_scanout {
-	struct amdgpu_buffer *bo;
-	PixmapPtr pixmap;
-	int width, height;
-};
-
 typedef struct {
 	drmmode_ptr drmmode;
 	drmModeCrtcPtr mode_crtc;
@@ -115,8 +109,8 @@ typedef struct {
 	unsigned cursor_id;
 	struct amdgpu_buffer *cursor_buffer[2];
 
-	struct drmmode_scanout rotate;
-	struct drmmode_scanout scanout[2];
+	PixmapPtr rotate;
+	PixmapPtr scanout[2];
 	DamagePtr scanout_damage;
 	Bool ignore_damage;
 	RegionRec scanout_last_region;
@@ -202,9 +196,9 @@ drmmode_crtc_can_flip(xf86CrtcPtr crtc)
 
 	return crtc->enabled &&
 		drmmode_crtc->dpms_mode == DPMSModeOn &&
-		!drmmode_crtc->rotate.bo &&
+		!drmmode_crtc->rotate &&
 		(drmmode_crtc->tear_free ||
-		 !drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo);
+		 !drmmode_crtc->scanout[drmmode_crtc->scanout_id]);
 }
 
 
@@ -240,6 +234,17 @@ drmmode_fb_reference_loc(int drm_fd, str
 	drmmode_fb_reference_loc(fd, old, new, __func__, __LINE__)
 
 
+static inline void
+drmmode_crtc_scanout_destroy(PixmapPtr *scanout)
+{
+	if (!*scanout)
+		return;
+
+	(*scanout)->drawable.pScreen->DestroyPixmap(*scanout);
+	(*scanout) = NULL;
+}
+
+
 extern int drmmode_page_flip_target_absolute(AMDGPUEntPtr pAMDGPUEnt,
 	 drmmode_crtc_private_ptr drmmode_crtc,
 	 int fb_id, uint32_t flags,
@@ -259,12 +264,7 @@ extern Bool drmmode_set_desired_modes(Sc
 extern void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
 extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn);
 
-extern void drmmode_crtc_scanout_destroy(drmmode_ptr drmmode,
-	 struct drmmode_scanout *scanout);
 void drmmode_crtc_scanout_free(xf86CrtcPtr crtc);
-PixmapPtr drmmode_crtc_scanout_create(xf86CrtcPtr crtc,
-  struct drmmode_scanout *scanout,
-  int width, int height);
 
 extern void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode);
 extern void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode);



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:20:37 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/dist/src: drmmode_display.h

Log Message:
merge xf86-video-amdgpu 21.0.0.


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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:18:53 UTC 2021

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

Log Message:
update for libXfont2 2.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXfont2/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/libXfont2/include/config.h
diff -u xsrc/external/mit/libXfont2/include/config.h:1.2 xsrc/external/mit/libXfont2/include/config.h:1.3
--- xsrc/external/mit/libXfont2/include/config.h:1.2	Sun Feb 23 09:18:51 2020
+++ xsrc/external/mit/libXfont2/include/config.h	Mon Aug 23 21:18:52 2021
@@ -8,16 +8,22 @@
 #define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the  header file. */
-/* #undef HAVE_ENDIAN_H */
+#define HAVE_ENDIAN_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_ERR_H 1
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_INTTYPES_H 1
 
+/* Has libbsd */
+/* #undef HAVE_LIBBSD */
+
 /* Define to 1 if you have the `ws2_32' library (-lws2_32). */
 /* #undef HAVE_LIBWS2_32 */
 
-/* Define to 1 if you have the  header file. */
-#define HAVE_MEMORY_H 1
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_MINIX_CONFIG_H */
 
 /* Define to 1 if you have the `poll' function. */
 #define HAVE_POLL 1
@@ -29,7 +35,10 @@
 #define HAVE_READLINK 1
 
 /* Define to 1 if you have the `reallocarray' function. */
-/* #undef HAVE_REALLOCARRAY */
+#define HAVE_REALLOCARRAY 1
+
+/* Define to 1 if you have the `realpath' function. */
+#define HAVE_REALPATH 1
 
 /* Define to 1 if the system has the type `socklen_t'. */
 #define HAVE_SOCKLEN_T 1
@@ -37,9 +46,15 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDINT_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDIO_H 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_STRINGS_H 1
 
@@ -64,27 +79,29 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the  header file. */
+#define HAVE_WCHAR_H 1
+
 /* Support IPv6 for TCP connections */
 #define IPv6 1
 
 /* Support os-specific local connections */
 /* #undef LOCALCONN */
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Name of package */
 #define PACKAGE "libXfont2"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg;
+#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/xorg/lib/libXfont/issues;
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libXfont2"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libXfont2 2.0.4"
+#define PACKAGE_STRING "libXfont2 2.0.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libXfont2"
@@ -93,7 +110,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.4"
+#define PACKAGE_VERSION "2.0.5"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 2
@@ -102,9 +119,11 @@
 #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 to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
 /* Support TCP socket connections */
@@ -117,26 +136,92 @@
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
 #endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
-/* Enable threading extensions on Solaris.  */
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef 

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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:18:53 UTC 2021

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

Log Message:
update for libXfont2 2.0.5.


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

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



CVS import: xsrc/external/mit/xf86-video-amdgpu/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:18:40 UTC 2021

Update of /cvsroot/xsrc/external/mit/xf86-video-amdgpu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12245

Log Message:
initial import of xf86-video-amdgpu-21.0.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-amdgpu-21-0-0

U xsrc/external/mit/xf86-video-amdgpu/dist/install-sh
U xsrc/external/mit/xf86-video-amdgpu/dist/README.md
U xsrc/external/mit/xf86-video-amdgpu/dist/COPYING
U xsrc/external/mit/xf86-video-amdgpu/dist/INSTALL
U xsrc/external/mit/xf86-video-amdgpu/dist/depcomp
U xsrc/external/mit/xf86-video-amdgpu/dist/aclocal.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/ltmain.sh
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/config.guess
U xsrc/external/mit/xf86-video-amdgpu/dist/compile
U xsrc/external/mit/xf86-video-amdgpu/dist/ChangeLog
U xsrc/external/mit/xf86-video-amdgpu/dist/config.h.in
U xsrc/external/mit/xf86-video-amdgpu/dist/configure.ac
U xsrc/external/mit/xf86-video-amdgpu/dist/configure
U xsrc/external/mit/xf86-video-amdgpu/dist/config.sub
U xsrc/external/mit/xf86-video-amdgpu/dist/missing
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor_wrappers.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_present.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_version.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_misc.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/simple_list.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_sync.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri3.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.h
C xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_kms.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drv.h
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltversion.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltoptions.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/lt~obsolete.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/libtool.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltsugar.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/man/amdgpu.man
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/10-amdgpu.conf
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-amdgpu/dist



CVS import: xsrc/external/mit/xf86-video-amdgpu/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:18:40 UTC 2021

Update of /cvsroot/xsrc/external/mit/xf86-video-amdgpu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12245

Log Message:
initial import of xf86-video-amdgpu-21.0.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-amdgpu-21-0-0

U xsrc/external/mit/xf86-video-amdgpu/dist/install-sh
U xsrc/external/mit/xf86-video-amdgpu/dist/README.md
U xsrc/external/mit/xf86-video-amdgpu/dist/COPYING
U xsrc/external/mit/xf86-video-amdgpu/dist/INSTALL
U xsrc/external/mit/xf86-video-amdgpu/dist/depcomp
U xsrc/external/mit/xf86-video-amdgpu/dist/aclocal.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/ltmain.sh
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/config.guess
U xsrc/external/mit/xf86-video-amdgpu/dist/compile
U xsrc/external/mit/xf86-video-amdgpu/dist/ChangeLog
U xsrc/external/mit/xf86-video-amdgpu/dist/config.h.in
U xsrc/external/mit/xf86-video-amdgpu/dist/configure.ac
U xsrc/external/mit/xf86-video-amdgpu/dist/configure
U xsrc/external/mit/xf86-video-amdgpu/dist/config.sub
U xsrc/external/mit/xf86-video-amdgpu/dist/missing
U xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor_wrappers.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_present.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_version.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_misc.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/simple_list.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_sync.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri3.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.h
C xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_kms.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.c
U xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drv.h
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltversion.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltoptions.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/lt~obsolete.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/libtool.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/m4/ltsugar.m4
U xsrc/external/mit/xf86-video-amdgpu/dist/man/amdgpu.man
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.in
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/10-amdgpu.conf
U xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-amdgpu/dist



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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:05:09 UTC 2021

Modified Files:
xsrc/external/mit/libXft/dist/src: xftdpy.c xftglyphs.c

Log Message:
merge libXfont2 2.0.5 and libXft 2.3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXft/dist/src/xftdpy.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXft/dist/src/xftglyphs.c

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

Modified files:

Index: xsrc/external/mit/libXft/dist/src/xftdpy.c
diff -u xsrc/external/mit/libXft/dist/src/xftdpy.c:1.4 xsrc/external/mit/libXft/dist/src/xftdpy.c:1.5
--- xsrc/external/mit/libXft/dist/src/xftdpy.c:1.4	Mon Mar 18 02:33:03 2019
+++ xsrc/external/mit/libXft/dist/src/xftdpy.c	Mon Aug 23 21:05:09 2021
@@ -165,7 +165,7 @@ _XftDisplayInfoGet (Display *dpy, FcBool
 _XftDisplayInfo = info;
 
 info->glyph_memory = 0;
-info->max_glyph_memory = XftDefaultGetInteger (dpy,
+info->max_glyph_memory = (unsigned long)XftDefaultGetInteger (dpy,
 		   XFT_MAX_GLYPH_MEMORY, 0,
 		   XFT_DPY_MAX_GLYPH_MEMORY);
 if (XftDebug () & XFT_DBG_CACHE)
@@ -233,7 +233,7 @@ _XftDisplayManageMemory (Display *dpy)
 }
 while (info->glyph_memory > info->max_glyph_memory)
 {
-	glyph_memory = rand () % info->glyph_memory;
+	glyph_memory = (unsigned long)rand () % info->glyph_memory;
 	public = info->fonts;
 	while (public)
 	{
@@ -274,9 +274,9 @@ XftDefaultSet (Display *dpy, FcPattern *
 info->defaults = defaults;
 if (!info->max_glyph_memory)
 	info->max_glyph_memory = XFT_DPY_MAX_GLYPH_MEMORY;
-info->max_glyph_memory = XftDefaultGetInteger (dpy,
+info->max_glyph_memory = (unsigned long)XftDefaultGetInteger (dpy,
 		   XFT_MAX_GLYPH_MEMORY, 0,
-		   info->max_glyph_memory);
+		   (int)info->max_glyph_memory);
 if (!info->max_unref_fonts)
 	info->max_unref_fonts = XFT_DPY_MAX_UNREF_FONTS;
 info->max_unref_fonts = XftDefaultGetInteger (dpy,
@@ -292,7 +292,7 @@ XftDefaultParseBool (const char *v)
 
 c0 = *v;
 if (isupper ((int)c0))
-	c0 = tolower (c0);
+	c0 = (char)tolower (c0);
 if (c0 == 't' || c0 == 'y' || c0 == '1')
 	return 1;
 if (c0 == 'f' || c0 == 'n' || c0 == '0')
@@ -301,7 +301,7 @@ XftDefaultParseBool (const char *v)
 {
 	c1 = v[1];
 	if (isupper ((int)c1))
-	c1 = tolower (c1);
+	c1 = (char)tolower (c1);
 	if (c1 == 'n')
 	return 1;
 	if (c1 == 'f')
@@ -349,7 +349,7 @@ _XftDefaultInitInteger (Display *dpy, Fc
 {
 	if (FcNameConstant ((FcChar8 *) v, ))
 	return FcPatternAddInteger (pat, option, i);
-	i = strtol (v, , 0);
+	i = (int)strtol (v, , 0);
 	if (e != v)
 	return FcPatternAddInteger (pat, option, i);
 }

Index: xsrc/external/mit/libXft/dist/src/xftglyphs.c
diff -u xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.3 xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.4
--- xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.3	Fri Jul 11 18:32:40 2014
+++ xsrc/external/mit/libXft/dist/src/xftglyphs.c	Mon Aug 23 21:05:09 2021
@@ -86,11 +86,11 @@ _compute_xrender_bitmap_size( FT_Bitmap*
 if ( slot->format != FT_GLYPH_FORMAT_BITMAP )
 	return -1;
 
-// compute the size of the final bitmap
+/* compute the size of the final bitmap */
 ftbit = >bitmap;
 
-width = ftbit->width;
-height = ftbit->rows;
+width = (int)ftbit->width;
+height = (int)ftbit->rows;
 pitch = (width+3) & ~3;
 
 switch ( ftbit->pixel_mode )
@@ -134,8 +134,8 @@ _compute_xrender_bitmap_size( FT_Bitmap*
 	return -1;
 }
 
-target->width = width;
-target->rows = height;
+target->width = (unsigned)width;
+target->rows = (unsigned)height;
 target->pitch = pitch;
 target->buffer = NULL;
 
@@ -168,8 +168,8 @@ _fill_xrender_bitmap( FT_Bitmap*	target,
 	unsigned char*	srcLine	= ftbit->buffer;
 unsigned char*	dstLine	= target->buffer;
 int		src_pitch = ftbit->pitch;
-int		width = target->width;
-int		height = target->rows;
+int		width = (int)target->width;
+int		height = (int)target->rows;
 int		pitch = target->pitch;
 int		subpixel;
 int		h;
@@ -178,7 +178,7 @@ _fill_xrender_bitmap( FT_Bitmap*	target,
 		 mode == FT_RENDER_MODE_LCD_V );
 
 	if ( src_pitch < 0 )
-	srcLine -= src_pitch*(ftbit->rows-1);
+	srcLine -= ((unsigned)src_pitch * (ftbit->rows-1));
 
 	switch ( ftbit->pixel_mode )
 	{
@@ -214,7 +214,7 @@ _fill_xrender_bitmap( FT_Bitmap*	target,
 		int bytes = (width+7) >> 3;
 
 		for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch )
-		memcpy( dstLine, srcLine, bytes );
+		memcpy( dstLine, srcLine, (size_t)bytes );
 	}
 	break;
 
@@ -240,7 +240,7 @@ _fill_xrender_bitmap( FT_Bitmap*	target,
 	else  /* copy gray into gray */
 	{
 		for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch )
-		memcpy( dstLine, srcLine, width );
+		

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

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:05:09 UTC 2021

Modified Files:
xsrc/external/mit/libXft/dist/src: xftdpy.c xftglyphs.c

Log Message:
merge libXfont2 2.0.5 and libXft 2.3.4.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXft/dist/src/xftdpy.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXft/dist/src/xftglyphs.c

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



CVS import: xsrc/external/mit/libXft/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:04:27 UTC 2021

Update of /cvsroot/xsrc/external/mit/libXft/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24086

Log Message:
initial import of libXft-2.3.4

Status:

Vendor Tag: xorg
Release Tags:   libXft-2-3-4

U xsrc/external/mit/libXft/dist/ChangeLog
U xsrc/external/mit/libXft/dist/README.md
U xsrc/external/mit/libXft/dist/Makefile.in
U xsrc/external/mit/libXft/dist/configure
U xsrc/external/mit/libXft/dist/xft.pc.in
U xsrc/external/mit/libXft/dist/config.sub
U xsrc/external/mit/libXft/dist/Makefile.am
U xsrc/external/mit/libXft/dist/config.guess
U xsrc/external/mit/libXft/dist/INSTALL
U xsrc/external/mit/libXft/dist/configure.ac
U xsrc/external/mit/libXft/dist/config.h.in
U xsrc/external/mit/libXft/dist/ltmain.sh
U xsrc/external/mit/libXft/dist/missing
U xsrc/external/mit/libXft/dist/depcomp
U xsrc/external/mit/libXft/dist/aclocal.m4
U xsrc/external/mit/libXft/dist/COPYING
U xsrc/external/mit/libXft/dist/install-sh
U xsrc/external/mit/libXft/dist/NEWS
U xsrc/external/mit/libXft/dist/compile
U xsrc/external/mit/libXft/dist/AUTHORS
U xsrc/external/mit/libXft/dist/man/Xft.man
U xsrc/external/mit/libXft/dist/man/Makefile.in
U xsrc/external/mit/libXft/dist/man/Makefile.am
U xsrc/external/mit/libXft/dist/include/X11/Xft/XftCompat.h
U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h
U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h.in
U xsrc/external/mit/libXft/dist/src/xftcore.c
U xsrc/external/mit/libXft/dist/src/xftcolor.c
U xsrc/external/mit/libXft/dist/src/Makefile.am
U xsrc/external/mit/libXft/dist/src/xftxlfd.c
U xsrc/external/mit/libXft/dist/src/xftdraw.c
U xsrc/external/mit/libXft/dist/src/xftlist.c
U xsrc/external/mit/libXft/dist/src/xftfont.c
C xsrc/external/mit/libXft/dist/src/xftglyphs.c
U xsrc/external/mit/libXft/dist/src/xftstr.c
U xsrc/external/mit/libXft/dist/src/Makefile.in
U xsrc/external/mit/libXft/dist/src/xftint.h
U xsrc/external/mit/libXft/dist/src/xftname.c
U xsrc/external/mit/libXft/dist/src/xftfreetype.c
C xsrc/external/mit/libXft/dist/src/xftdpy.c
U xsrc/external/mit/libXft/dist/src/xftextent.c
U xsrc/external/mit/libXft/dist/src/xftrender.c
U xsrc/external/mit/libXft/dist/src/xftinit.c
U xsrc/external/mit/libXft/dist/src/xftswap.c
U xsrc/external/mit/libXft/dist/src/xftdbg.c

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXft/dist



CVS import: xsrc/external/mit/libXft/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:04:27 UTC 2021

Update of /cvsroot/xsrc/external/mit/libXft/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24086

Log Message:
initial import of libXft-2.3.4

Status:

Vendor Tag: xorg
Release Tags:   libXft-2-3-4

U xsrc/external/mit/libXft/dist/ChangeLog
U xsrc/external/mit/libXft/dist/README.md
U xsrc/external/mit/libXft/dist/Makefile.in
U xsrc/external/mit/libXft/dist/configure
U xsrc/external/mit/libXft/dist/xft.pc.in
U xsrc/external/mit/libXft/dist/config.sub
U xsrc/external/mit/libXft/dist/Makefile.am
U xsrc/external/mit/libXft/dist/config.guess
U xsrc/external/mit/libXft/dist/INSTALL
U xsrc/external/mit/libXft/dist/configure.ac
U xsrc/external/mit/libXft/dist/config.h.in
U xsrc/external/mit/libXft/dist/ltmain.sh
U xsrc/external/mit/libXft/dist/missing
U xsrc/external/mit/libXft/dist/depcomp
U xsrc/external/mit/libXft/dist/aclocal.m4
U xsrc/external/mit/libXft/dist/COPYING
U xsrc/external/mit/libXft/dist/install-sh
U xsrc/external/mit/libXft/dist/NEWS
U xsrc/external/mit/libXft/dist/compile
U xsrc/external/mit/libXft/dist/AUTHORS
U xsrc/external/mit/libXft/dist/man/Xft.man
U xsrc/external/mit/libXft/dist/man/Makefile.in
U xsrc/external/mit/libXft/dist/man/Makefile.am
U xsrc/external/mit/libXft/dist/include/X11/Xft/XftCompat.h
U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h
U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h.in
U xsrc/external/mit/libXft/dist/src/xftcore.c
U xsrc/external/mit/libXft/dist/src/xftcolor.c
U xsrc/external/mit/libXft/dist/src/Makefile.am
U xsrc/external/mit/libXft/dist/src/xftxlfd.c
U xsrc/external/mit/libXft/dist/src/xftdraw.c
U xsrc/external/mit/libXft/dist/src/xftlist.c
U xsrc/external/mit/libXft/dist/src/xftfont.c
C xsrc/external/mit/libXft/dist/src/xftglyphs.c
U xsrc/external/mit/libXft/dist/src/xftstr.c
U xsrc/external/mit/libXft/dist/src/Makefile.in
U xsrc/external/mit/libXft/dist/src/xftint.h
U xsrc/external/mit/libXft/dist/src/xftname.c
U xsrc/external/mit/libXft/dist/src/xftfreetype.c
C xsrc/external/mit/libXft/dist/src/xftdpy.c
U xsrc/external/mit/libXft/dist/src/xftextent.c
U xsrc/external/mit/libXft/dist/src/xftrender.c
U xsrc/external/mit/libXft/dist/src/xftinit.c
U xsrc/external/mit/libXft/dist/src/xftswap.c
U xsrc/external/mit/libXft/dist/src/xftdbg.c

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXft/dist



CVS import: xsrc/external/mit/libXfont2/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:04:24 UTC 2021

Update of /cvsroot/xsrc/external/mit/libXfont2/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8191

Log Message:
initial import of libXfont2-2.0.5

Status:

Vendor Tag: xorg
Release Tags:   libXfont2-2-0-5

U xsrc/external/mit/libXfont2/dist/config.guess
U xsrc/external/mit/libXfont2/dist/ltmain.sh
U xsrc/external/mit/libXfont2/dist/Makefile.am
U xsrc/external/mit/libXfont2/dist/INSTALL
U xsrc/external/mit/libXfont2/dist/config.sub
U xsrc/external/mit/libXfont2/dist/devbook.am
U xsrc/external/mit/libXfont2/dist/Makefile.in
U xsrc/external/mit/libXfont2/dist/missing
U xsrc/external/mit/libXfont2/dist/depcomp
U xsrc/external/mit/libXfont2/dist/configure
U xsrc/external/mit/libXfont2/dist/xfont2.pc.in
U xsrc/external/mit/libXfont2/dist/README.md
U xsrc/external/mit/libXfont2/dist/ChangeLog
U xsrc/external/mit/libXfont2/dist/compile
U xsrc/external/mit/libXfont2/dist/AUTHORS
U xsrc/external/mit/libXfont2/dist/config.h.in
U xsrc/external/mit/libXfont2/dist/configure.ac
U xsrc/external/mit/libXfont2/dist/install-sh
U xsrc/external/mit/libXfont2/dist/aclocal.m4
U xsrc/external/mit/libXfont2/dist/COPYING
U xsrc/external/mit/libXfont2/dist/test/utils/font-test-utils.c
U xsrc/external/mit/libXfont2/dist/test/utils/lsfontdir.c
U xsrc/external/mit/libXfont2/dist/test/utils/README
U xsrc/external/mit/libXfont2/dist/test/utils/font-test-utils.h
U xsrc/external/mit/libXfont2/dist/doc/Makefile.am
U xsrc/external/mit/libXfont2/dist/doc/fontlib.xml
U xsrc/external/mit/libXfont2/dist/doc/Makefile.in
U xsrc/external/mit/libXfont2/dist/src/fontfile/fileio.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bitsource.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/register.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontdir.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/defaults.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/catalogue.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/renderers.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/dirfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/gunzip.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/decompress.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/filewr.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontscale.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontencc.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bunzip2.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bufio.c
U xsrc/external/mit/libXfont2/dist/src/builtins/render.c
U xsrc/external/mit/libXfont2/dist/src/builtins/fonts.c
U xsrc/external/mit/libXfont2/dist/src/builtins/fpe.c
U xsrc/external/mit/libXfont2/dist/src/builtins/buildfont
U xsrc/external/mit/libXfont2/dist/src/builtins/builtin.h
U xsrc/external/mit/libXfont2/dist/src/builtins/file.c
U xsrc/external/mit/libXfont2/dist/src/builtins/dir.c
U xsrc/external/mit/libXfont2/dist/src/fc/fservestr.h
U xsrc/external/mit/libXfont2/dist/src/fc/fslibos.h
U xsrc/external/mit/libXfont2/dist/src/fc/fsconvert.c
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.c
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.h
U xsrc/external/mit/libXfont2/dist/src/fc/fstrans.c
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.c
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.h
U xsrc/external/mit/libXfont2/dist/src/util/miscutil.c
U xsrc/external/mit/libXfont2/dist/src/util/format.c
U xsrc/external/mit/libXfont2/dist/src/util/replace.h
U xsrc/external/mit/libXfont2/dist/src/util/reallocarray.c
U xsrc/external/mit/libXfont2/dist/src/util/fontnames.c
U xsrc/external/mit/libXfont2/dist/src/util/utilbitmap.c
U xsrc/external/mit/libXfont2/dist/src/util/strlcpy.c
U xsrc/external/mit/libXfont2/dist/src/util/strlcat.c
U xsrc/external/mit/libXfont2/dist/src/util/fontxlfd.c
U xsrc/external/mit/libXfont2/dist/src/util/fontutil.c
U xsrc/external/mit/libXfont2/dist/src/util/private.c
N xsrc/external/mit/libXfont2/dist/src/util/realpath.c
U xsrc/external/mit/libXfont2/dist/src/util/patcache.c
U xsrc/external/mit/libXfont2/dist/src/util/fontaccel.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfstr.h
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfwrite.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmap.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfutils.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/fontink.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmapfunc.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitscale.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmaputil.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfread.c
U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/fttools.c
U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.c
U 

CVS import: xsrc/external/mit/libXfont2/dist

2021-08-23 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 23 21:04:24 UTC 2021

Update of /cvsroot/xsrc/external/mit/libXfont2/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8191

Log Message:
initial import of libXfont2-2.0.5

Status:

Vendor Tag: xorg
Release Tags:   libXfont2-2-0-5

U xsrc/external/mit/libXfont2/dist/config.guess
U xsrc/external/mit/libXfont2/dist/ltmain.sh
U xsrc/external/mit/libXfont2/dist/Makefile.am
U xsrc/external/mit/libXfont2/dist/INSTALL
U xsrc/external/mit/libXfont2/dist/config.sub
U xsrc/external/mit/libXfont2/dist/devbook.am
U xsrc/external/mit/libXfont2/dist/Makefile.in
U xsrc/external/mit/libXfont2/dist/missing
U xsrc/external/mit/libXfont2/dist/depcomp
U xsrc/external/mit/libXfont2/dist/configure
U xsrc/external/mit/libXfont2/dist/xfont2.pc.in
U xsrc/external/mit/libXfont2/dist/README.md
U xsrc/external/mit/libXfont2/dist/ChangeLog
U xsrc/external/mit/libXfont2/dist/compile
U xsrc/external/mit/libXfont2/dist/AUTHORS
U xsrc/external/mit/libXfont2/dist/config.h.in
U xsrc/external/mit/libXfont2/dist/configure.ac
U xsrc/external/mit/libXfont2/dist/install-sh
U xsrc/external/mit/libXfont2/dist/aclocal.m4
U xsrc/external/mit/libXfont2/dist/COPYING
U xsrc/external/mit/libXfont2/dist/test/utils/font-test-utils.c
U xsrc/external/mit/libXfont2/dist/test/utils/lsfontdir.c
U xsrc/external/mit/libXfont2/dist/test/utils/README
U xsrc/external/mit/libXfont2/dist/test/utils/font-test-utils.h
U xsrc/external/mit/libXfont2/dist/doc/Makefile.am
U xsrc/external/mit/libXfont2/dist/doc/fontlib.xml
U xsrc/external/mit/libXfont2/dist/doc/Makefile.in
U xsrc/external/mit/libXfont2/dist/src/fontfile/fileio.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bitsource.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/register.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontdir.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/defaults.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/catalogue.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/renderers.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/dirfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/gunzip.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/decompress.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/filewr.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontscale.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontencc.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bunzip2.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bufio.c
U xsrc/external/mit/libXfont2/dist/src/builtins/render.c
U xsrc/external/mit/libXfont2/dist/src/builtins/fonts.c
U xsrc/external/mit/libXfont2/dist/src/builtins/fpe.c
U xsrc/external/mit/libXfont2/dist/src/builtins/buildfont
U xsrc/external/mit/libXfont2/dist/src/builtins/builtin.h
U xsrc/external/mit/libXfont2/dist/src/builtins/file.c
U xsrc/external/mit/libXfont2/dist/src/builtins/dir.c
U xsrc/external/mit/libXfont2/dist/src/fc/fservestr.h
U xsrc/external/mit/libXfont2/dist/src/fc/fslibos.h
U xsrc/external/mit/libXfont2/dist/src/fc/fsconvert.c
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.c
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.h
U xsrc/external/mit/libXfont2/dist/src/fc/fstrans.c
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.c
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.h
U xsrc/external/mit/libXfont2/dist/src/util/miscutil.c
U xsrc/external/mit/libXfont2/dist/src/util/format.c
U xsrc/external/mit/libXfont2/dist/src/util/replace.h
U xsrc/external/mit/libXfont2/dist/src/util/reallocarray.c
U xsrc/external/mit/libXfont2/dist/src/util/fontnames.c
U xsrc/external/mit/libXfont2/dist/src/util/utilbitmap.c
U xsrc/external/mit/libXfont2/dist/src/util/strlcpy.c
U xsrc/external/mit/libXfont2/dist/src/util/strlcat.c
U xsrc/external/mit/libXfont2/dist/src/util/fontxlfd.c
U xsrc/external/mit/libXfont2/dist/src/util/fontutil.c
U xsrc/external/mit/libXfont2/dist/src/util/private.c
N xsrc/external/mit/libXfont2/dist/src/util/realpath.c
U xsrc/external/mit/libXfont2/dist/src/util/patcache.c
U xsrc/external/mit/libXfont2/dist/src/util/fontaccel.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfstr.h
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfwrite.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmap.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfutils.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/fontink.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmapfunc.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitscale.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmaputil.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfread.c
U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/fttools.c
U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.c
U 

re: CVS commit: src/external/mit/xorg/server/xorg-server/hw

2021-08-21 Thread matthew green
> XXX: I wonder if each Xorg server extension can be enabled/disabled
>  per ${MACHINE} basis rather than in MI include/dix-config.h header.

i had a look at this, and we could do it but it might require
generating a patched eg, xorg-config.h and maybe others, some
that are installed, some that are not installed.

not against the idea, just wasn't inspired for it yet :)

thanks for fixing the build.


.mrg.


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

2021-08-19 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Aug 19 11:03:05 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile
src/external/mit/xorg/server/xorg-server/dri3: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile

Log Message:
fix dri3 extension building and build it.

needed for amdgpu.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/dri3/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile

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



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

2021-08-19 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Aug 19 11:03:05 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile
src/external/mit/xorg/server/xorg-server/dri3: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile

Log Message:
fix dri3 extension building and build it.

needed for amdgpu.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/dri3/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.29 src/external/mit/xorg/server/xorg-server/Makefile:1.30
--- src/external/mit/xorg/server/xorg-server/Makefile:1.29	Tue Aug 29 18:19:49 2017
+++ src/external/mit/xorg/server/xorg-server/Makefile	Thu Aug 19 11:03:04 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2017/08/29 18:19:49 ryoon Exp $
+#	$NetBSD: Makefile,v 1.30 2021/08/19 11:03:04 mrg Exp $
 
 .include 
 
@@ -9,12 +9,7 @@ SUBDIR+=	glx
 SUBDIR+=	dix fb mi Xext miext os randr render 
 SUBDIR+=	present pseudoramiX
 SUBDIR+=	Xi xkb xkbstubs dbe record xfixes
-SUBDIR+=	damageext composite config .WAIT
-
-# XXX
-.if ${HAVE_DRI3:Uno} != "no"
-SUBDIR+=	dri3
-.endif
+SUBDIR+=	damageext composite config dri3 .WAIT
 
 .if ${HAVE_XORG_GLAMOR} != "no"
 SUBDIR+=	glamor

Index: src/external/mit/xorg/server/xorg-server/dri3/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.2 src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/dri3/Makefile:1.2	Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/dri3/Makefile	Thu Aug 19 11:03:04 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2021/08/19 11:03:04 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -12,7 +12,9 @@ SRCS=   dri3.c \
 
 CPPFLAGS+=  -I${DESTDIR}${X11INCDIR}/xorg \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${X11SRCDIR.xorg-server}/../include
+		-I${DESTDIR}${X11INCDIR}/libdrm \
+		-I${X11SRCDIR.xorg-server}/../include \
+		-I${X11SRCDIR.xorg-server}/Xext
 CPPFLAGS+=  ${X11FLAGS.DIX}
 
 .include 

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.20 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.21
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.20	Sun Sep 13 23:01:02 2020
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Thu Aug 19 11:03:04 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2020/09/13 23:01:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.21 2021/08/19 11:03:04 mrg Exp $
 
 .include 
 
@@ -65,6 +65,7 @@ LDADD+=	${LDADD.dix} \
 	${LDADD.os} \
 	${LDADD.glx} \
 	${LDADD.present} \
+	${LDADD.dri3} \
 	-lXfont2 \
 	-lfreetype \
 	-lXau \
@@ -97,6 +98,7 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.os} \
 	${DPADD.glx} \
 	${DPADD.present} \
+	${DPADD.dri3} \
 	${LIBXFONT2} \
 	${LIBFREETYPE} \
 	${LIBXAU} \

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.20
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19	Wed Aug 11 23:02:39 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Thu Aug 19 11:03:04 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
+#	$NetBSD: Makefile,v 1.20 2021/08/19 11:03:04 mrg Exp $
 
 .include 
 
@@ -63,10 +63,7 @@ LDADD+=	${LDADD.glx}
 LDADD+=	${LDADD.present}
 LDADD+=	${LDADD.hw/xfree86/dri}
 LDADD+=	${LDADD.hw/xfree86/dri2}
-# XXX
-.if ${HAVE_DRI3:Uno} != "no"
 LDADD+=	${LDADD.dri3}
-.endif
 LDADD+=	${LDADD.hw/xfree86/dixmods/fb}
 LDADD+=	-lpixman-1 -lXfont2 -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=	-lpciaccess -ldrm
@@ -117,6 +114,7 @@ DPADD+=	\
 	${DPADD.present} \
 	${DPADD.hw/xfree86/dri} \
 	${DPADD.hw/xfree86/dri2} \
+	${DPADD.dri3} \
 	${DPADD.hw/xfree86/dixmods/fb} \
 	${DPADD.hw/xfree86/fb} \
 	${DPADD.hw/xfree86/common} \
@@ -139,11 +137,6 @@ DPADD+= \
 	${LIBEPOXY}
 .endif
 
-# XXX
-.if ${HAVE_DRI3:Uno} != "no"
-DPADD+=	${DPADD.dri3}
-.endif
-
 LDADD+=	-lcrypto
 DPADD+=	${LIBCRYPTO}
 

Index: 

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

2021-08-19 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Thu Aug 19 11:02:35 UTC 2021

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

Log Message:
don't disable DRI3 here.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 xsrc/external/mit/xorg-server/include/dix-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/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.42 xsrc/external/mit/xorg-server/include/dix-config.h:1.43
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.42	Sun Jul 11 00:13:27 2021
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Thu Aug 19 11:02:35 2021
@@ -40,10 +40,8 @@
 /* Build DPMS extension */
 #define DPMSExtension 1
 
-#if 0 /* notyet */
 /* Build DRI3 extension */
 #define DRI3 1
-#endif
 
 /* Build GLX extension */
 #define GLXEXT 1



  1   2   3   4   5   6   7   8   9   10   >