[src/trunk]: src/external/mit/xorg/server/drivers build fixes for xorg-server...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a12486e6ca95
branches:  trunk
changeset: 995672:a12486e6ca95
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jan 01 00:37:06 2019 +0000

description:
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

diffstat:

 external/mit/xorg/server/drivers/xf86-video-geode/Makefile      |  3 ++-
 external/mit/xorg/server/drivers/xf86-video-intel/Makefile      |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile    |  5 ++---
 external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile |  7 ++-----
 external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile |  8 ++------
 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile     |  8 +++-----
 6 files changed, 13 insertions(+), 22 deletions(-)

diffs (149 lines):

diff -r fadbb0fa64f0 -r a12486e6ca95 external/mit/xorg/server/drivers/xf86-video-geode/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-geode/Makefile        Mon Dec 31 21:38:53 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-geode/Makefile        Tue Jan 01 00:37:06 2019 +0000
@@ -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 @@
 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 \
diff -r fadbb0fa64f0 -r a12486e6ca95 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Mon Dec 31 21:38:53 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Tue Jan 01 00:37:06 2019 +0000
@@ -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 <bsd.own.mk>
 
@@ -182,6 +182,7 @@
 # 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 &c.
@@ -210,4 +211,3 @@
 
 COPTS.sna_display.c+=          -Wno-error      # XXX deprecated
 COPTS.intel_driver.c+=         -Wno-error      # XXX deprecated
-COPTS.intel_display.c+=                -Wno-error      # XXX deprecated
diff -r fadbb0fa64f0 -r a12486e6ca95 external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile      Mon Dec 31 21:38:53 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile      Tue Jan 01 00:37:06 2019 +0000
@@ -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 @@
 .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
diff -r fadbb0fa64f0 -r a12486e6ca95 external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile   Mon Dec 31 21:38:53 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile   Tue Jan 01 00:37:06 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2018/12/31 21:38:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2019/01/01 00:37:06 mrg Exp $
 
 DRIVER=                xf86-video-openchrome
 DRIVER_NAME=   openchrome_drv
@@ -41,16 +41,13 @@
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src
 CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+=     -DHAVE_XF86_CURSOR_RESET_CURSOR
 
 .include "../Makefile.xf86-driver"
 
 # XXX
-COPTS.via_dri.c+= -Wno-error
 COPTS.via_display.c+= -Wno-error=stack-protector
 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
diff -r fadbb0fa64f0 -r a12486e6ca95 external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile   Mon Dec 31 21:38:53 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile   Tue Jan 01 00:37:06 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2018/12/30 08:34:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2019/01/01 00:37:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -16,8 +16,7 @@
                -DHAVE_XF86_CURSOR_RESET_CURSOR \
                -DHAVE_DRI3_H \
                -DHAVE_MISYNCSHM_H \
-               -DHAVE_PRESENT_H \
-               -DHAVE_XF86_CURSOR_RESET_CURSOR
+               -DHAVE_PRESENT_H
 .endif
 
 SRCS.EXA=      radeon_exa.c r600_exa.c r6xx_accel.c \
@@ -56,7 +55,4 @@
 
 LIBDPLIBS+=    gbm ${.CURDIR}/../../../lib/libgbm
 
-# XXX
-COPTS+=        -Wno-error
-
 .include "../Makefile.xf86-driver"
diff -r fadbb0fa64f0 -r a12486e6ca95 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile       Mon Dec 31 21:38:53 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile       Tue Jan 01 00:37:06 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.21 2019/01/01 00:37:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -54,13 +54,14 @@
 
 CPPFLAGS+=     -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
                -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER \
-               -DHAVE_CONFIG_H
+               -DHAVE_CONFIG_H -DHAVE_XF86_CURSOR_RESET_CURSOR
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/dri \
                -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${X11SRCDIR.${DRIVER}}/../include \
                -I${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+
 .if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
 CPPFLAGS+=     -DHAVE_XORG_LIST
 # XXX These have been copied from xorg-server 1.10.6.
@@ -68,7 +69,4 @@
 .PATH:         ${X11SRCDIR.${DRIVER}}/../xorg-server-copy
 .endif
 
-# XXX
-COPTS+=        -Wno-error
-
 .include "../Makefile.xf86-driver"