CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Tue Nov  7 14:34:36 UTC 2023

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Tue Nov  7 14:34:36 UTC 2023

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.22 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.23
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.22	Wed Dec 15 15:27:30 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Tue Nov  7 14:34:35 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2021/12/15 15:27:30 christos Exp $
+#	$NetBSD: Makefile,v 1.23 2023/11/07 14:34:35 tsutsui Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -16,7 +16,9 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 .if ${MACHINE_ARCH} == "powerpc" || \
 ${MACHINE} == "amiga" || \
 ${MACHINE} == "evbarm" || \
+${MACHINE} == "ews4800mips" || \
 ${MACHINE} == "mac68k" || \
+${MACHINE} == "newsmips" || \
 ${MACHINE} == "pmax" || \
 ${MACHINE} == "sgimips" || \
 ${MACHINE} == "shark" || \
@@ -30,6 +32,14 @@ CPPFLAGS+=	-DWSCONS_SUPPORT
 CPPFLAGS+=	-DXKB
 CPPFLAGS.kbd.c=	-D__XKBDEFRULES__=${__XKBDEFRULES__}
 
+.if \
+${MACHINE} == "ews4800mips"	|| \
+${MACHINE} == "newsmips"	|| \
+0
+CPPFLAGS+=	-DUSE_WSKBD_GETMAP
+SRCS+=		ws_KbdMap.c
+.endif
+
 X11EXTRAMANDEFS+=	-e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
 
 COPTS.kbd.c=		-Wno-error	# XXX deprecated

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Feb 27 00:34:11 UTC 2023

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
obsolete several xorg-server.old configurations and normalise some comments.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.108 src/external/mit/xorg/server/drivers/Makefile:1.109
--- src/external/mit/xorg/server/drivers/Makefile:1.108	Fri Jul 15 19:12:39 2022
+++ src/external/mit/xorg/server/drivers/Makefile	Mon Feb 27 00:34:11 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.108 2022/07/15 19:12:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.109 2023/02/27 00:34:11 mrg Exp $
 
 .include 
 
@@ -115,19 +115,17 @@ SUBDIR+= \
 	xf86-video-wsfb
 .endif	# ${MACHINE} == "amiga"
 
-# needs porting for xorg-server 21.1.3
-#	xf86-video-s3
 .if ${MACHINE} == "bebox"
 SUBDIR+= \
 	xf86-video-cirrus \
 	xf86-video-mga \
 	xf86-video-s3virge
-.endif	# ${MACHINE} == "bebox"
 
 # needs porting for xorg-server 21.1.3
 #	xf86-video-s3
-#	xf86-video-tga
-#	xf86-video-trident
+
+.endif	# ${MACHINE} == "bebox"
+
 .if ${MACHINE} == "cats"
 SUBDIR+= \
 	xf86-video-ast \
@@ -147,12 +145,17 @@ SUBDIR+= \
 	xf86-video-tseng \
 	xf86-video-vesa \
 	xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+#	xf86-video-s3
+#	xf86-video-tga
+#	xf86-video-trident
+
 # needs porting for xorg-server 1.18
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-	xf86-video-apm \
-	xf86-video-ark \
-	xf86-video-glint
-.endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+#	xf86-video-apm \
+#	xf86-video-ark \
+#	xf86-video-glint
+
 .endif	# ${MACHINE} == "cats"
 
 .if ${MACHINE} == "dreamcast"
@@ -227,8 +230,6 @@ SUBDIR+= \
 	xf86-video-wsfb
 .endif	# ${MACHINE} == "mac68k"
 
-# needs porting for xorg-server 21.1.3
-#	xf86-video-glint
 .if ${MACHINE} == "macppc"
 SUBDIR+= \
 	xf86-video-ati \
@@ -240,7 +241,11 @@ SUBDIR+= \
 	xf86-video-r128 \
 	xf86-video-tdfx \
 	xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+#	xf86-video-glint
 #	xf86-video-imstt
+
 .endif	# ${MACHINE} == "macppc"
 
 .if ${MACHINE} == "netwinder"
@@ -267,12 +272,14 @@ SUBDIR+= \
 	xf86-video-wsfb
 .endif	# ${MACHINE} == "ofppc"
 
-# needs porting for xorg-server 21.1.3
-#	xf86-video-s3
 .if ${MACHINE} == "prep"
 SUBDIR+= \
 	xf86-video-cirrus \
 	xf86-video-mga
+
+# needs porting for xorg-server 21.1.3
+#	xf86-video-s3
+
 .endif	# ${MACHINE} == "prep"
 
 .if ${MACHINE} == "sgimips"
@@ -296,8 +303,6 @@ SUBDIR+= \
 xf86-video-wsfb
 .endif	# ${MACHINE} == "shark"
 
-# needs porting for xorg-server 21.1.3
-#	xf86-video-glint
 .if ${MACHINE} == "sparc" || \
 ${MACHINE} == "sparc64"
 SUBDIR+= \
@@ -309,13 +314,11 @@ SUBDIR+= \
 	xf86-video-suncg6 \
 	xf86-video-sunffb \
 	xf86-video-wsfb
-#	xf86-video-ag10e \
 
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-	xf86-video-ag10e \
-	xf86-video-sunleo
-.endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+# needs porting for xorg-server 21.1.3
+#	xf86-video-glint
+#	xf86-video-ag10e \
+#	xf86-video-sunleo
 
 .if ${MACHINE} == "sparc"
 SUBDIR+= \
@@ -323,11 +326,11 @@ SUBDIR+= \
 	xf86-video-suncg14 \
 	xf86-video-suntcx
 
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-	xf86-video-pnozz
-.endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+# needs porting for xorg-server 21.1.3
+#	xf86-video-pnozz
+
 .endif	# ${MACHINE} == "sparc"
+
 .endif	# ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 
 .if ${MACHINE} == "pmax" || \

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Feb 27 00:34:11 UTC 2023

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
obsolete several xorg-server.old configurations and normalise some comments.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/external/mit/xorg/server/drivers/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/drivers/xf86-video-trident

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Feb 26 20:19:05 UTC 2023

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile

Log Message:
updates for xf86-video-trident 1.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-trident/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/drivers/xf86-video-trident/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.8	Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile	Sun Feb 26 20:19:05 2023
@@ -1,17 +1,18 @@
-#	$NetBSD: Makefile,v 1.8 2016/08/16 06:24:03 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2023/02/26 20:19:05 mrg Exp $
 
 DRIVER=		xf86-video-trident
 DRIVER_NAME=	trident_drv
 
-SRCS=		blade_accel.c blade_accel_exa.c image_accel.c
-SRCS+=		trident_accel.c trident_bank.c trident_dac.c
-SRCS+=		trident_dga.c trident_driver.c tridenthelper.c
-SRCS+=		trident_i2c.c trident_shadow.c
-SRCS+=		trident_tv.c trident_video.c tvga_dac.c xp_accel.c
-SRCS+=		xp4_accel.c xp4_accel_exa.c
+SRCS=		blade_exa.c blade_xaa.c image_xaa.c
+SRCS+=		tgui_xaa.c trident_bank.c trident_dac.c
+SRCS+=		trident_dga.c trident_driver.c
+SRCS+=		trident_i2c.c trident_pll.c trident_shadow.c
+SRCS+=		trident_tv.c trident_video.c tvga_dac.c
+SRCS+=		xp_xaa.c xp4_exa.c xp4_xaa.c
+
 MAN=		trident.4
 
-COPTS.trident_driver.c=	-Wno-error	# XXX xf86dgastr.h
+#COPTS.trident_driver.c=	-Wno-error	# XXX xf86dgastr.h
 
 CWARNFLAGS.clang+=	-Wno-return-type -Wno-empty-body
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-trident

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Feb 26 20:19:05 UTC 2023

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile

Log Message:
updates for xf86-video-trident 1.4.0.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-trident/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/drivers/xf86-video-wsfb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat Aug 20 01:02:44 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-wsfb: Makefile

Log Message:
wsfb: Disable broken DGA support:
 - dga(1) crashes X server since pScrn->AdjustFrame is NULL.
 - If nop is provided as pScrn->AdjustFrame, dga(1) crashes X server *AND*
   kernel. This is because DGA uses physical address of framebuffer via
   /dev/mem (oops!), but we provide only mmap(2)'ed virtual address.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/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/drivers/xf86-video-wsfb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5	Fri Aug  3 02:26:00 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile	Sat Aug 20 01:02:44 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2018/08/03 02:26:00 kamil Exp $
+#	$NetBSD: Makefile,v 1.6 2022/08/20 01:02:44 rin Exp $
 
 DRIVER=		xf86-video-wsfb
 DRIVER_NAME=	wsfb_drv
@@ -11,3 +11,11 @@ CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR
 CWARNFLAGS.clang+=	-Wno-format
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+# DGA support for this driver is broken:
+# - dga(1) crashes X server since pScrn->AdjustFrame is NULL.
+# - If nop is provided as pScrn->AdjustFrame, dga(1) crashes X server *AND*
+#   kernel. This is because DGA uses physical address of framebuffer via
+#   /dev/mem (oops!), but we provide only mmap(2)'ed virtual address.
+CPPFLAGS+=	-UXFreeXDGA

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-wsfb

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat Aug 20 01:02:44 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-wsfb: Makefile

Log Message:
wsfb: Disable broken DGA support:
 - dga(1) crashes X server since pScrn->AdjustFrame is NULL.
 - If nop is provided as pScrn->AdjustFrame, dga(1) crashes X server *AND*
   kernel. This is because DGA uses physical address of framebuffer via
   /dev/mem (oops!), but we provide only mmap(2)'ed virtual address.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 04:53:05 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
adjust the list of drivers per platform / xorg-server version for 21.1.3.

while here, remove x86 support for xorg-server 1.10.  the set lists were
out of date for ages, and have also been cleaned up.

the tga, trident, and s3 drivers are disabled for xorg-server 21.1.3, on
top of the various previously disabled for newer server drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.106 src/external/mit/xorg/server/drivers/Makefile:1.107
--- src/external/mit/xorg/server/drivers/Makefile:1.106	Fri Jul 15 04:18:54 2022
+++ src/external/mit/xorg/server/drivers/Makefile	Fri Jul 15 04:53:05 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.106 2022/07/15 04:18:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.107 2022/07/15 04:53:05 mrg Exp $
 
 .include 
 
@@ -26,6 +26,7 @@ SUBDIR+= \
 .if ${MACHINE_ARCH} == "i386" || \
 ${MACHINE_ARCH} == "x86_64"
 SUBDIR+= \
+	xf86-video-amdgpu \
 	xf86-video-ast \
 	xf86-video-ati \
 	xf86-video-chips \
@@ -63,19 +64,11 @@ SUBDIR+= \
 #	xf86-video-trident
 
 # needs porting for xorg-server 1.18
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-	xf86-video-apm \
-	xf86-video-ark \
-	xf86-video-glint \
-	xf86-video-intel-old \
-	xf86-video-xgi
-.endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-
-.if ${XORG_SERVER_SUBDIR} == "xorg-server"
-SUBDIR+= \
-	xf86-video-amdgpu
-.endif  # ${XORG_SERVER_SUBDIR} == "xorg-server"
+#	xf86-video-apm \
+#	xf86-video-ark \
+#	xf86-video-glint \
+#	xf86-video-intel-old \
+#	xf86-video-xgi
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+= \
@@ -108,7 +101,7 @@ SUBDIR+= \
 	xf86-video-tseng \
 	xf86-video-wsfb
 #	xf86-video-imstt
-# needs porting for xorg-server 1.18
+# needs porting for xorg-server 1.18, and 21.1
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 SUBDIR+= \
 	xf86-video-apm \

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 04:53:05 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
adjust the list of drivers per platform / xorg-server version for 21.1.3.

while here, remove x86 support for xorg-server 1.10.  the set lists were
out of date for ages, and have also been cleaned up.

the tga, trident, and s3 drivers are disabled for xorg-server 21.1.3, on
top of the various previously disabled for newer server drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/external/mit/xorg/server/drivers/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jul 12 02:42:41 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-video-cirrus: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-cirrus_alpine: Makefile
src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna: Makefile

Log Message:
build the combined cirrus driver.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus_alpine/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.104 src/external/mit/xorg/server/drivers/Makefile:1.105
--- src/external/mit/xorg/server/drivers/Makefile:1.104	Mon Dec  6 17:51:59 2021
+++ src/external/mit/xorg/server/drivers/Makefile	Tue Jul 12 02:42:40 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.104 2021/12/06 17:51:59 abs Exp $
+#	$NetBSD: Makefile,v 1.105 2022/07/12 02:42:40 mrg Exp $
 
 .include 
 
@@ -30,8 +30,6 @@ SUBDIR+= \
 	xf86-video-ati \
 	xf86-video-chips \
 	xf86-video-cirrus \
-	xf86-video-cirrus_alpine \
-	xf86-video-cirrus_laguna \
 	xf86-video-i128 \
 	xf86-video-i740 \
 	xf86-video-intel \
@@ -90,8 +88,6 @@ SUBDIR+= \
 	xf86-video-ati \
 	xf86-video-chips \
 	xf86-video-cirrus \
-	xf86-video-cirrus_alpine \
-	xf86-video-cirrus_laguna \
 	xf86-video-i128 \
 	xf86-video-i740 \
 	xf86-video-mach64 \
@@ -127,7 +123,6 @@ SUBDIR+= \
 .if ${MACHINE} == "bebox"
 SUBDIR+= \
 	xf86-video-cirrus \
-	xf86-video-cirrus_alpine \
 	xf86-video-mga \
 	xf86-video-s3 \
 	xf86-video-s3virge
@@ -139,8 +134,6 @@ SUBDIR+= \
 	xf86-video-ati \
 	xf86-video-chips \
 	xf86-video-cirrus \
-	xf86-video-cirrus_alpine \
-	xf86-video-cirrus_laguna \
 	xf86-video-i128 \
 	xf86-video-i740 \
 	xf86-video-mga \
@@ -278,7 +271,6 @@ SUBDIR+= \
 .if ${MACHINE} == "prep"
 SUBDIR+= \
 	xf86-video-cirrus \
-	xf86-video-cirrus_alpine \
 	xf86-video-mga \
 	xf86-video-s3
 .endif	# ${MACHINE} == "prep"

Index: src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile:1.3	Sun Aug  3 09:24:14 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile	Tue Jul 12 02:42:40 2022
@@ -1,9 +1,13 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2022/07/12 02:42:40 mrg Exp $
 
 DRIVER=		xf86-video-cirrus
 DRIVER_NAME=	cirrus_drv
 
 SRCS=		cir_dga.c cir_driver.c CirrusClk.c cir_shadow.c
+SRCS+=		alp_driver.c alp.h alp_hwcurs.c alp_i2c.c alp_xaa.c
+SRCS+=		alp_xaam.c
+SRCS+=		lg_driver.c lg_hwcurs.c lg_i2c.c lg_xaa.c
+
 MAN=		cirrus.4
 
 CPPFLAGS.cir_driver.c=	-DVERSION=${PACKAGE_MAJOR}

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jul 12 02:42:41 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-video-cirrus: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-cirrus_alpine: Makefile
src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna: Makefile

Log Message:
build the combined cirrus driver.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus_alpine/Makefile
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/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/drivers/xf86-video-ati

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Feb 23 17:28:32 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ati: Makefile

Log Message:
build the newer version of the ati driver frontend, that knows how
to load amdgpu if that is found.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-ati/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/drivers/xf86-video-ati/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.6	Tue Aug 16 06:24:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile	Wed Feb 23 17:28:31 2022
@@ -1,11 +1,15 @@
-#	$NetBSD: Makefile,v 1.6 2016/08/16 06:24:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2022/02/23 17:28:31 mrg Exp $
 
-DRIVER=		xf86-video-ati
+DRIVER=		xf86-video-ati-kms
 DRIVER_NAME=	ati_drv
 
 SRCS=		ati.c atimodule.c
 MAN=		ati.4
 
+CPPFLAGS+=	-DHAVE_CONFIG_H
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm \
+		-I${X11SRCDIR.${DRIVER}}/../include
+
 LIBDPLIBS+=	 drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
 
 .include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-ati

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Feb 23 17:28:32 UTC 2022

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ati: Makefile

Log Message:
build the newer version of the ati driver frontend, that knows how
to load amdgpu if that is found.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-ati/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/drivers

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 16:27:10 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver

Log Message:
Grr: need NOLINT=yes for the Makefiles that include Makefile.xf86-driver
early, and MKLINT:=no for the ones that include it late. Should fix that.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver

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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.31 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.32
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.31	Wed Dec 15 10:45:26 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Wed Dec 15 11:27:10 2021
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.31 2021/12/15 15:45:26 christos Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.32 2021/12/15 16:27:10 christos Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
 
 NOFULLRELRO=	yes
 LINTFLAGS+=-D__GNUC__
-NOLINT=yes	# XXX: lint2 is broken for most of them
+MKLINT:= no	# XXX: lint2 is broken for most of them
+NOLINT=yes
 
 .include 
 .include 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 16:27:10 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver

Log Message:
Grr: need NOLINT=yes for the Makefiles that include Makefile.xf86-driver
early, and MKLINT:=no for the ones that include it late. Should fix that.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver

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/drivers

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 15:45:26 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver

Log Message:
Lint2 is broken, so disable lint for now.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver

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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.30 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.31
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.30	Wed Dec 15 10:27:30 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Wed Dec 15 10:45:26 2021
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.30 2021/12/15 15:27:30 christos Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.31 2021/12/15 15:45:26 christos Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
 
 NOFULLRELRO=	yes
 LINTFLAGS+=-D__GNUC__
+NOLINT=yes	# XXX: lint2 is broken for most of them
 
 .include 
 .include 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 15:45:26 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver

Log Message:
Lint2 is broken, so disable lint for now.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver

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/drivers

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 15:27:30 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Add -D__GNUC__ for all drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.29 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.30
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.29	Mon Nov  1 06:05:18 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Wed Dec 15 10:27:30 2021
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.29 2021/11/01 10:05:18 nia Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.30 2021/12/15 15:27:30 christos Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
 
 NOFULLRELRO=	yes
+LINTFLAGS+=-D__GNUC__
 
 .include 
 .include 

Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.21 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.22
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.21	Wed Dec 15 10:24:11 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Wed Dec 15 10:27:30 2021
@@ -1,11 +1,10 @@
-#	$NetBSD: Makefile,v 1.21 2021/12/15 15:24:11 christos Exp $
+#	$NetBSD: Makefile,v 1.22 2021/12/15 15:27:30 christos Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
 
 SRCS=		kbd.c bsd_KbdMap.c bsd_kbd.c at_scancode.c
 MAN=		kbd.4
-LINTFLAGS+=	-D__GNUC__
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "cats"
 CPPFLAGS+=	-DPCVT_SUPPORT

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 15:27:30 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Add -D__GNUC__ for all drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 15:24:11 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Add -D__GNUC__ for lint


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Dec 15 15:24:11 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Add -D__GNUC__ for lint


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.20 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.21
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.20	Mon Dec  6 12:51:59 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Wed Dec 15 10:24:11 2021
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.20 2021/12/06 17:51:59 abs Exp $
+#	$NetBSD: Makefile,v 1.21 2021/12/15 15:24:11 christos Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
 
 SRCS=		kbd.c bsd_KbdMap.c bsd_kbd.c at_scancode.c
 MAN=		kbd.4
+LINTFLAGS+=	-D__GNUC__
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "cats"
 CPPFLAGS+=	-DPCVT_SUPPORT

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

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Aug 28 08:56:10 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile

Log Message:
Remove unused xf86-video-modesetting.

In newer xorg-server, it is integrated into the server
No users of old xorg-server use modesetting.

It requires drm drivers, but also, the sole possible user of old
xorg-server that could be handled by this Makefile is netwinder,
but it has a different ${MACHINE} and so seems like it never built the
driver.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.102 src/external/mit/xorg/server/drivers/Makefile:1.103
--- src/external/mit/xorg/server/drivers/Makefile:1.102	Thu May 27 04:54:21 2021
+++ src/external/mit/xorg/server/drivers/Makefile	Sat Aug 28 08:56:10 2021
@@ -1,14 +1,7 @@
-#	$NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc Exp $
+#	$NetBSD: Makefile,v 1.103 2021/08/28 08:56:10 maya Exp $
 
 .include 
 
-# modesetting is builtin to xorg-server 1.18 tree
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-MODE_SETTING=	xf86-video-modesetting
-.else
-MODE_SETTING=
-.endif
-
 # xf86-input drivers
 
 SUBDIR= \
@@ -44,7 +37,6 @@ SUBDIR+= \
 	xf86-video-intel \
 	xf86-video-mach64 \
 	xf86-video-mga \
-	${MODE_SETTING} \
 	xf86-video-neomagic \
 	xf86-video-nv \
 	xf86-video-nouveau \
@@ -181,7 +173,6 @@ SUBDIR+= \
 .if ${MACHINE} == "evbarm"
 SUBDIR+= \
 	xf86-video-ati \
-	${MODE_SETTING} \
 	xf86-video-nouveau \
 	xf86-video-radeon \
 	xf86-video-radeon-kms \

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

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Aug 28 08:56:10 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Removed Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile

Log Message:
Remove unused xf86-video-modesetting.

In newer xorg-server, it is integrated into the server
No users of old xorg-server use modesetting.

It requires drm drivers, but also, the sole possible user of old
xorg-server that could be handled by this Makefile is netwinder,
but it has a different ${MACHINE} and so seems like it never built the
driver.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/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/drivers/xf86-video-amdgpu

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Aug 19 04:34:57 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile

Log Message:
link in glamor and gbm.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/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/drivers/xf86-video-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.3	Mon May 31 21:45:41 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile	Thu Aug 19 04:34:57 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2021/05/31 21:45:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2021/08/19 04:34:57 mrg Exp $
 
 .include 
 
@@ -24,6 +24,8 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.${DRIVER}}/../include
 
+LDADD+=		${LDADD.glamor} -lgbm
+
 # XXX
 COPTS+=		-Wno-error
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-amdgpu

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Aug 19 04:34:57 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile

Log Message:
link in glamor and gbm.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/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/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun  3 07:37:01 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Sort ${MACHINE}'s. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18	Thu Jun  3 07:34:29 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Thu Jun  3 07:37:00 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2021/06/03 07:34:29 rin Exp $
+#	$NetBSD: Makefile,v 1.19 2021/06/03 07:37:00 rin Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -13,11 +13,15 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 # turns out we can't use wskbd everywhere without a couple more translation
 # tables in the X driver so make it the default only where we know it will work
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
-${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
-${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm" || ${MACHINE} == "mac68k" || \
-${MACHINE} == "amiga"
+.if ${MACHINE_ARCH} == "powerpc" || \
+${MACHINE} == "amiga" || \
+${MACHINE} == "evbarm" || \
+${MACHINE} == "mac68k" || \
+${MACHINE} == "sgimips" || \
+${MACHINE} == "shark" || \
+${MACHINE} == "sparc" || \
+${MACHINE} == "sparc64" || \
+${MACHINE} == "vax"
 CPPFLAGS+=	-DDEFAULT_TO_WSKBD
 .endif
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun  3 07:37:01 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Sort ${MACHINE}'s. No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun  3 07:34:30 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
For amiga, use wskbd as default, which is only supported protocol today.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17	Sat May 29 12:15:32 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Thu Jun  3 07:34:29 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2021/05/29 12:15:32 rin Exp $
+#	$NetBSD: Makefile,v 1.18 2021/06/03 07:34:29 rin Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -16,7 +16,8 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
 ${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
 ${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
+${MACHINE} == "evbarm" || ${MACHINE} == "mac68k" || \
+${MACHINE} == "amiga"
 CPPFLAGS+=	-DDEFAULT_TO_WSKBD
 .endif
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Thu Jun  3 07:34:30 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
For amiga, use wskbd as default, which is only supported protocol today.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon May 31 21:45:41 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile

Log Message:
Stop using -fcommon, xsrc should be fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.28
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27	Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Mon May 31 21:45:41 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.27 2021/04/12 03:57:06 mrg Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.28 2021/05/31 21:45:41 joerg Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
@@ -49,9 +49,6 @@ CPPFLAGS+=	-DPACKAGE_VERSION_MINOR=${PAC
 CPPFLAGS+=	-DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
 .PATH:	${X11SRCDIR.${DRIVER}}/src
 .PATH:	${X11SRCDIR.${DRIVER}}/man
 .PATH:	${X11SRCDIR.${DRIVER}}

Index: src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2	Sun May 30 22:24:35 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile	Mon May 31 21:45:41 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/31 21:45:41 joerg Exp $
 
 .include 
 
@@ -26,6 +26,5 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 
 # XXX
 COPTS+=		-Wno-error
-COPTS+=		-fcommon
 
 .include "../Makefile.xf86-driver"

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon May 31 21:45:41 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile

Log Message:
Stop using -fcommon, xsrc should be fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/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/drivers/xf86-video-geode

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon May 31 00:04:15 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile

Log Message:
Use -fcommon


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-geode/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/drivers/xf86-video-geode

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon May 31 00:04:15 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile

Log Message:
Use -fcommon


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-geode/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/drivers/xf86-video-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6	Tue Jan  1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile	Mon May 31 00:04:15 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2019/01/01 00:37:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2021/05/31 00:04:15 joerg Exp $
 
 DRIVER=		xf86-video-geode
 DRIVER_NAME=	geode_drv
@@ -54,6 +54,8 @@ COPTS.lx_panel.c+=	-Wno-error	# XXX
 
 CWARNFLAGS.clang+=	-Wno-empty-body
 
+COPTS+=		-fcommon
+
 .include "../Makefile.xf86-driver"
 
 XORG_PKG_VER_PROG=	${DRIVER}

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 22:24:36 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Various X drivers still need -fcommon, so add it.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 22:24:36 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Various X drivers still need -fcommon, so add it.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1	Thu Aug 18 07:49:09 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile	Sun May 30 22:24:35 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2016/08/18 07:49:09 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
 
 .include 
 
@@ -25,6 +25,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-I${X11SRCDIR.${DRIVER}}/../include
 
 # XXX
-COPTS+=	-Wno-error
+COPTS+=		-Wno-error
+COPTS+=		-fcommon
 
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.34
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33	Mon Sep  7 00:24:37 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Sun May 30 22:24:35 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2020/09/07 00:24:37 mrg Exp $
+#	$NetBSD: Makefile,v 1.34 2021/05/30 22:24:35 joerg Exp $
 
 .include 
 
@@ -218,6 +218,8 @@ SRCS+=		i810_xaa.c
 CWARNFLAGS.clang+=	-Wno-parentheses -Wno-tautological-compare \
 			-Wno-empty-body -Wno-error
 
+COPTS+=	-fcommon
+
 COPTS.sna_display.c+=	-Wno-stack-protector
 COPTS.sna_threads.c+=	-Wno-stack-protector
 COPTS.sna_trapezoids.c+=	-Wno-stack-protector

Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16	Tue Jan  1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Sun May 30 22:24:36 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2019/01/01 00:37:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2021/05/30 22:24:36 joerg Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
@@ -43,6 +43,8 @@ CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src
 CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
 CPPFLAGS+=	-DHAVE_XF86_CURSOR_RESET_CURSOR
 
+COPTS+=	-fcommon
+
 .include "../Makefile.xf86-driver"
 
 # XXX

Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12	Sun Feb  9 12:28:28 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun May 30 22:24:36 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2020/02/09 12:28:28 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.13 2021/05/30 22:24:36 joerg Exp $
 
 .include 
 
@@ -61,4 +61,6 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 
 LIBDPLIBS+=	gbm ${.CURDIR}/../../../lib/libgbm${OLD_PREFIX}
 
+COPTS+=		-fcommon
+
 .include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-pnozz

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 02:22:19 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile

Log Message:
Ignore pointer sign cast issues with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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/drivers/xf86-video-pnozz

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun May 30 02:22:19 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile

Log Message:
Ignore pointer sign cast issues with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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/drivers/xf86-video-pnozz/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2	Thu May 27 04:53:44 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile	Sun May 30 02:22:19 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2021/05/27 04:53:44 jdc Exp $
+#	$NetBSD: Makefile,v 1.3 2021/05/30 02:22:19 joerg Exp $
 
 DRIVER=		xf86-video-pnozz
 DRIVER_NAME=	pnozz_drv
@@ -14,3 +14,4 @@ MAN=		pnozz.4
 # XXX
 COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.pnozz_cursor.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=pointer-sign :}

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat May 29 12:15:32 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Make wskbd(4) default for mac68k; no other protocol is available.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16	Mon Dec 31 11:58:43 2018
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Sat May 29 12:15:32 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2021/05/29 12:15:32 rin Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -16,7 +16,7 @@ CPPFLAGS+=	-DPCVT_SUPPORT
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
 ${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
 ${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm"
+${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
 CPPFLAGS+=	-DDEFAULT_TO_WSKBD
 .endif
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Sat May 29 12:15:32 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile

Log Message:
Make wskbd(4) default for mac68k; no other protocol is available.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/drivers

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Thu May 27 04:54:21 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
Restore the build of the pnozz driver on sparc, now that it has EXA support.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.101 src/external/mit/xorg/server/drivers/Makefile:1.102
--- src/external/mit/xorg/server/drivers/Makefile:1.101	Sun Mar  7 10:42:27 2021
+++ src/external/mit/xorg/server/drivers/Makefile	Thu May 27 04:54:21 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.101 2021/03/07 10:42:27 rin Exp $
+#	$NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc Exp $
 
 .include 
 
@@ -335,6 +335,7 @@ SUBDIR+= \
 
 .if ${MACHINE} == "sparc"
 SUBDIR+= \
+	xf86-video-pnozz \
 	xf86-video-suncg14 \
 	xf86-video-suntcx
 

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

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Thu May 27 04:54:21 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
Restore the build of the pnozz driver on sparc, now that it has EXA support.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/external/mit/xorg/server/drivers/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/drivers/xf86-video-pnozz

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Thu May 27 04:53:44 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile

Log Message:
Update the pnozz files list for EXA support.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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/drivers/xf86-video-pnozz/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1	Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile	Thu May 27 04:53:44 2021
@@ -1,12 +1,16 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+#	$NetBSD: Makefile,v 1.2 2021/05/27 04:53:44 jdc Exp $
 
 DRIVER=		xf86-video-pnozz
 DRIVER_NAME=	pnozz_drv
 
-SRCS=		pnozz_driver.c pnozz_cursor.c pnozz_accel.c
+SRCS=		pnozz_driver.c pnozz_cursor.c pnozz_accel.c pnozz_exa.c
 
 CPPFLAGS+=	${X11FLAGS.DRI}
 
 MAN=		pnozz.4
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.pnozz_accel.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-pnozz

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Thu May 27 04:53:44 UTC 2021

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile

Log Message:
Update the pnozz files list for EXA support.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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/drivers

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Fri Oct  9 04:28:38 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
build some potentially useful drivers on hppa


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.99 src/external/mit/xorg/server/drivers/Makefile:1.100
--- src/external/mit/xorg/server/drivers/Makefile:1.99	Sun Jan 19 10:45:50 2020
+++ src/external/mit/xorg/server/drivers/Makefile	Fri Oct  9 04:28:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.99 2020/01/19 10:45:50 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.100 2020/10/09 04:28:38 macallan Exp $
 
 .include 
 
@@ -212,6 +212,13 @@ SUBDIR+= \
 	xf86-video-wsfb
 .endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
 
+.if ${MACHINE} == "hppa"
+SUBDIR+= \
+	xf86-video-mga \
+	xf86-video-r128 \
+	xf86-video-wsfb
+.endif	# ${MACHINE} == "hppa"
+
 .if ${MACHINE} == "ibmnws"
 SUBDIR+= \
 	xf86-video-s3

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Fri Oct  9 04:28:38 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
build some potentially useful drivers on hppa


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/external/mit/xorg/server/drivers/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Sep  7 00:24:37 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile

Log Message:
use GCC_NO_ADDR_OF_PACKED_MEMBER.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32	Fri May 10 06:25:58 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Mon Sep  7 00:24:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2019/05/10 06:25:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.33 2020/09/07 00:24:37 mrg Exp $
 
 .include 
 
@@ -227,5 +227,6 @@ COPTS.sna_trapezoids_mono.c+=	-Wno-stack
 COPTS.sna_trapezoids_precise.c+=	-Wno-stack-protector
 COPTS.i965_video.c+=	-Wno-stack-protector
 
+COPTS.sna_damage.c+=		${GCC_NO_ADDR_OF_PACKED_MEMBER}
 COPTS.sna_display.c+=		-Wno-error	# XXX deprecated
 COPTS.intel_driver.c+=		-Wno-error	# XXX deprecated

Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13	Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile	Mon Sep  7 00:24:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2018/12/31 12:13:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2020/09/07 00:24:37 mrg Exp $
 
 DRIVER=		xf86-video-vmware
 DRIVER_NAME=	vmware_drv
@@ -25,3 +25,5 @@ COPTS.vmware.c+=	-Wno-error	# XXX deprec
 COPTS.vmwaremodes.c+=	-Wno-error
 
 .include "../Makefile.xf86-driver"
+
+CWARNFLAGS.gcc+=	${GCC_NO_ADDR_OF_PACKED_MEMBER}

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Sep  7 00:24:37 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile

Log Message:
use GCC_NO_ADDR_OF_PACKED_MEMBER.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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/drivers/xf86-video-radeon-kms

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sun Feb  9 12:28:28 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Do not define HAVE_DRI3_H


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sun Feb  9 12:28:28 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Do not define HAVE_DRI3_H


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11	Sun Jan 19 10:44:51 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun Feb  9 12:28:28 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2020/01/19 10:44:51 martin Exp $
+#	$NetBSD: Makefile,v 1.12 2020/02/09 12:28:28 jmcneill Exp $
 
 .include 
 
@@ -16,7 +16,6 @@ CPPFLAGS+= \
 		-DHAS_DIRTYTRACKING2 \
 		-DHAVE_XORG_LIST \
 		-DHAVE_XF86_CURSOR_RESET_CURSOR \
-		-DHAVE_DRI3_H \
 		-DHAVE_MISYNCSHM_H \
 		-DHAVE_PRESENT_H
 .endif

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jan 19 10:44:51 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Fix conditional in previous


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jan 19 10:44:51 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Fix conditional in previous


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.10	Sun Jan 19 00:58:15 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun Jan 19 10:44:51 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2020/01/19 00:58:15 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.11 2020/01/19 10:44:51 martin Exp $
 
 .include 
 
@@ -47,7 +47,7 @@ SRCS=		radeon_accel.c radeon_video.c \
 
 MAN=		radeon.4
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 MANSUBDIR=	/x86
 .else
 MANSUBDIR=	/${MACHINE}

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri May 10 06:25:58 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
add new INTEL_DRIVER_DATE variable that defaults to 2019, but can
be set to 2014 and the older KMS based driver will be used (which
is the last actual release.)

this fixes some display issues on older systems.  for me, sandy
bridge has minor issues with the new drivrer, but kaby lake really
likes to have the newer driver.

perhaps change default later, but this enables simple testing.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.31 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.31	Sat Apr 13 09:29:49 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Fri May 10 06:25:58 2019
@@ -1,8 +1,16 @@
-#	$NetBSD: Makefile,v 1.31 2019/04/13 09:29:49 maya Exp $
+#	$NetBSD: Makefile,v 1.32 2019/05/10 06:25:58 mrg Exp $
 
 .include 
 
+# Set this to 2014 for the last release, which does not support newer
+# chipsets as well, but cause major problems on older chipsets.
+INTEL_DRIVER_DATE?=	2019
+
+.if ${INTEL_DRIVER_DATE} > 2014
 DRIVER=		xf86-video-intel
+.else
+DRIVER=		xf86-video-intel-2014
+.endif
 DRIVER_NAME=	intel_drv
 
 # main module
@@ -41,7 +49,9 @@ SRCS+=		gen7_render.c
 SRCS+=		gen8_eu.c
 SRCS+=		gen8_render.c
 SRCS+=		gen8_vertex.c
+.if ${INTEL_DRIVER_DATE} > 2014
 SRCS+=		gen9_render.c
+.endif
 
 SRCS+=		sna_accel.c
 SRCS+=		sna_acpi.c

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri May 10 06:25:58 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
add new INTEL_DRIVER_DATE variable that defaults to 2019, but can
be set to 2014 and the older KMS based driver will be used (which
is the last actual release.)

this fixes some display issues on older systems.  for me, sandy
bridge has minor issues with the new drivrer, but kaby lake really
likes to have the newer driver.

perhaps change default later, but this enables simple testing.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Apr 13 09:29:49 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
Enable TearFree by default.

This avoids visual corruption that can be induced by, e.g.,
env LIBGL_ALWAYS_SOFTWARE=1 glmark2.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Apr 13 09:29:49 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
Enable TearFree by default.

This avoids visual corruption that can be induced by, e.g.,
env LIBGL_ALWAYS_SOFTWARE=1 glmark2.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.31
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30	Wed Mar 20 07:18:07 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Sat Apr 13 09:29:49 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2019/03/20 07:18:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.31 2019/04/13 09:29:49 maya Exp $
 
 .include 
 
@@ -179,6 +179,8 @@ CPPFLAGS+=	-DUMS=1
 CPPFLAGS+=	-DUSE_BACKLIGHT=1
 CPPFLAGS+=	-DUSE_SNA=1
 CPPFLAGS+=	-DUSE_UXA=1
+# XXX without this we get visual corruption, but it doesn't seem to be tearing
+CPPFLAGS+=	-DTEARFREE
 
 # XXX This should not be hard-coded here...
 DRI_DRIVER_PATH=	/usr/X11R7/lib/modules/dri

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 20 07:18:07 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
updates for xf86-video-intel 6afed33b2d673d88674f0c76efe500ae414e8e1b.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 20 07:18:07 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
updates for xf86-video-intel 6afed33b2d673d88674f0c76efe500ae414e8e1b.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.29 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.29	Wed Jan  2 22:58:44 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Wed Mar 20 07:18:07 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2019/01/02 22:58:44 mrg Exp $
+#	$NetBSD: Makefile,v 1.30 2019/03/20 07:18:07 mrg Exp $
 
 .include 
 
@@ -41,6 +41,7 @@ SRCS+=		gen7_render.c
 SRCS+=		gen8_eu.c
 SRCS+=		gen8_render.c
 SRCS+=		gen8_vertex.c
+SRCS+=		gen9_render.c
 
 SRCS+=		sna_accel.c
 SRCS+=		sna_acpi.c
@@ -126,11 +127,11 @@ SRCS+=		intel_uxa.c
 SRCS+=		intel_uxa_video.c
 SRCS+=		intel_video.c
 SRCS+=		intel_video_overlay.c
+SRCS+=		uxa.c
 SRCS+=		uxa-accel.c
 SRCS+=		uxa-glyphs.c
 SRCS+=		uxa-render.c
 SRCS+=		uxa-unaccel.c
-SRCS+=		uxa.c
 
 MAN=		intel.4
 
@@ -181,8 +182,12 @@ CPPFLAGS+=	-DUSE_UXA=1
 
 # XXX This should not be hard-coded here...
 DRI_DRIVER_PATH=	/usr/X11R7/lib/modules/dri
-CPPFLAGS+=	-DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
-CPPFLAGS+=		-DHAVE_XF86_CURSOR_RESET_CURSOR
+CPPFLAGS+=		-DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\" \
+			-DHAVE_XF86_CURSOR_RESET_CURSOR \
+			-DDEFAULT_DRI_LEVEL=2
+
+# XXX new version things:
+CPPFLAGS+=		-DHAVE_DEV_WSCONS_WSCONSIO_H
 
 # XXX Probably better to set this in Makefile.xf86-driver, conditional
 # on ELF 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar  5 09:08:51 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile

Log Message:
remove no longer used defines


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/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/drivers/xf86-video-nouveau

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Mar  5 09:08:51 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile

Log Message:
remove no longer used defines


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/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/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.9	Tue Jan  1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Tue Mar  5 09:08:51 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2019/01/01 00:37:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2019/03/05 09:08:51 mrg Exp $
 
 DRIVER=		xf86-video-nouveau
 DRIVER_NAME=	nouveau_drv
@@ -39,10 +39,6 @@ LIBDPLIBS+=	drm_nouveau ${.CURDIR}/../..
 MAN=		nouveau.4
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
-
-CPPFLAGS+=	-DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
-CPPFLAGS+=	-DNV_MINOR_VERSION=${PACKAGE_MINOR}
-CPPFLAGS+=	-DNV_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DATE}
 
 .include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-modesetting

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jan 28 18:50:39 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile

Log Message:
.error out if attempting to use this with non xorg-server 1.10.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/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/drivers/xf86-video-modesetting/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.1	Fri Nov  6 01:17:08 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile	Mon Jan 28 18:50:39 2019
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.1 2015/11/06 01:17:08 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.2 2019/01/28 18:50:39 mrg Exp $
+
+# This is for xorg-server 1.10 only.
 
 DRIVER=		xf86-video-modesetting
 DRIVER_NAME=	modesetting_drv
@@ -10,3 +12,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libd
 CPPFLAGS+=	-DRANDR_12_INTERFACE
 
 .include "../Makefile.xf86-driver"
+
+.if ${HAVE_XORG_SERVER_VER} != "110"
+.error "This subdirectory is for xorg-server 1.10 only."
+.endif

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-modesetting

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jan 28 18:50:39 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile

Log Message:
.error out if attempting to use this with non xorg-server 1.10.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/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/drivers/xf86-video-vboxvideo

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jan 10 00:05:57 UTC 2019

Added Files:
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo: Makefile

Log Message:
build infrastructure for vboxvideo driver.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile

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

Added files:

Index: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile:1.1
--- /dev/null	Thu Jan 10 00:05:57 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile	Thu Jan 10 00:05:57 2019
@@ -0,0 +1,31 @@
+#	$NetBSD: Makefile,v 1.1 2019/01/10 00:05:57 mrg Exp $
+
+DRIVER=		xf86-video-vboxvideo
+DRIVER_NAME=	vboxvideo_drv
+
+SRCS=	 \
+		HGSMIBase.c \
+		HGSMIBuffers.c \
+		HGSMICommon.c \
+		Modesetting.c \
+		VBVABase.c \
+		edid.c \
+		getmode.c \
+		helpers.c \
+		hgsmimemalloc.c \
+		pointer.c \
+		setmode.c \
+		vboxvideo.c \
+		vbva.c
+
+CPPFLAGS+=	\
+		-I${X11SRCDIR.${DRIVER}}/src \
+		-DXORG_7X \
+		-DIN_RING3 \
+		-DPCIACCESS \
+		-DVBOXVIDEO_13 \
+		-include ${DESTDIR}/usr/X11R7/include/xorg/xorg-server.h
+
+MAN=		vboxvideo.4
+
+.include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jan 10 00:05:57 UTC 2019

Added Files:
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo: Makefile

Log Message:
build infrastructure for vboxvideo driver.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/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/drivers/xf86-video-intel

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jan  2 22:58:44 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
explicitly link libXfont since it is used.

from Patrick Welche in private email.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.28 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.29
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.28	Tue Jan  1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Wed Jan  2 22:58:44 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2019/01/01 00:37:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.29 2019/01/02 22:58:44 mrg Exp $
 
 .include 
 
@@ -188,6 +188,7 @@ CPPFLAGS+=		-DHAVE_XF86_CURSOR_RESET_CUR
 # on ELF 
 CFLAGS+=	-fvisibility=hidden
 
+LIBDPLIBS+=	Xfont		${.CURDIR}/../../../lib/libXfont
 LIBDPLIBS+=	drm_intel	${.CURDIR}/../../../lib/libdrm_intel
 LIBDPLIBS+=	pthread		${NETBSDSRCDIR}/lib/libpthread
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Jan  2 22:58:44 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
explicitly link libXfont since it is used.

from Patrick Welche in private email.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan  1 00:37:06 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
build fixes for xorg-server 1.20 parts:

- define HAVE_XF86_CURSOR_RESET_CURSOR for several drivers that now
  look for it.
- remove various -Wno* options no longer needed, in particular the
  global -Wno-error in the radeon and radeon-kms drivers


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan  1 00:37:06 UTC 2019

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
build fixes for xorg-server 1.20 parts:

- define HAVE_XF86_CURSOR_RESET_CURSOR for several drivers that now
  look for it.
- remove various -Wno* options no longer needed, in particular the
  global -Wno-error in the radeon and radeon-kms drivers


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5	Tue Aug 16 06:54:12 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile	Tue Jan  1 00:37:06 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2016/08/16 06:54:12 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2019/01/01 00:37:06 mrg Exp $
 
 DRIVER=		xf86-video-geode
 DRIVER_NAME=	geode_drv
@@ -32,6 +32,7 @@ NOMAN=	# defined
 CPPFLAGS+=	-DHAVE_GX -DHAVE_LX -DAMD_V4L2_VIDEO -DOPT_ACCEL -DPNL_SUP
 # This enables multi-mmap support; no idea why it is Linux 2.6 specific
 CPPFLAGS+=	-DLINUX_2_6
+CPPFLAGS+=	-DHAVE_XF86_CURSOR_RESET_CURSOR
 
 CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src/cim \
 		-I${X11SRCDIR.${DRIVER}}/src/gfx \

Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.28
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27	Mon Dec 31 13:05:07 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Tue Jan  1 00:37:06 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2018/12/31 13:05:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.28 2019/01/01 00:37:06 mrg Exp $
 
 .include 
 
@@ -182,6 +182,7 @@ CPPFLAGS+=	-DUSE_UXA=1
 # XXX This should not be hard-coded here...
 DRI_DRIVER_PATH=	/usr/X11R7/lib/modules/dri
 CPPFLAGS+=	-DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
+CPPFLAGS+=		-DHAVE_XF86_CURSOR_RESET_CURSOR
 
 # XXX Probably better to set this in Makefile.xf86-driver, conditional
 # on ELF 
@@ -210,4 +211,3 @@ COPTS.i965_video.c+=	-Wno-stack-protecto
 
 COPTS.sna_display.c+=		-Wno-error	# XXX deprecated
 COPTS.intel_driver.c+=		-Wno-error	# XXX deprecated
-COPTS.intel_display.c+=		-Wno-error	# XXX deprecated

Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8	Mon Dec 31 21:38:39 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Tue Jan  1 00:37:06 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2018/12/31 21:38:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2019/01/01 00:37:06 mrg Exp $
 
 DRIVER=		xf86-video-nouveau
 DRIVER_NAME=	nouveau_drv
@@ -48,12 +48,11 @@ CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DAT
 .include "../Makefile.xf86-driver"
 
 # XXX
-COPTS.nouveau_xv.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 COPTS.nouveau_xv.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
 
 .if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
 CPPFLAGS+=	-DHAVE_XORG_LIST
-COPTS.drmmode_display.c+= -Wno-error  # XXX deprecated
+CPPFLAGS+=	-DHAVE_XF86_CURSOR_RESET_CURSOR
 .endif
 
 # from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure

Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16
--- 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 21:38:39 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
more deprecated functions still used.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7	Fri Feb  2 01:02:40 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Mon Dec 31 21:38:39 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2018/02/02 01:02:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2018/12/31 21:38:39 mrg Exp $
 
 DRIVER=		xf86-video-nouveau
 DRIVER_NAME=	nouveau_drv
@@ -53,6 +53,7 @@ COPTS.nouveau_xv.c+=	${${ACTIVE_CC} == "
 
 .if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
 CPPFLAGS+=	-DHAVE_XORG_LIST
+COPTS.drmmode_display.c+= -Wno-error  # XXX deprecated
 .endif
 
 # from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure

Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14	Tue Jul 10 17:36:38 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Mon Dec 31 21:38:39 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2018/07/10 17:36:38 maya Exp $
+#	$NetBSD: Makefile,v 1.15 2018/12/31 21:38:39 mrg Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
@@ -50,4 +50,7 @@ COPTS.via_display.c+= -Wno-error=stack-p
 COPTS.via_driver.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 COPTS.via_lvds.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 
+COPTS.via_display.c+=	-Wno-error	# XXX deprecated
+COPTS.via_kms.c+=	-Wno-error	# XXX deprecated
+
 CWARNFLAGS.clang+=	-Wno-tautological-compare

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 21:38:39 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
more deprecated functions still used.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 12:13:50 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
src/external/mit/xorg/server/drivers/xf86-input-synaptics: Makefile
src/external/mit/xorg/server/drivers/xf86-input-vmmouse: Makefile
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile

Log Message:
-Wno-error for newly deprecated things.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 12:13:50 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
src/external/mit/xorg/server/drivers/xf86-input-synaptics: Makefile
src/external/mit/xorg/server/drivers/xf86-input-vmmouse: Makefile
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile

Log Message:
-Wno-error for newly deprecated things.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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/drivers/xf86-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8	Tue Aug 16 06:53:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile	Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/08/16 06:53:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2018/12/31 12:13:50 mrg Exp $
 
 WARNS?=		2
 
@@ -22,5 +22,7 @@ PKGDIST.xorg-mouse=	${X11SRCDIR.${DRIVER
 .PATH:  ${X11SRCDIR.${DRIVER}}/include
 .PATH:  ${X11SRCDIR.${DRIVER}}
 
+COPTS.mouse.c+=		-Wno-error	# XXX deprecated
+
 XORG_PKG_VER_PROG=	${DRIVER}
 .include "../../../xorg-pkg-ver.mk"

Index: src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1	Sat Jan 29 02:32:36 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile	Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/01/29 02:32:36 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/12/31 12:13:50 mrg Exp $
 
 DRIVER=		xf86-input-synaptics
 DRIVER_NAME=	synaptics_drv
@@ -11,4 +11,6 @@ CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR
 
 MAN=		synaptics.4
 
+COPTS.synaptics.c+=		-Wno-error	# XXX deprecated
+
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5	Wed Oct 19 23:07:34 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile	Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2011/10/19 23:07:34 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.6 2018/12/31 12:13:50 mrg Exp $
 
 DRIVER=		xf86-input-vmmouse
 DRIVER_NAME=	vmmouse_drv
@@ -9,7 +9,7 @@ CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/shar
 CPPFLAGS+=	-DXINPUT -DHAVE_XORG_SERVER_1_5_0
 CPPFLAGS+=	-DABS_VALUATOR_AXES -DNO_MOUSE_MODULE
 
-COPTS.vmmouse.c=  -Wno-error	# XXX deprecated
+COPTS.vmmouse.c+=  -Wno-error	# XXX deprecated
 
 .include "../Makefile.xf86-driver"
 .PATH:  ${X11SRCDIR.${DRIVER}}/shared

Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14	Sat Dec 10 01:58:36 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile	Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2016/12/10 01:58:36 macallan Exp $
+#	$NetBSD: Makefile,v 1.15 2018/12/31 12:13:50 mrg Exp $
 
 DRIVER=		xf86-video-glint
 DRIVER_NAME=	glint_drv
@@ -22,7 +22,7 @@ CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
 
-COPTS.glint_driver.c=	-Wno-error	# XXX xf86dgastr.h
+COPTS.glint_driver.c=	

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 11:58:43 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile

Log Message:
fixes for xorg-server 1.20:

- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-input-ws/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 11:58:43 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile

Log Message:
fixes for xorg-server 1.20:

- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-input-ws/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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24	Sat Oct  8 20:08:57 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver	Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
+#	$NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
 
 LIBISMODULE=	yes
 SHLIB_MAJOR=	${PACKAGE_MAJOR}
@@ -37,8 +37,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-DHAVE_XORG_SERVER_1_1_0 \
 		-DSERVER_1_5 \
 		-DXSERVER_LIBPCIACCESS \
-		-DHAVE_XEXTPROTO_71 \
-		-DXFree86LOADER
+		-DHAVE_XEXTPROTO_71
 
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 CPPFLAGS+=	-DHAVE_XAA_H

Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15	Sat Jan 12 18:32:12 2013
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile	Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2013/01/12 18:32:12 macallan Exp $
+#	$NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
 
 DRIVER=		xf86-input-keyboard
 DRIVER_NAME=	kbd_drv
@@ -26,6 +26,7 @@ CPPFLAGS.kbd.c=	-D__XKBDEFRULES__=${__XK
 
 X11EXTRAMANDEFS+=	-e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
 
-COPTS.kbd.c=  -Wno-error	# XXX deprecated
+COPTS.kbd.c=		-Wno-error	# XXX deprecated
+COPTS.bsd_kbd.c=	-Wno-error	# XXX deprecated
 
 .include "../Makefile.xf86-driver"

Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3	Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile	Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2012/03/22 23:46:27 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2018/12/31 11:58:43 mrg Exp $
 
 WARNS?=		2
 
@@ -14,4 +14,6 @@ CPPFLAGS+=	-DHAVE_CONFIG_H \
 
 CWARNFLAGS.clang+=	-Wno-parentheses-equality
 
+COPTS.emumb.c=		-Wno-error	# XXX deprecated
+
 .include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 08:34:29 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
link against libgbm.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 08:34:29 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
link against libgbm.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6	Fri Aug 19 16:33:23 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun Dec 30 08:34:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2018/12/30 08:34:29 mrg Exp $
 
 .include 
 
@@ -54,6 +54,8 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.${DRIVER}}/../include
 
+LIBDPLIBS+=	gbm ${.CURDIR}/../../../lib/libgbm
+
 # XXX
 COPTS+=	-Wno-error
 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 07:13:15 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile

Log Message:
updates for new mga and r128 drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-r128/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 07:13:15 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile

Log Message:
updates for new mga and r128 drivers.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-r128/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/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13	Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile	Sun Dec 30 07:13:15 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2016/08/16 06:24:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2018/12/30 07:13:15 mrg Exp $
 
 .include 
 
@@ -7,7 +7,7 @@ DRIVER_NAME=	mga_drv
 
 SRCS=		mga_bios.c mga_dac3026.c mga_dacG.c
 SRCS+=		mga_dga.c mga_dh.c mga_driver.c mga_g450pll.c
-SRCS+=		mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
+SRCS+=		mga_hwcurs.c mga_merge.c mga_shadow.c
 SRCS+=		mga_vga.c mga_video.c mga_storm.c
 MAN=		mga.4
 

Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11	Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile	Sun Dec 30 07:13:15 2018
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.11 2016/08/16 06:24:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2018/12/30 07:13:15 mrg Exp $
 
 DRIVER=		xf86-video-r128
 DRIVER_NAME=	r128_drv
 
 SRCS=	r128_accel.c r128_cursor.c r128_driver.c r128_exa.c \
-	r128_crtc.c r128_output.c \
+	r128_exa_render.c r128_crtc.c r128_output.c \
 	r128_video.c r128_misc.c r128_probe.c r128_dri.c
 
 MAN=	r128.4

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-wsfb

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Fri Aug  3 02:26:00 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-wsfb: Makefile

Log Message:
Fix xf86-video-wsfb build with Clang/LLVM

The code uses non-orthodox types in format strings.
Add a compiler flag to disable a warning that is turned into a fatal error.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/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/drivers/xf86-video-wsfb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.4	Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile	Fri Aug  3 02:26:00 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2018/08/03 02:26:00 kamil Exp $
 
 DRIVER=		xf86-video-wsfb
 DRIVER_NAME=	wsfb_drv
@@ -8,4 +8,6 @@ MAN=		wsfb.4
 
 CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
 
+CWARNFLAGS.clang+=	-Wno-format
+
 .include "../Makefile.xf86-driver"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-wsfb

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Fri Aug  3 02:26:00 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-wsfb: Makefile

Log Message:
Fix xf86-video-wsfb build with Clang/LLVM

The code uses non-orthodox types in format strings.
Add a compiler flag to disable a warning that is turned into a fatal error.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/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/drivers/xf86-video-nv

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Jul 12 21:22:20 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile

Log Message:
build EXA support for nv driver


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-nv/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/drivers/xf86-video-nv

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Jul 12 21:22:20 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile

Log Message:
build EXA support for nv driver


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-nv/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/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.12	Wed Sep 21 18:00:26 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile	Thu Jul 12 21:22:20 2018
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.12 2016/09/21 18:00:26 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2018/07/12 21:22:20 macallan Exp $
 
 DRIVER=		xf86-video-nv
 DRIVER_NAME=	nv_drv
 
-SRCS=		nv_cursor.c nv_dac.c nv_dga.c nv_driver.c nv_hw.c
-SRCS+=		nv_setup.c nv_shadow.c nv_video.c riva_cursor.c
+SRCS=		nv_cursor.c nv_dac.c nv_dga.c nv_driver.c nv_exa.c nv_hw.c
+SRCS+=		nv_setup.c nv_shadow.c nv_video.c nv_xaa.c riva_cursor.c
 SRCS+=		riva_dac.c riva_dga.c riva_driver.c riva_hw.c
 SRCS+=		riva_setup.c riva_shadow.c g80_cursor.c
 SRCS+=		g80_dac.c g80_display.c g80_dma.c g80_driver.c g80_exa.c
@@ -13,7 +13,7 @@ MAN=		nv.4
 
 # XAA files have generic functions as well
 #.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SRCS+=		nv_xaa.c riva_xaa.c g80_xaa.c
+SRCS+=		riva_xaa.c g80_xaa.c
 #.endif
 
 .if ${MACHINE} == "macppc"

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Tue Jul 10 17:36:38 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
Add missing file to openchrome driver.

Prior to this commit, startx failed with a missing symbol.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.13	Fri Feb  2 01:02:40 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Tue Jul 10 17:36:38 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2018/02/02 01:02:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2018/07/10 17:36:38 maya Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
@@ -24,6 +24,7 @@ SRCS=	\
 	via_tv.c \
 	via_vgahw.c \
 	via_vt162x.c \
+	via_vt1632.c \
 	via_xv_overlay.c \
 	via_xv.c
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Tue Jul 10 17:36:38 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
Add missing file to openchrome driver.

Prior to this commit, startx failed with a missing symbol.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Sat Dec 23 10:15:52 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
Remove duplicates.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.94 src/external/mit/xorg/server/drivers/Makefile:1.95
--- src/external/mit/xorg/server/drivers/Makefile:1.94	Mon Aug  7 06:51:13 2017
+++ src/external/mit/xorg/server/drivers/Makefile	Sat Dec 23 10:15:52 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.94 2017/08/07 06:51:13 mrg Exp $
+#	$NetBSD: Makefile,v 1.95 2017/12/23 10:15:52 nakayama Exp $
 
 .include 
 
@@ -307,19 +307,14 @@ SUBDIR+= \
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 SUBDIR+= \
 	xf86-video-ag10e \
-	xf86-video-glint \
 	xf86-video-sunleo
 .endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 
 .if ${MACHINE} == "sparc"
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
-	xf86-video-pnozz
-.endif  # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-
 SUBDIR+= \
 	xf86-video-suncg14 \
 	xf86-video-suntcx
+
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 SUBDIR+= \
 	xf86-video-pnozz

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

[Takeshi Nakayama]

Module Name:src
Committed By:   nakayama
Date:   Sat Dec 23 10:15:52 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
Remove duplicates.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/external/mit/xorg/server/drivers/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/drivers/xf86-video-openchrome

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep  1 14:38:24 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
more no-error-ssp


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.11	Tue Aug 29 00:58:38 2017
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Fri Sep  1 10:38:23 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2017/08/29 04:58:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2017/09/01 14:38:23 christos Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
@@ -45,6 +45,7 @@ CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR
 
 # XXX
 COPTS.via_dri.c+= -Wno-error
+COPTS.via_display.c+= -Wno-error=stack-protector
 .if ${HAVE_GCC:U0} > 48
 COPTS.via_driver.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 COPTS.via_lvds.c+=	${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Sep  1 14:38:24 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
more no-error-ssp


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-openchrome

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 04:58:38 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
updates for xf86-video-openchrome 0.6.0


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.10	Sun Aug 21 12:39:17 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile	Tue Aug 29 04:58:38 2017
@@ -1,28 +1,31 @@
-#	$NetBSD: Makefile,v 1.10 2016/08/21 12:39:17 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2017/08/29 04:58:38 mrg Exp $
 
 DRIVER=		xf86-video-openchrome
 DRIVER_NAME=	openchrome_drv
 
 SRCS=	\
 	via_3d.c \
-	via_exa.c \
-	via_exa_h2.c \
-	via_exa_h6.c \
-	via_bandwidth.c \
+	via_analog.c \
 	via_ch7xxx.c \
 	via_display.c \
 	via_driver.c \
+	via_exa.c \
+	via_exa_h2.c \
+	via_exa_h6.c \
+	via_fp.c \
 	via_i2c.c \
 	via_id.c \
-	via_lvds.c \
 	via_memcpy.c \
 	via_memmgr.c \
 	via_outputs.c \
-	via_xv_overlay.c \
 	via_ums.c \
+	via_sii164.c \
+	via_tmds.c \
+	via_tv.c \
 	via_vgahw.c \
-	via_xv.c \
-	via_vt162x.c
+	via_vt162x.c \
+	via_xv_overlay.c \
+	via_xv.c
 
 # DRI
 SRCS+=	\

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 29 04:58:38 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile

Log Message:
updates for xf86-video-openchrome 0.6.0


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug  7 06:51:13 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
don't build apm, ark or glint on cats for xorg-server 1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.93 src/external/mit/xorg/server/drivers/Makefile:1.94
--- src/external/mit/xorg/server/drivers/Makefile:1.93	Sat Dec  3 16:38:15 2016
+++ src/external/mit/xorg/server/drivers/Makefile	Mon Aug  7 06:51:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.93 2016/12/03 16:38:15 macallan Exp $
+#	$NetBSD: Makefile,v 1.94 2017/08/07 06:51:13 mrg Exp $
 
 .include 
 
@@ -142,15 +142,12 @@ SUBDIR+= \
 
 .if ${MACHINE} == "cats"
 SUBDIR+= \
-	xf86-video-apm \
-	xf86-video-ark \
 	xf86-video-ast \
 	xf86-video-ati \
 	xf86-video-chips \
 	xf86-video-cirrus \
 	xf86-video-cirrus_alpine \
 	xf86-video-cirrus_laguna \
-	xf86-video-glint \
 	xf86-video-i128 \
 	xf86-video-i740 \
 	xf86-video-mga \
@@ -167,6 +164,12 @@ SUBDIR+= \
 	xf86-video-tseng \
 	xf86-video-vesa \
 	xf86-video-wsfb
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+	xf86-video-apm \
+	xf86-video-ark \
+	xf86-video-glint
+.endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 .endif	# ${MACHINE} == "cats"
 
 .if ${MACHINE} == "dreamcast"

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug  7 06:51:13 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
don't build apm, ark or glint on cats for xorg-server 1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/external/mit/xorg/server/drivers/Makefile

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

Re: CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips

[Christos Zoulas]

In article <14621.1485263...@splode.eterna.com.au>,
matthew green   wrote:
>Joerg Sonnenberger writes:
>> On Thu, Jan 19, 2017 at 11:51:16PM +, Michael Lorenz wrote:
>> > Module Name:   src
>> > Committed By:  macallan
>> > Date:  Thu Jan 19 23:51:16 UTC 2017
>> > 
>> > Modified Files:
>> >src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile
>> > 
>> > Log Message:
>> > build EXA support
>> 
>> https://releng.netbsd.org/builds/HEAD-llvm/201701231020Z/i386.build.failed
>
>please post actual logs -- this URL won't last long.

/home/source/ab/HEAD-llvm/xsrc/external/mit/xf86-video-chips/dist/src/ct_exa.c:195:12:
 error: initializing 'char *' with an expression of type 'unsigned char *' 
converts between pointers to integer types with different sign 
[-Werror,-Wpointer-sign]
char  *dst= cPtr->FbBase + exaGetPixmapOffset(pDst);
   ^~~~
/home/source/ab/HEAD-llvm/xsrc/external/mit/xf86-video-chips/dist/src/ct_exa.c:224:12:
 error: initializing 'char *' with an expression of type 'unsigned char *' 
converts between pointers to integer types with different sign 
[-Werror,-Wpointer-sign]
char  *src= cPtr->FbBase + exaGetPixmapOffset(pSrc);
   ^~~~
2 errors generated.

re: CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips

[matthew green]

Joerg Sonnenberger writes:
> On Thu, Jan 19, 2017 at 11:51:16PM +, Michael Lorenz wrote:
> > Module Name:src
> > Committed By:   macallan
> > Date:   Thu Jan 19 23:51:16 UTC 2017
> > 
> > Modified Files:
> > src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile
> > 
> > Log Message:
> > build EXA support
> 
> https://releng.netbsd.org/builds/HEAD-llvm/201701231020Z/i386.build.failed

please post actual logs -- this URL won't last long.


.mrg.

Re: CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips

[Joerg Sonnenberger]

On Thu, Jan 19, 2017 at 11:51:16PM +, Michael Lorenz wrote:
> Module Name:  src
> Committed By: macallan
> Date: Thu Jan 19 23:51:16 UTC 2017
> 
> Modified Files:
>   src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile
> 
> Log Message:
> build EXA support

https://releng.netbsd.org/builds/HEAD-llvm/201701231020Z/i386.build.failed

Joerg

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Jan 19 23:51:16 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile

Log Message:
build EXA support


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-chips/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/drivers/xf86-video-chips/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.7	Sat Aug 27 03:58:13 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile	Thu Jan 19 23:51:16 2017
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 2016/08/27 03:58:13 macallan Exp $
+#	$NetBSD: Makefile,v 1.8 2017/01/19 23:51:16 macallan Exp $
 
 DRIVER=		xf86-video-chips
 DRIVER_NAME=	chips_drv
 
 SRCS=		ct_accel.c ct_bank.c ct_cursor.c ct_ddc.c ct_dga.c
-SRCS+=		ct_driver.c ct_regs.c ct_shadow.c ct_video.c
+SRCS+=		ct_driver.c ct_exa.c ct_regs.c ct_shadow.c ct_video.c
 SRCS+=		ct_accelmm.c ct_accelhi.c
 MAN=		chips.4
 

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Jan 19 23:51:16 UTC 2017

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile

Log Message:
build EXA support


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-chips/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/drivers/xf86-video-glint

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Dec 10 01:58:36 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile

Log Message:
now we have pm2_exa.c


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-glint/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/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.13	Sat Dec  3 16:41:34 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile	Sat Dec 10 01:58:36 2016
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.13 2016/12/03 16:41:34 macallan Exp $
+#	$NetBSD: Makefile,v 1.14 2016/12/10 01:58:36 macallan Exp $
 
 DRIVER=		xf86-video-glint
 DRIVER_NAME=	glint_drv
 
 SRCS=		glint_dga.c glint_driver.c glint_shadow.c
-SRCS+=		IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c 
+SRCS+=		IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c pm2_exa.c
 SRCS+=		pm2ramdac.c pm2v_dac.c pm2_video.c pm2vramdac.c pm3_accel.c
 SRCS+=		pm3_dac.c pm3_exa.c pm3_video.c pm_accel.c pm_dac.c 
 SRCS+=		sx_accel.c TIramdac.c tx_accel.c tx_dac.c

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-glint

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Dec 10 01:58:36 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile

Log Message:
now we have pm2_exa.c


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-glint/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/drivers/xf86-video-glint

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Dec  3 16:41:34 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile

Log Message:
there is no pm2_exa.c yet


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-glint/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/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.12	Fri Dec  2 22:59:17 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile	Sat Dec  3 16:41:34 2016
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.12 2016/12/02 22:59:17 macallan Exp $
+#	$NetBSD: Makefile,v 1.13 2016/12/03 16:41:34 macallan Exp $
 
 DRIVER=		xf86-video-glint
 DRIVER_NAME=	glint_drv
 
 SRCS=		glint_dga.c glint_driver.c glint_shadow.c
-SRCS+=		IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c pm2_exa.c 
+SRCS+=		IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c 
 SRCS+=		pm2ramdac.c pm2v_dac.c pm2_video.c pm2vramdac.c pm3_accel.c
 SRCS+=		pm3_dac.c pm3_exa.c pm3_video.c pm_accel.c pm_dac.c 
 SRCS+=		sx_accel.c TIramdac.c tx_accel.c tx_dac.c