summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2013-06-27 14:53:51 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2013-06-27 14:53:51 +0000
commitfc7f7cd552b1e6c8f2a2398f0056b090f8e239ed (patch)
tree286311cc57c7ae619487f4dc05b9add949ba82b9
parent31db84cacd7d8b902608753520681b5f77aae69b (diff)
Define HAVE_LIBDRM_RADEON when compiling radeon dri drivers,
required for newer radeondrm. Expanded version of a diff from kettenis@ ok kettenis@ mpi@
-rw-r--r--lib/libGL/dri/r200/Makefile3
-rw-r--r--lib/libGL/dri/r300/Makefile3
-rw-r--r--lib/libGL/dri/r600/Makefile3
-rw-r--r--lib/libGL/dri/radeon/Makefile3
4 files changed, 8 insertions, 4 deletions
diff --git a/lib/libGL/dri/r200/Makefile b/lib/libGL/dri/r200/Makefile
index 81fd84490..527f88a4e 100644
--- a/lib/libGL/dri/r200/Makefile
+++ b/lib/libGL/dri/r200/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/11/23 21:07:12 oga Exp $
+# $OpenBSD: Makefile,v 1.5 2013/06/27 14:53:50 jsg Exp $
LIB= r200_dri.so
@@ -48,6 +48,7 @@ DRIVER_SOURCES = r200_context.c \
SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES)
DRIVER_DEFINES = -DRADEON_R200 \
+ -DHAVE_LIBDRM_RADEON \
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 \
-I$(MESA)/drivers/dri/r200 \
-I$(MESA)/drivers/dri/r200/server \
diff --git a/lib/libGL/dri/r300/Makefile b/lib/libGL/dri/r300/Makefile
index ff884d9f2..c2a393b20 100644
--- a/lib/libGL/dri/r300/Makefile
+++ b/lib/libGL/dri/r300/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2012/08/17 13:58:00 mpi Exp $
+# $OpenBSD: Makefile,v 1.7 2013/06/27 14:53:50 jsg Exp $
LIB= r300_dri.so
@@ -92,6 +92,7 @@ COMPILER_SOURCES = \
SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES) $(COMPILER_SOURCES)
DRIVER_DEFINES = -DRADEON_R300 \
+ -DHAVE_LIBDRM_RADEON \
-DCOMPILE_R300 -DR200_MERGED=0 \
-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
-I$(MESA)/drivers/dri/r300 \
diff --git a/lib/libGL/dri/r600/Makefile b/lib/libGL/dri/r600/Makefile
index 28c835826..0aab91332 100644
--- a/lib/libGL/dri/r600/Makefile
+++ b/lib/libGL/dri/r600/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2012/08/17 13:58:00 mpi Exp $
+# $OpenBSD: Makefile,v 1.5 2013/06/27 14:53:50 jsg Exp $
LIB= r600_dri.so
@@ -67,6 +67,7 @@ DRIVER_SOURCES = \
SRCS = $(COMMON_SOURCES) $(DRIVER_SOURCES)
DRIVER_DEFINES = -DRADEON_R600 \
+ -DHAVE_LIBDRM_RADEON \
-I$(MESA)/drivers/dri/r600 \
-I$(MESA)/drivers/dri/r600/server \
-I$(MESA)/drivers/dri/radeon \
diff --git a/lib/libGL/dri/radeon/Makefile b/lib/libGL/dri/radeon/Makefile
index cce2241a4..5215eb22c 100644
--- a/lib/libGL/dri/radeon/Makefile
+++ b/lib/libGL/dri/radeon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2012/01/27 07:07:43 matthieu Exp $
+# $OpenBSD: Makefile,v 1.5 2013/06/27 14:53:50 jsg Exp $
LIB= radeon_dri.so
@@ -47,6 +47,7 @@ SRCS = \
$(CS_SOURCES)
DRIVER_DEFINES = -DRADEON_R100 -DRADEON_COMMON=0 \
+ -DHAVE_LIBDRM_RADEON \
-I$(MESA)/drivers/dri/radeon/server \
-I$(MESA)/drivers/dri/radeon