Module Name: src
Committed By: riastradh
Date: Thu Apr 3 02:51:20 UTC 2014
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/lib/libI810XvMC: Makefile
src/external/mit/xorg/lib/libIntelXvMC: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
Update reachover makefiles and set lists for xf86-video-intel 2.21.15.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xdebug/md.amd64 \
src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libI810XvMC/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libIntelXvMC/Makefile
cvs rdiff -u -r1.11 -r1.12 \
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/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.5 src/distrib/sets/lists/xdebug/md.amd64:1.6
--- src/distrib/sets/lists/xdebug/md.amd64:1.5 Wed Jun 5 06:27:51 2013
+++ src/distrib/sets/lists/xdebug/md.amd64 Thu Apr 3 02:51:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.5 2013/06/05 06:27:51 mrg Exp $
+# $NetBSD: md.amd64,v 1.6 2014/04/03 02:51:19 riastradh Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -82,8 +82,8 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug
@@ -92,7 +92,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug obsolete xorg,obsolete
@@ -150,11 +150,11 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sis_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.5 src/distrib/sets/lists/xdebug/md.i386:1.6
--- src/distrib/sets/lists/xdebug/md.i386:1.5 Wed Jun 5 06:27:51 2013
+++ src/distrib/sets/lists/xdebug/md.i386 Thu Apr 3 02:51:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.5 2013/06/05 06:27:51 mrg Exp $
+# $NetBSD: md.i386,v 1.6 2014/04/03 02:51:19 riastradh Exp $
./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11
@@ -128,8 +128,8 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug
@@ -140,7 +140,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug obsolete xorg,obsolete
@@ -200,11 +200,11 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sis_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.72 src/distrib/sets/lists/xserver/md.amd64:1.73
--- src/distrib/sets/lists/xserver/md.amd64:1.72 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.amd64 Thu Apr 3 02:51:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.72 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.amd64,v 1.73 2014/04/03 02:51:20 riastradh Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -395,10 +395,10 @@
./usr/X11R7/lib/modules/drivers/ast_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
@@ -423,8 +423,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/ivch_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ivch_drv.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
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
@@ -453,16 +453,16 @@
./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/sil164_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/sil164_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/sil164_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/sil164_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tfp410_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tfp410_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.91 src/distrib/sets/lists/xserver/md.i386:1.92
--- src/distrib/sets/lists/xserver/md.i386:1.91 Thu Jan 2 16:46:40 2014
+++ src/distrib/sets/lists/xserver/md.i386 Thu Apr 3 02:51:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.91 2014/01/02 16:46:40 tho Exp $
+# $NetBSD: md.i386,v 1.92 2014/04/03 02:51:20 riastradh Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -431,10 +431,10 @@
./usr/X11R7/lib/modules/drivers/ast_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
@@ -463,8 +463,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/ivch_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ivch_drv.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
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
@@ -493,16 +493,16 @@
./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/sil164_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/sil164_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/sil164_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/sil164_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tfp410_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tfp410_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so -unknown- xorg
Index: src/external/mit/xorg/lib/libI810XvMC/Makefile
diff -u src/external/mit/xorg/lib/libI810XvMC/Makefile:1.2 src/external/mit/xorg/lib/libI810XvMC/Makefile:1.3
--- src/external/mit/xorg/lib/libI810XvMC/Makefile:1.2 Wed Jan 19 01:52:44 2011
+++ src/external/mit/xorg/lib/libI810XvMC/Makefile Thu Apr 3 02:51:20 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/01/19 01:52:44 jakllsch Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/03 02:51:20 riastradh Exp $
.include <bsd.own.mk>
LIB= I810XvMC
-.PATH: ${X11SRCDIR.xf86-video-intel}/src/xvmc
+.PATH: ${X11SRCDIR.xf86-video-intel}/src/legacy/i810/xvmc
SRCS= I810XvMC.c
Index: src/external/mit/xorg/lib/libIntelXvMC/Makefile
diff -u src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.2 src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.3
--- src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.2 Thu Aug 11 23:15:38 2011
+++ src/external/mit/xorg/lib/libIntelXvMC/Makefile Thu Apr 3 02:51:20 2014
@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/03 02:51:20 riastradh Exp $
.include <bsd.own.mk>
LIB= IntelXvMC
#MKLINT= no
-.PATH: ${X11SRCDIR.xf86-video-intel}/src/xvmc
+.PATH: ${X11SRCDIR.xf86-video-intel}/xvmc
-SRCS= intel_xvmc.c \
- intel_xvmc_dump.c \
- i915_xvmc.c \
- i965_xvmc.c \
- intel_batchbuffer.c \
- xf86dri.c
+SRCS+= intel_xvmc.c
+SRCS+= intel_xvmc_dump.c
+SRCS+= i915_xvmc.c
+SRCS+= i965_xvmc.c
+SRCS+= xvmc_vld.c
+SRCS+= intel_batchbuffer.c
CPPFLAGS+= ${X11FLAGS.THREADLIB} \
- -DHAVE_XEXTPROTO_71 \
- -DXSERVER_LIBPCIACCESS \
-DTRUE=1 -DFALSE=0
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xf86-video-intel}/src
-LIBDPLIBS= Xext ${.CURDIR}/../libXext \
- X11 ${.CURDIR}/../libX11/dynamic \
- Xv ${.CURDIR}/../libXv \
- XvMC ${.CURDIR}/../libXvMC \
- drm ${.CURDIR}/../libdrm
+LIBDPLIBS= Xext ${.CURDIR}/../libXext \
+ X11 ${.CURDIR}/../libX11/dynamic \
+ Xv ${.CURDIR}/../libXv \
+ XvMC ${.CURDIR}/../libXvMC \
+ drm ${.CURDIR}/../libdrm \
+ drm_intel ${.CURDIR}/../libdrm_intel \
+ xcb ${.CURDIR}/../libxcb/libxcb
CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-format -Wno-parentheses
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.11 Wed Oct 16 15:28:27 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Apr 3 02:51:20 2014
@@ -1,32 +1,160 @@
-# $NetBSD: Makefile,v 1.11 2013/10/16 15:28:27 martin Exp $
+# $NetBSD: Makefile,v 1.12 2014/04/03 02:51:20 riastradh Exp $
+
+.include <bsd.own.mk>
DRIVER= xf86-video-intel
DRIVER_NAME= intel_drv
-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_video.c i830_sdvo.c i830_tv.c
-SRCS+= i915_3d.c i915_video.c i965_video.c
-SRCS+= i830_xaa.c i830_render.c i915_render.c i965_render.c
-SRCS+= i830_dri.c i830_exa.c
-SRCS+= i830_hwmc.c i915_hwmc.c i965_hwmc.c
+# main module
+SRCS+= intel_device.c
+SRCS+= intel_options.c
+SRCS+= intel_module.c
+
+# legacy/i810
+.PATH: ${X11SRCDIR.${DRIVER}}/src/legacy/i810
+SRCS+= i810_accel.c
+SRCS+= i810_cursor.c
+SRCS+= i810_driver.c
+SRCS+= i810_memory.c
+SRCS+= i810_video.c
+SRCS+= i810_wmark.c
+
+SRCS+= i810_xaa.c
+SRCS+= i810_dga.c
+SRCS+= i810_dri.c
+SRCS+= i810_hwmc.c
+
+# sna
+.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
+SRCS+= blt.c
+SRCS+= kgem.c
+SRCS+= sna_accel.c
+SRCS+= sna_blt.c
+SRCS+= sna_composite.c
+SRCS+= sna_cpu.c
+SRCS+= sna_damage.c
+SRCS+= sna_display.c
+SRCS+= sna_display_fake.c
+SRCS+= sna_driver.c
+SRCS+= sna_glyphs.c
+SRCS+= sna_gradient.c
+SRCS+= sna_io.c
+SRCS+= sna_render.c
+SRCS+= sna_stream.c
+SRCS+= sna_trapezoids.c
+SRCS+= sna_tiling.c
+SRCS+= sna_transform.c
+SRCS+= sna_threads.c
+SRCS+= sna_vertex.c
+SRCS+= sna_video.c
+SRCS+= sna_video_overlay.c
+SRCS+= sna_video_sprite.c
+SRCS+= sna_video_textured.c
+SRCS+= gen2_render.c
+SRCS+= gen3_render.c
+SRCS+= gen4_render.c
+SRCS+= gen4_source.c
+SRCS+= gen4_vertex.c
+SRCS+= gen5_render.c
+SRCS+= gen6_render.c
+SRCS+= gen7_render.c
+
+SRCS+= sna_dri.c
+
+SRCS+= sna_video_hwmc.c
+
+# sna/brw
+.PATH: ${X11SRCDIR.${DRIVER}}/src/sna/brw
+SRCS+= brw_disasm.c
+SRCS+= brw_eu.c
+SRCS+= brw_eu_emit.c
+SRCS+= brw_sf.c
+SRCS+= brw_wm.c
+
+# sna/fb
+.PATH: ${X11SRCDIR.${DRIVER}}/src/sna/fb
+SRCS+= fbarc.c
+SRCS+= fbbitmap.c
+SRCS+= fbblt.c
+SRCS+= fbbltone.c
+SRCS+= fbclip.c
+SRCS+= fbcopy.c
+SRCS+= fbfill.c
+SRCS+= fbgc.c
+SRCS+= fbglyph.c
+SRCS+= fbimage.c
+SRCS+= fbline.c
+SRCS+= fbpict.c
+SRCS+= fbpoint.c
+SRCS+= fbpush.c
+SRCS+= fbseg.c
+SRCS+= fbspan.c
+SRCS+= fbstipple.c
+SRCS+= fbtile.c
+SRCS+= fbutil.c
+
+# uxa
+.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
+SRCS+= intel_batchbuffer.c
+SRCS+= intel_display.c
+SRCS+= intel_driver.c
+SRCS+= intel_memory.c
+SRCS+= intel_uxa.c
+SRCS+= intel_video.c
+SRCS+= i830_3d.c
+SRCS+= i830_render.c
+SRCS+= i915_3d.c
+SRCS+= i915_render.c
+SRCS+= i915_video.c
+SRCS+= i965_3d.c
+SRCS+= i965_video.c
+SRCS+= i965_render.c
+SRCS+= uxa.c
+SRCS+= uxa-accel.c
+SRCS+= uxa-glyphs.c
+SRCS+= uxa-render.c
+SRCS+= uxa-unaccel.c
+
+#SRCS+= intel_glamor.c
+
+SRCS+= intel_dri.c
+
+SRCS+= intel_hwmc.c
+
MAN= intel.4
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DINTEL_XVMC
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/render_program
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
+
+# Use the Intel-style __sync_* atomic primitives.
+CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
+
+CPPFLAGS+= -DENABLE_XVMC
+CPPFLAGS+= -DUSE_SNA
+CPPFLAGS+= -DUSE_UXA
+CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA
+
+CPPFLAGS+= -DHAVE_DRI1
+CPPFLAGS+= -DHAVE_DRI2_H
+CPPFLAGS+= -DHAVE_XAA_H
+
+# XXX This should not be hard-coded here...
+DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
+CPPFLAGS+= -DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
+
+# XXX Probably better to set this in Makefile.xf86-driver, conditional
+# on ELF &c.
+CFLAGS+= -fvisibility=hidden
-LDADD+= -ldrm_intel
+LIBDPLIBS+= drm_intel ${.CURDIR}/../../../lib/libdrm_intel
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
.include "../Makefile.xf86-driver"
-SUBDIR= ch7017 ch7xxx ivch sil164 tfp410
-
CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
-Wno-empty-body -Wno-error
