From b596b9b9be41fe634458b860bf4b76e28818fed1 Mon Sep 17 00:00:00 2001 From: rjs Date: Thu, 21 May 2015 00:12:10 +0000 Subject: [PATCH] Add xf86-video-intel-old to the build. --- distrib/sets/lists/xserver/md.amd64 | 4 +- distrib/sets/lists/xserver/md.i386 | 4 +- external/mit/xorg/server/drivers/Makefile | 3 +- .../drivers/xf86-video-intel-old/Makefile | 43 +++++++++++++++++++ .../xf86-video-intel-old/ch7017/Makefile | 13 ++++++ .../xf86-video-intel-old/ch7xxx/Makefile | 13 ++++++ .../xf86-video-intel-old/ivch/Makefile | 13 ++++++ .../xf86-video-intel-old/sil164/Makefile | 13 ++++++ .../xf86-video-intel-old/tfp410/Makefile | 13 ++++++ share/mk/bsd.own.mk | 4 +- 10 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile create mode 100644 external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile create mode 100644 external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile create mode 100644 external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile create mode 100644 external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile create mode 100644 external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile diff --git a/distrib/sets/lists/xserver/md.amd64 b/distrib/sets/lists/xserver/md.amd64 index c73f4679c0be..0087bee1dbb5 100644 --- a/distrib/sets/lists/xserver/md.amd64 +++ b/distrib/sets/lists/xserver/md.amd64 @@ -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 diff --git a/distrib/sets/lists/xserver/md.i386 b/distrib/sets/lists/xserver/md.i386 index 47be7adb8e92..a99969cefde2 100644 --- a/distrib/sets/lists/xserver/md.i386 +++ b/distrib/sets/lists/xserver/md.i386 @@ -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 diff --git a/external/mit/xorg/server/drivers/Makefile b/external/mit/xorg/server/drivers/Makefile index 1dbc9653fbf6..f604f40df1ea 100644 --- a/external/mit/xorg/server/drivers/Makefile +++ b/external/mit/xorg/server/drivers/Makefile @@ -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 \ diff --git a/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile new file mode 100644 index 000000000000..6c45bb4ff00f --- /dev/null +++ b/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile @@ -0,0 +1,43 @@ +# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $ + +.include + +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 diff --git a/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile new file mode 100644 index 000000000000..0d80421e7ee1 --- /dev/null +++ b/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7017/Makefile @@ -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 diff --git a/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile new file mode 100644 index 000000000000..c9faaccf19f4 --- /dev/null +++ b/external/mit/xorg/server/drivers/xf86-video-intel-old/ch7xxx/Makefile @@ -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 diff --git a/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile new file mode 100644 index 000000000000..5086434997d8 --- /dev/null +++ b/external/mit/xorg/server/drivers/xf86-video-intel-old/ivch/Makefile @@ -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 diff --git a/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile new file mode 100644 index 000000000000..7bcc2e2fb5cf --- /dev/null +++ b/external/mit/xorg/server/drivers/xf86-video-intel-old/sil164/Makefile @@ -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 diff --git a/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile new file mode 100644 index 000000000000..7a65d13d7a54 --- /dev/null +++ b/external/mit/xorg/server/drivers/xf86-video-intel-old/tfp410/Makefile @@ -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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 4ebb3a83dbbc..84b82571b824 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist .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 \