summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libEGL/Makefile4
-rw-r--r--lib/libGL/Makefile4
-rw-r--r--lib/libGL/dri/Makefile.inc4
-rw-r--r--lib/libGL/gallium/drivers/r600/Makefile4
-rw-r--r--lib/libGL/gallium/drivers/radeon/Makefile4
-rw-r--r--lib/libGL/gallium/drivers/radeonsi/Makefile4
-rw-r--r--lib/libGL/gallium/libgallium/Makefile4
-rw-r--r--lib/libGL/gallium/winsys/radeon/drm/Makefile4
-rw-r--r--lib/libGL/mesa/libmesa/Makefile4
-rw-r--r--lib/libGL/mesa/libmesautil/Makefile4
-rw-r--r--lib/libGLESv1_CM/Makefile4
-rw-r--r--lib/libGLESv2/Makefile4
-rw-r--r--lib/libgbm/Makefile4
-rw-r--r--lib/libglapi/Makefile4
14 files changed, 28 insertions, 28 deletions
diff --git a/lib/libEGL/Makefile b/lib/libEGL/Makefile
index f559db2f7..b77645b81 100644
--- a/lib/libEGL/Makefile
+++ b/lib/libEGL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2015/02/20 23:31:04 jsg Exp $
+# $OpenBSD: Makefile,v 1.13 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= EGL
@@ -83,7 +83,7 @@ CPPFLAGS+= \
-I${EGL}/main \
-I${LOADER} \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-DHAVE_PTHREAD \
-DHAVE_X11_PLATFORM \
-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11 \
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile
index 062e299e4..63c7451d8 100644
--- a/lib/libGL/Makefile
+++ b/lib/libGL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2015/08/19 23:00:12 matthieu Exp $
+# $OpenBSD: Makefile,v 1.47 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
.include "config.mk"
@@ -48,7 +48,7 @@ CPPFLAGS+= \
-I${GLX} \
-I${LOADER} \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-I${.CURDIR}/generated \
-I${.CURDIR}/generated/glx \
-DGLX_INDIRECT_RENDERING \
diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc
index c9f335bac..6c5f2855e 100644
--- a/lib/libGL/dri/Makefile.inc
+++ b/lib/libGL/dri/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2015/08/19 23:00:12 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
.include "../config.mk"
@@ -39,7 +39,7 @@ INCLUDES = \
-I$(TOP)/src/egl/drivers/dri \
-I${.CURDIR}/../../generated \
-I$(X11BASE)/include \
- -I/usr/include/dev/pci/drm
+ -I$(X11BASE)/include/libdrm
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS += \
diff --git a/lib/libGL/gallium/drivers/r600/Makefile b/lib/libGL/gallium/drivers/r600/Makefile
index 49e8b3bad..b321a8fea 100644
--- a/lib/libGL/gallium/drivers/r600/Makefile
+++ b/lib/libGL/gallium/drivers/r600/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/01/25 15:09:13 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
GALLIUM=${.CURDIR}/../../../../../dist/Mesa/src/gallium
@@ -13,7 +13,7 @@ SRCS = \
CPPFLAGS+= -I${GALLIUM}/drivers/r600 -I${GALLIUM}/drivers/r600/sb \
-I${GALLIUM}/drivers -I${GALLIUM}/drivers/radeon \
-I${MESA}/../../include \
- -I${MESA} -I${X11BASE}/include -I/usr/include/dev/pci/drm \
+ -I${MESA} -I${X11BASE}/include -I${X11BASE}/include/libdrm \
-I${MESA}/../gallium/winsys
.if ${XENOCARA_BUILD_GALLIUM} == "llvm"
diff --git a/lib/libGL/gallium/drivers/radeon/Makefile b/lib/libGL/gallium/drivers/radeon/Makefile
index e21b854d6..01eda644d 100644
--- a/lib/libGL/gallium/drivers/radeon/Makefile
+++ b/lib/libGL/gallium/drivers/radeon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2015/01/25 15:09:13 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
GALLIUM=${.CURDIR}/../../../../../dist/Mesa/src/gallium
@@ -11,7 +11,7 @@ SRCS = \
CPPFLAGS+= -I${GALLIUM}/drivers -I${GALLIUM}/drivers/radeon \
-I${MESA}/../../include -I${MESA}/../gallium/winsys \
- -I${MESA} -I${X11BASE}/include -I/usr/include/dev/pci/drm
+ -I${MESA} -I${X11BASE}/include -I${X11BASE}/include/libdrm
.if ${XENOCARA_BUILD_GALLIUM} == "llvm"
SRCS+= ${LLVM_C_FILES}
diff --git a/lib/libGL/gallium/drivers/radeonsi/Makefile b/lib/libGL/gallium/drivers/radeonsi/Makefile
index d757b2db1..89c5cf13f 100644
--- a/lib/libGL/gallium/drivers/radeonsi/Makefile
+++ b/lib/libGL/gallium/drivers/radeonsi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/01/25 15:09:13 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
GALLIUM=${.CURDIR}/../../../../../dist/Mesa/src/gallium
@@ -12,7 +12,7 @@ SRCS = \
CPPFLAGS+= -I${GALLIUM}/drivers/radeonsi \
-I${GALLIUM}/drivers -I${GALLIUM}/drivers/radeon \
-I${MESA}/../../include \
- -I${MESA} -I${X11BASE}/include -I/usr/include/dev/pci/drm \
+ -I${MESA} -I${X11BASE}/include -I${X11BASE}/include/libdrm \
-I${MESA}/../gallium/winsys
CPPFLAGS+= -DR600_USE_LLVM
diff --git a/lib/libGL/gallium/libgallium/Makefile b/lib/libGL/gallium/libgallium/Makefile
index baa7bf21d..6a667a7d6 100644
--- a/lib/libGL/gallium/libgallium/Makefile
+++ b/lib/libGL/gallium/libgallium/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/02/20 23:31:05 jsg Exp $
+# $OpenBSD: Makefile,v 1.8 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= gallium
@@ -13,7 +13,7 @@ CPPFLAGS+= \
-I${.CURDIR}/../../../../dist/Mesa/include \
-I${.CURDIR}/../../../../dist/Mesa/src \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm
+ -I${X11BASE}/include/libdrm
C_SOURCES = \
cso_cache.c \
diff --git a/lib/libGL/gallium/winsys/radeon/drm/Makefile b/lib/libGL/gallium/winsys/radeon/drm/Makefile
index 3b2c8b5f0..18834f4ae 100644
--- a/lib/libGL/gallium/winsys/radeon/drm/Makefile
+++ b/lib/libGL/gallium/winsys/radeon/drm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2015/01/25 15:09:13 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2015/08/22 00:50:54 jsg Exp $
GALLIUM=${.CURDIR}/../../../../../../dist/Mesa/src/gallium
.include "${GALLIUM}/winsys/radeon/drm/Makefile.sources"
@@ -13,7 +13,7 @@ CPPFLAGS+= \
-I${GALLIUM}/include \
-I${.CURDIR}/../../../../../../dist/Mesa/include \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm
+ -I${X11BASE}/include/libdrm
all: lib${LIB}_pic.a
diff --git a/lib/libGL/mesa/libmesa/Makefile b/lib/libGL/mesa/libmesa/Makefile
index 6631901f9..a7e1e3691 100644
--- a/lib/libGL/mesa/libmesa/Makefile
+++ b/lib/libGL/mesa/libmesa/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2014/07/09 21:32:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2015/08/22 00:50:54 jsg Exp $
LIB= mesa
CPPFLAGS+= \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-I${.CURDIR}/../generated \
-I${.CURDIR}/../generated/main \
-DGLX_INDIRECT_RENDERING \
diff --git a/lib/libGL/mesa/libmesautil/Makefile b/lib/libGL/mesa/libmesautil/Makefile
index 50a53c110..b89e4d588 100644
--- a/lib/libGL/mesa/libmesautil/Makefile
+++ b/lib/libGL/mesa/libmesautil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2015/01/25 15:09:14 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2015/08/22 00:50:54 jsg Exp $
UTIL=${.CURDIR}/../../../../dist/Mesa/src/util
.include "${UTIL}/Makefile.sources"
@@ -6,7 +6,7 @@ UTIL=${.CURDIR}/../../../../dist/Mesa/src/util
LIB= mesautil
CPPFLAGS+= \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-I${.CURDIR}/../generated \
-I${.CURDIR}/../generated/main \
-I${UTIL} \
diff --git a/lib/libGLESv1_CM/Makefile b/lib/libGLESv1_CM/Makefile
index 87e2d8e64..26ad339d5 100644
--- a/lib/libGLESv1_CM/Makefile
+++ b/lib/libGLESv1_CM/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2015/02/20 23:31:06 jsg Exp $
+# $OpenBSD: Makefile,v 1.11 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= GLESv1_CM
@@ -34,7 +34,7 @@ CPPFLAGS+= \
-I${MAPI}/glapi \
-I${.CURDIR}/generated \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-DGLX_INDIRECT_RENDERING \
-DPTHREADS \
-DHAVE_PTHREAD \
diff --git a/lib/libGLESv2/Makefile b/lib/libGLESv2/Makefile
index 208b589f7..f54c5adbb 100644
--- a/lib/libGLESv2/Makefile
+++ b/lib/libGLESv2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2015/02/20 23:31:06 jsg Exp $
+# $OpenBSD: Makefile,v 1.11 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= GLESv2
@@ -35,7 +35,7 @@ CPPFLAGS+= \
-I${MAPI}/glapi \
-I${.CURDIR}/generated \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-DGLX_INDIRECT_RENDERING \
-DPTHREADS \
-DHAVE_PTHREAD \
diff --git a/lib/libgbm/Makefile b/lib/libgbm/Makefile
index 9fd89e009..4afb08444 100644
--- a/lib/libgbm/Makefile
+++ b/lib/libgbm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/02/20 23:31:06 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= gbm
@@ -35,7 +35,7 @@ CPPFLAGS+= \
-I${GBM}/main \
-I${LOADER} \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-DHAVE_PTHREAD \
-D_OS_UNIX=1 \
-DMODULEDIR=\"${X11BASE}/lib/modules/gbm\" \
diff --git a/lib/libglapi/Makefile b/lib/libglapi/Makefile
index c0112389b..d7c9f95e8 100644
--- a/lib/libglapi/Makefile
+++ b/lib/libglapi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/01/25 15:09:14 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2015/08/22 00:50:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= glapi
@@ -24,7 +24,7 @@ CPPFLAGS+= \
-I${MAPI}/glapi \
-I${.CURDIR}/generated \
-I${X11BASE}/include \
- -I/usr/include/dev/pci/drm \
+ -I${X11BASE}/include/libdrm \
-DGLX_INDIRECT_RENDERING \
-DPTHREADS \
-DHAVE_PTHREAD \