Module Name: src
Committed By: gsutre
Date: Wed Oct 3 21:50:14 UTC 2012
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
Enable GLX DRI2 support.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/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/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.12 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.13
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.12 Tue Aug 2 09:11:37 2011
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Wed Oct 3 21:50:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.12 2011/08/02 09:11:37 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.13 2012/10/03 21:50:14 gsutre Exp $
.for _SL in \
mi \
@@ -41,6 +41,7 @@
hw/xfree86/dixmods/xtrap \
hw/xfree86/doc \
hw/xfree86/dri \
+ hw/xfree86/dri2 \
hw/xfree86/dummy \
hw/xfree86/i2c \
hw/xfree86/init \
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.9 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.10
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.9 Tue Aug 2 07:41:01 2011
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Wed Oct 3 21:50:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.9 2011/08/02 07:41:01 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.10 2012/10/03 21:50:14 gsutre Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -14,6 +14,7 @@ SRCS.glx= \
glapi_gentable.c \
glthread.c \
glxdri.c \
+ glxdri2.c \
extension_string.c \
indirect_util.c \
indirect_program.c \
@@ -47,6 +48,8 @@ CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/glx \
-I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/dri \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/dri2 \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/src/glx \
-I${X11SRCDIR.MesaLib}/src/mesa \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.4 Sat Oct 22 14:40:41 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Oct 3 21:50:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/10/22 14:40:41 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/03 21:50:14 gsutre Exp $
.include <bsd.own.mk>
@@ -58,6 +58,7 @@ LDADD+= ${LDADD.xkb}
LDADD+= ${LDADD.os}
LDADD+= ${LDADD.glx}
LDADD+= ${LDADD.hw/xfree86/dri}
+LDADD+= ${LDADD.hw/xfree86/dri2}
LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
@@ -99,6 +100,7 @@ DPADD+= ${DPADD.dix} \
${DPADD.os} \
${DPADD.glx} \
${DPADD.hw/xfree86/dri} \
+ ${DPADD.hw/xfree86/dri2} \
${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
${DPADD.hw/xfree86/init} \
