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 <bsd.own.mk>
@@ -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}
