[src/trunk]: src/external/mit/xorg/server/drivers build the combined cirrus d...

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

details:   https://anonhg.NetBSD.org/src/rev/7672b7e47db8
branches:  trunk
changeset: 368450:7672b7e47db8
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jul 12 02:42:40 2022 +0000

description:
build the combined cirrus driver.

diffstat:

 external/mit/xorg/server/drivers/Makefile                          |  10 +------
 external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile        |   6 +++-
 external/mit/xorg/server/drivers/xf86-video-cirrus_alpine/Makefile |  13 ----------
 external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile |  12 ---------
 4 files changed, 6 insertions(+), 35 deletions(-)

diffs (103 lines):

diff -r 05b79bab5442 -r 7672b7e47db8 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Tue Jul 12 02:10:16 2022 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Tue Jul 12 02:42:40 2022 +0000
@@ -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 <bsd.own.mk>
 
@@ -30,8 +30,6 @@
        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 @@
        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 @@
 .if ${MACHINE} == "bebox"
 SUBDIR+= \
        xf86-video-cirrus \
-       xf86-video-cirrus_alpine \
        xf86-video-mga \
        xf86-video-s3 \
        xf86-video-s3virge
@@ -139,8 +134,6 @@
        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 @@
 .if ${MACHINE} == "prep"
 SUBDIR+= \
        xf86-video-cirrus \
-       xf86-video-cirrus_alpine \
        xf86-video-mga \
        xf86-video-s3
 .endif # ${MACHINE} == "prep"
diff -r 05b79bab5442 -r 7672b7e47db8 external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile       Tue Jul 12 02:10:16 2022 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-cirrus/Makefile       Tue Jul 12 02:42:40 2022 +0000
@@ -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}
diff -r 05b79bab5442 -r 7672b7e47db8 external/mit/xorg/server/drivers/xf86-video-cirrus_alpine/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-cirrus_alpine/Makefile        Tue Jul 12 02:10:16 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#      $NetBSD: Makefile,v 1.3 2008/10/27 20:29:10 veego Exp $
-
-# XXX move this under ../xf86-video-cirrus
-
-DRIVER=                xf86-video-cirrus
-DRIVER_NAME=   cirrus_alpine
-
-SRCS=          alp_driver.c alp.h alp_hwcurs.c alp_i2c.c alp_xaa.c
-SRCS+=         alp_xaam.c
-
-#CPPFLAGS.cir_driver.c=        -DVERSION=${PACKAGE_MAJOR}
-
-.include "../Makefile.xf86-driver"
diff -r 05b79bab5442 -r 7672b7e47db8 external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile        Tue Jul 12 02:10:16 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2016/08/20 05:02:58 mrg Exp $
-
-# XXX move this under ../xf86-video-cirrus
-
-DRIVER=                xf86-video-cirrus
-DRIVER_NAME=   cirrus_laguna
-
-SRCS=          lg_driver.c lg_hwcurs.c lg_i2c.c lg_xaa.c
-
-#CPPFLAGS.lg_driver.c= -Wno-error # XXX
-
-.include "../Makefile.xf86-driver"