i915tex: Fix build against libdrm git...

diff --git a/src/mesa/drivers/dri/i915tex/Makefile b/src/mesa/drivers/dri/i915tex/Makefile
index 3b3f3f5a3f7e9c8bdf7a80029314f09b2e69c6ae..b218929dce727da46ec708763e1ea1d47a27e04e 100644 (file)
--- 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 53064c72317655f33508ce4eb3c638ff521e8bce..45fd2fa8de0269d626711ebab8260607ca3ff1b4 100644 (file)
--- 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