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