Module Name: src
Committed By: rjs
Date: Thu May 21 00:12:10 UTC 2015
Modified Files:
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/server/drivers: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-intel-old: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164:
Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410:
Makefile
Log Message:
Add xf86-video-intel-old to the build.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.65 -r1.66 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile
cvs rdiff -u -r1.848 -r1.849 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.76 src/distrib/sets/lists/xserver/md.amd64:1.77
--- src/distrib/sets/lists/xserver/md.amd64:1.76 Sun Mar 1 07:46:04 2015
+++ src/distrib/sets/lists/xserver/md.amd64 Thu May 21 00:12:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.76 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: md.amd64,v 1.77 2015/05/21 00:12:10 rjs Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -425,6 +425,8 @@
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/intel_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/intel_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ivch_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ivch_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.95 src/distrib/sets/lists/xserver/md.i386:1.96
--- src/distrib/sets/lists/xserver/md.i386:1.95 Sun Mar 1 07:46:04 2015
+++ src/distrib/sets/lists/xserver/md.i386 Thu May 21 00:12:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.95 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: md.i386,v 1.96 2015/05/21 00:12:10 rjs Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -465,6 +465,8 @@
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/intel_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/intel_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ivch_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ivch_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.65 src/external/mit/xorg/server/drivers/Makefile:1.66
--- src/external/mit/xorg/server/drivers/Makefile:1.65 Sun Mar 1 11:19:08 2015
+++ src/external/mit/xorg/server/drivers/Makefile Thu May 21 00:12:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2015/03/01 11:19:08 mrg Exp $
+# $NetBSD: Makefile,v 1.66 2015/05/21 00:12:10 rjs Exp $
# xf86-input drivers
@@ -50,6 +50,7 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-intel \
+ xf86-video-intel-old \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.848 src/share/mk/bsd.own.mk:1.849
--- src/share/mk/bsd.own.mk:1.848 Tue May 12 08:25:28 2015
+++ src/share/mk/bsd.own.mk Thu May 21 00:12:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.848 2015/05/12 08:25:28 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.849 2015/05/21 00:12:10 rjs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1298,7 +1298,7 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
.for _v in \
ag10e apm ark ast ati ati-kms chips cirrus crime \
- geode glint i128 i740 igs imstt intel mach64 mga \
+ geode glint i128 i740 igs imstt intel intel-old mach64 mga \
neomagic newport nsc nv nvxbox openchrome pnozz \
r128 radeonhd rendition \
s3 s3virge savage siliconmotion sis suncg14 \
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.1
--- /dev/null Thu May 21 00:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile Thu May 21 00:12:10 2015
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+
+.include <bsd.own.mk>
+
+DRIVER= xf86-video-intel-old
+DRIVER_NAME= intel_drv_old
+
+SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c
+SRCS+= i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c
+SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c
+SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c
+SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
+SRCS+= i830_hdmi.c i830_i2c.c i830_io.c i830_lvds.c i830_memory.c
+SRCS+= i830_modes.c i830_sdvo.c i830_tv.c i830_uxa.c i830_video.c
+SRCS+= i915_3d.c i915_video.c i965_video.c
+SRCS+= i830_render.c i915_render.c i965_render.c
+SRCS+= i830_dri.c
+#SRCS+= i830_hwmc.c i915_hwmc.c i965_hwmc.c
+
+# uxa
+.PATH: ${X11SRCDIR.${DRIVER}}/uxa
+SRCS+= uxa-accel.c uxa-unaccel.c uxa-glyphs.c uxa-render.c uxa.c
+
+MAN= intel.4
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/uxa
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/render_program
+#CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/xvmc
+CPPFLAGS+= -DI830_XV # -DINTEL_XVMC
+
+LDADD+= -ldrm_intel
+
+.include "../Makefile.xf86-driver"
+
+SUBDIR= ch7017 ch7xxx ivch sil164 tfp410
+
+CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
+ -Wno-empty-body -Wno-error
+
+.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile:1.1
--- /dev/null Thu May 21 00:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile Thu May 21 00:12:10 2015
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+
+DRIVER= xf86-video-intel-old
+DRIVER_NAME= ch7017_drv
+
+
+SRCS= ch7017_module.c ch7017.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+
+.include "../../Makefile.xf86-driver"
+.PATH: ${X11SRCDIR.${DRIVER}}/src/ch7017
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile:1.1
--- /dev/null Thu May 21 00:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile Thu May 21 00:12:10 2015
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+
+DRIVER= xf86-video-intel-old
+DRIVER_NAME= ch7xxx_drv
+
+
+SRCS= ch7xxx_module.c ch7xxx.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+
+.include "../../Makefile.xf86-driver"
+.PATH: ${X11SRCDIR.${DRIVER}}/src/ch7xxx
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile:1.1
--- /dev/null Thu May 21 00:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile Thu May 21 00:12:10 2015
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+
+DRIVER= xf86-video-intel-old
+DRIVER_NAME= ivch_drv
+
+
+SRCS= ivch_module.c ivch.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+
+.include "../../Makefile.xf86-driver"
+.PATH: ${X11SRCDIR.${DRIVER}}/src/ivch
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile:1.1
--- /dev/null Thu May 21 00:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile Thu May 21 00:12:10 2015
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+
+DRIVER= xf86-video-intel-old
+DRIVER_NAME= sil164_drv
+
+
+SRCS= sil164_module.c sil164.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+
+.include "../../Makefile.xf86-driver"
+.PATH: ${X11SRCDIR.${DRIVER}}/src/sil164
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile:1.1
--- /dev/null Thu May 21 00:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile Thu May 21 00:12:10 2015
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+
+DRIVER= xf86-video-intel-old
+DRIVER_NAME= tfp410_drv
+
+
+SRCS= tfp410_module.c tfp410.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+
+.include "../../Makefile.xf86-driver"
+.PATH: ${X11SRCDIR.${DRIVER}}/src/tfp410
