Sat Mar 10 21:37:56 2012 UTC ()
Pull up following revision(s) (requested by tron in ticket #108):
	external/mit/xorg/lib/dri/dri.mk: revision 1.12
Link with "libexpat" again. This should fix the problems with X11 server
reported by Gary Duzan on the "current-users" mailing list.


(riz)
diff -r1.10.8.1 -r1.10.8.2 src/external/mit/xorg/lib/dri/dri.mk
cvs diff -r1.10.8.1 -r1.10.8.2 src/external/mit/xorg/lib/dri/Attic/dri.mk (switch to unified diff)

--- src/external/mit/xorg/lib/dri/Attic/dri.mk 2012/03/02 18:27:50 1.10.8.1
+++ src/external/mit/xorg/lib/dri/Attic/dri.mk 2012/03/10 21:37:55 1.10.8.2
@@ -1,51 +1,52 @@ @@ -1,51 +1,52 @@
1# $NetBSD: dri.mk,v 1.10.8.1 2012/03/02 18:27:50 riz Exp $ 1# $NetBSD: dri.mk,v 1.10.8.2 2012/03/10 21:37:55 riz Exp $
2 2
3# XXX DRI_LIB_DEPS 3# XXX DRI_LIB_DEPS
4 4
5LIBISMODULE= yes 5LIBISMODULE= yes
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9SHLIB_MAJOR= 0 9SHLIB_MAJOR= 0
10 10
11CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \ 11CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
12 -I${X11SRCDIR.MesaLib}/src/mesa/glapi \ 12 -I${X11SRCDIR.MesaLib}/src/mesa/glapi \
13 -I${X11SRCDIR.MesaLib}/src/mesa/shader \ 13 -I${X11SRCDIR.MesaLib}/src/mesa/shader \
14 -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \ 14 -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
15 -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \ 15 -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
16 -I${X11SRCDIR.MesaLib}/src/mesa \ 16 -I${X11SRCDIR.MesaLib}/src/mesa \
17 -I${X11SRCDIR.MesaLib}/include \ 17 -I${X11SRCDIR.MesaLib}/include \
18 -I${DESTDIR}${X11INCDIR}/libdrm \ 18 -I${DESTDIR}${X11INCDIR}/libdrm \
19 -I${DESTDIR}${X11INCDIR}/X11 19 -I${DESTDIR}${X11INCDIR}/X11
20 20
21CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \ 21CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
22 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \ 22 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
23 -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN 23 -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
24 24
25CPPFLAGS+= -Wno-stack-protector 25CPPFLAGS+= -Wno-stack-protector
26 26
27.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE} ${DRI_EXTRA_PATHS} 27.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE} ${DRI_EXTRA_PATHS}
28 28
29# Common sources 29# Common sources
30.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \ 30.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
31 ${X11SRCDIR.MesaLib}/src/mesa/drivers/common 31 ${X11SRCDIR.MesaLib}/src/mesa/drivers/common
32.if (${MODULE} == "swrast") 32.if (${MODULE} == "swrast")
33SRCS+= driverfuncs.c utils.c 33SRCS+= driverfuncs.c utils.c
34.else 34.else
35SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c 35SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
36SRCS+= dri_metaops.c 36SRCS+= dri_metaops.c
37SRCS+= utils.c vblank.c xmlconfig.c 37SRCS+= utils.c vblank.c xmlconfig.c
38.endif 38.endif
39 39
40.include <bsd.x11.mk> 40.include <bsd.x11.mk>
41 41
42LIB= ${MODULE}_dri 42LIB= ${MODULE}_dri
43LIBDIR= ${X11USRLIBDIR}/modules/dri 43LIBDIR= ${X11USRLIBDIR}/modules/dri
44 44
45LIBDPLIBS+= drm ${.CURDIR}/../../libdrm 45LIBDPLIBS+= drm ${.CURDIR}/../../libdrm
 46LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
46LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm 47LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
47LIBDPLIBS+= mesa_dri ${.CURDIR}/../libmesa 48LIBDPLIBS+= mesa_dri ${.CURDIR}/../libmesa
48# to find mesa_dri.so 49# to find mesa_dri.so
49LDFLAGS+= -Wl,-rpath,${LIBDIR} 50LDFLAGS+= -Wl,-rpath,${LIBDIR}
50 51
51.include <bsd.lib.mk> 52.include <bsd.lib.mk>