re: CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nv
"Taylor R Campbell" writes: > Module Name: src > Committed By: riastradh > Date: Tue Jul 23 07:52:06 UTC 2024 > > Modified Files: > src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile > > Log Message: > xf86-video-nv: Don't fail on -Wpointer-sign with clang. > > Not sure why this isn't disabled by default (surely this very old > code hasn't been clean for it in a long time?), but with any luck > this should resolve clang build failures like: thanks. may as well revert the attempt(s) to avoid this warning in the code now. it was updated recently, actually, and this specific line changed in upstream and needed a merge, and then i had one attempt to fix the warning that clearly didn't work. .mrg.
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src Committed By: riastradh Date: Tue Jul 23 07:52:06 UTC 2024 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile Log Message: xf86-video-nv: Don't fail on -Wpointer-sign with clang. Not sure why this isn't disabled by default (surely this very old code hasn't been clean for it in a long time?), but with any luck this should resolve clang build failures like: /home/source/ab/HEAD-llvm/xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1557:40: error: passing 'char *' to parameter of type 'CARD8 *' (aka 'unsigned char *') converts between pointers to integer types where one is of the unique plain 'char' type and the other is not [-Werror,-Wpointer-sign] vgaHWSetMmioFuncs(VGAHWPTR(pScrn), (char *)pNv->IOAddress, 0); ^~ /home/builds/ab/HEAD-llvm/macppc/202407182350Z-dest/usr/X11R7/include/xorg/vgaHW.h:189:62: note: passing argument to parameter 'base' here extern _X_EXPORT void vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset); ^ 1 error generated. --- nv_driver.pico --- *** Failed target: nv_driver.pico *** In directory: /home/source/ab/HEAD-llvm/src/external/mit/xorg/server/drivers/xf86-video-nv To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ 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
Module Name:src
Committed By: riastradh
Date: Tue Jul 23 07:52:06 UTC 2024
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
xf86-video-nv: Don't fail on -Wpointer-sign with clang.
Not sure why this isn't disabled by default (surely this very old
code hasn't been clean for it in a long time?), but with any luck
this should resolve clang build failures like:
/home/source/ab/HEAD-llvm/xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1557:40:
error: passing 'char *' to parameter of type 'CARD8 *' (aka 'unsigned char *')
converts between pointers to integer types where one is of the unique plain
'char' type and the other is not [-Werror,-Wpointer-sign]
vgaHWSetMmioFuncs(VGAHWPTR(pScrn), (char *)pNv->IOAddress, 0);
^~
/home/builds/ab/HEAD-llvm/macppc/202407182350Z-dest/usr/X11R7/include/xorg/vgaHW.h:189:62:
note: passing argument to parameter 'base' here
extern _X_EXPORT void vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset);
^
1 error generated.
--- nv_driver.pico ---
*** Failed target: nv_driver.pico
*** In directory:
/home/source/ab/HEAD-llvm/src/external/mit/xorg/server/drivers/xf86-video-nv
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
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.14 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.14 Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Tue Jul 23 07:52:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/12/31 12:13:50 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2024/07/23 07:52:06 riastradh Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -33,6 +33,7 @@ CPPFLAGS+= -DAVOID_VGAHW
# XXX
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=pointer-sign :}
COPTS.g80_dac.c+= -Wno-error # XXX deprecated
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo
Module Name:src Committed By: mrg Date: Thu Jul 4 07:49:16 UTC 2024 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo: Makefile Log Message: helpers.c no longer exists (it was unused anyway.) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ 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. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile:1.2 --- src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile:1.1 Thu Jan 10 00:05:57 2019 +++ src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile Thu Jul 4 07:49:16 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/01/10 00:05:57 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2024/07/04 07:49:16 mrg Exp $ DRIVER= xf86-video-vboxvideo DRIVER_NAME= vboxvideo_drv @@ -11,7 +11,6 @@ SRCS= \ VBVABase.c \ edid.c \ getmode.c \ - helpers.c \ hgsmimemalloc.c \ pointer.c \ setmode.c \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo
Module Name:src Committed By: mrg Date: Thu Jul 4 07:49:16 UTC 2024 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo: Makefile Log Message: helpers.c no longer exists (it was unused anyway.) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ 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
Module Name:src
Committed By: mrg
Date: Sat Jun 22 23:21:56 UTC 2024
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
normalise some comment styles.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 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.112 src/external/mit/xorg/server/drivers/Makefile:1.113
--- src/external/mit/xorg/server/drivers/Makefile:1.112 Sat Jun 22 23:20:39 2024
+++ src/external/mit/xorg/server/drivers/Makefile Sat Jun 22 23:21:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2024/06/22 23:20:39 mrg Exp $
+# $NetBSD: Makefile,v 1.113 2024/06/22 23:21:56 mrg Exp $
.include
@@ -56,6 +56,8 @@ SUBDIR+= \
xf86-video-vesa \
xf86-video-wsfb
+# XXX add -qxl, also for arm?
+
# needs porting for xorg-server 1.6
# xf86-video-imstt
# xf86-video-rendition
@@ -99,8 +101,18 @@ SUBDIR+= \
xf86-video-trident \
xf86-video-tseng \
xf86-video-wsfb
+
+# needs porting for xorg-server 1.6
# xf86-video-imstt
-# needs porting for xorg-server 1.18, and 21.1
+
+# needs porting for xorg-server 1.18
+# xf86-video-apm
+# xf86-video-glint
+
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-apm \
@@ -108,6 +120,7 @@ SUBDIR+= \
xf86-video-s3 \
xf86-video-tga
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+
.endif # ${MACHINE} == "alpha"
.if ${MACHINE} == "amiga"
@@ -153,7 +166,7 @@ SUBDIR+= \
# xf86-video-tga
# needs porting for xorg-server 1.18
-# xf86-video-apm \
+# xf86-video-apm
# xf86-video-glint
.endif # ${MACHINE} == "cats"
@@ -242,9 +255,11 @@ SUBDIR+= \
xf86-video-tdfx \
xf86-video-wsfb
+# needs porting for xorg-server 1.6
+# xf86-video-imstt
+
# needs porting for xorg-server 21.1.3
# xf86-video-glint
-# xf86-video-imstt
.endif # ${MACHINE} == "macppc"
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Sat Jun 22 23:21:56 UTC 2024 Modified Files: src/external/mit/xorg/server/drivers: Makefile Log Message: normalise some comment styles. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 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-input-keyboard
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
Re: CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips
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
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
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
Re: CVS commit: src/external/mit/xorg/server/drivers
> Modified Files:
> src/external/mit/xorg/server/drivers: Makefile
>
> Log Message:
> fix a comment
Hmm, it's also better to sort by ${MACHINE} name.
---
Izumi Tsutsui
re: CVS commit: src/external/mit/xorg/server/drivers
> > > XXX3: should we have common definitions for MI PCI video drivers?
> >
> > i'm not sure what this question is asking.
>
> I wondered if we should merge too many duplicated lines
> among alpha/cats/x86 etc.
> (alpha and cats have x86 BIOS emulation in their firmware for PCI VGA)
ah, i'd do something like having (the proposed) Makefile.{alpha,cats}
defining some variable that Makefile uses? maybe, depends on what
the result looked like i guess.
.mrg.
Re: CVS commit: src/external/mit/xorg/server/drivers
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hello,
On Oct 23, 2010, at 11:27 AM, Izumi Tsutsui wrote:
Module Name:src
Committed By: tsutsui
Date: Sat Oct 23 15:27:50 UTC 2010
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
Reorder SUBDIR entries to make this more maintainable/readable:
- put xf86-input drivers first then xf86-video
- put x86 (i386/amd64) first then other ${MACHINE}s in alphabetical
order
XXX1: is it better to use Makefile.${MACHINE} (or something else)?
Probably.
XXX2: should all ports include xf86-video-wsfb unconditionally?
At least those that can have graphics hardware with a mappable
framebuffer. Can anyone think of any that would be excluded by this?
have fun
Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (Darwin)
iQEVAwUBTMNn8spnzkX8Yg2nAQJNrwgAnD8Ay6U59l6td6yptbbgfLw288y3Pfyl
gMyerEYsZqBp4DBuyAeZ5ml783MVN8JxELCo8ySIBE4H+vs530SKTRR2vyZJ/3iB
XmMhFVzpvnoXpuAviNYF6Ute4xT0I4JxQsrk0T7vfybDbVSage1rIgnIqxqlGP0E
n1jOQFC8LGpybKoHPblwXWKYwKi7mLP51fcivjlYSK+uPMjfypD7IjRsA0RJxq93
yPyRs2oaiEzsMrVCQX/MY7NCbjjX41TzWxOs4fyTcxl9LV7A6/5hKev8fgc/csnF
W9h3mMjcXVV/ISs5UtUY21RSu9NgtGFRnVmmVa/CPEEdzTzzknN7Ew==
=h20O
-END PGP SIGNATURE-
Re: CVS commit: src/external/mit/xorg/server/drivers
> > XXX2: should all ports include xf86-video-wsfb unconditionally? > > does it apply to all ports? Some ports don't need it, but I guess most legacy ports need only wsfb and having unused ones is harmless. (should we use the previous .if/.elif/.else/.endif for the default case?) > > XXX3: should we have common definitions for MI PCI video drivers? > > i'm not sure what this question is asking. I wondered if we should merge too many duplicated lines among alpha/cats/x86 etc. (alpha and cats have x86 BIOS emulation in their firmware for PCI VGA) --- Izumi Tsutsui
re: CVS commit: src/external/mit/xorg/server/drivers
> Module Name: src
> Committed By: tsutsui
> Date: Sat Oct 23 15:27:50 UTC 2010
>
> Modified Files:
> src/external/mit/xorg/server/drivers: Makefile
>
> Log Message:
> Reorder SUBDIR entries to make this more maintainable/readable:
> - put xf86-input drivers first then xf86-video
> - put x86 (i386/amd64) first then other ${MACHINE}s in alphabetical order
thanks for this and the other clean up.
> XXX1: is it better to use Makefile.${MACHINE} (or something else)?
that seems like an idea.
> XXX2: should all ports include xf86-video-wsfb unconditionally?
does it apply to all ports?
> XXX3: should we have common definitions for MI PCI video drivers?
i'm not sure what this question is asking.
.mrg.
re: CVS commit: src/external/mit/xorg/server/drivers/xf86-video-suncg14
Module Name: src Committed By:macallan Date:Sun Mar 14 01:13:16 UTC 2010 Added Files: src/external/mit/xorg/server/drivers/xf86-video-suncg14: Makefile Log Message: apparently I forgot to commit this thanks to uwe & mrg for hitting me over the head with the error log thanks! now my sparc world builds again... :) .mrg.
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: macallan Date: Thu Feb 11 04:07:17 UTC 2010 Modified Files: src/external/mit/xorg/server/drivers: Makefile Log Message: build the suncg14 driver on sparc To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 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.
