[src/trunk]: src/external/mit/xorg/server/xorg-server Enable GLX DRI2 support.

[gsutre <gsutre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c0bed9b7c5e
branches:  trunk
changeset: 781853:8c0bed9b7c5e
user:      gsutre <gsutre%NetBSD.org@localhost>
date:      Wed Oct 03 21:50:14 2012 +0000

description:
Enable GLX DRI2 support.

diffstat:

 external/mit/xorg/server/xorg-server/Makefile.Xserver         |  3 ++-
 external/mit/xorg/server/xorg-server/glx/Makefile.glx         |  5 ++++-
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile |  4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r 5fa4206e7982 -r 8c0bed9b7c5e external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Wed Oct 03 20:54:23 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Wed Oct 03 21:50:14 2012 +0000
@@ -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 \
diff -r 5fa4206e7982 -r 8c0bed9b7c5e external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Wed Oct 03 20:54:23 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Wed Oct 03 21:50:14 2012 +0000
@@ -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 @@
         glapi_gentable.c \
         glthread.c \
         glxdri.c \
+        glxdri2.c \
         extension_string.c \
         indirect_util.c \
         indirect_program.c \
@@ -47,6 +48,8 @@
        -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 \
diff -r 5fa4206e7982 -r 8c0bed9b7c5e external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Wed Oct 03 20:54:23 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Wed Oct 03 21:50:14 2012 +0000
@@ -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.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.os} \
        ${DPADD.glx} \
        ${DPADD.hw/xfree86/dri} \
+       ${DPADD.hw/xfree86/dri2} \
        ${DPADD.hw/xfree86/dixmods/fb} \
        ${DPADD.hw/xfree86/fb} \
        ${DPADD.hw/xfree86/init} \