summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-03-10 17:12:58 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2007-03-10 17:12:58 +0100
commit38f7f81518a434e0c70131a36396e0cf52e7b698 (patch)
tree12f1fd48a6e74bf05fe66a2c2a049d41b52d80a3 /src
parentbeffb4e88c71679ab69776498ee7178b7b8a16c0 (diff)
i915tex: Fix build against libdrm git...
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915tex/Makefile3
-rw-r--r--src/mesa/drivers/dri/i915tex/intel_buffers.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915tex/Makefile b/src/mesa/drivers/dri/i915tex/Makefile
index 3b3f3f5a3f..b218929dce 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 53064c7231..45fd2fa8de 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