mesa: Branch 'master' - 2 commits

[Michel Daenzer]

 src/mesa/drivers/dri/i915tex/Makefile        |    3 ++-
 src/mesa/drivers/dri/i915tex/intel_buffers.c |    2 +-
 src/mesa/drivers/dri/i915tex/intel_tris.c    |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 38f7f81518a434e0c70131a36396e0cf52e7b698 (from beffb4e88c71679ab69776498ee7178b7b8a16c0)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Mar 10 17:12:58 2007 +0100

    i915tex: Fix build against libdrm git...

diff --git a/src/mesa/drivers/dri/i915tex/Makefile b/src/mesa/drivers/dri/i915tex/Makefile
index 3b3f3f5..b218929 100644
--- a/src/mesa/drivers/dri/i915tex/Makefile
+++ b/src/mesa/drivers/dri/i915tex/Makefile
@@ -60,7 +60,8 @@ C_SOURCES = \
 
 ASM_SOURCES = 
 
-DRIVER_DEFINES = -I../intel
+DRIVER_DEFINES = -I../intel $(shell pkg-config libdrm --atleast-version=2.3.1 \
+				&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
 
 include ../Makefile.template
 
diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index 53064c7..45fd2fa 100644
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -43,7 +43,7 @@
 #include "vblank.h"
 
 
-/* This block can be removed when libdrm > 2.3.0 is required */
+/* This block can be removed when libdrm >= 2.3.1 is required */
 
 #ifndef DRM_VBLANK_FLIP
 
diff-tree beffb4e88c71679ab69776498ee7178b7b8a16c0 (from 97775f9904c34f72e6e5a56a6fb8975b1834e5f4)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Mar 10 16:40:22 2007 +0100

    i915tex: Fix intel_wait_flips being declared implicitly.

diff --git a/src/mesa/drivers/dri/i915tex/intel_tris.c b/src/mesa/drivers/dri/i915tex/intel_tris.c
index 9ac8c32..5fe3d45 100644
--- a/src/mesa/drivers/dri/i915tex/intel_tris.c
+++ b/src/mesa/drivers/dri/i915tex/intel_tris.c
@@ -43,6 +43,7 @@
 #include "intel_context.h"
 #include "intel_tris.h"
 #include "intel_batchbuffer.h"
+#include "intel_buffers.h"
 #include "intel_reg.h"
 #include "intel_span.h"
 #include "intel_tex.h"