diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-10-15 11:39:35 +1300 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-10-15 11:39:35 +1300 |
| commit | 7ca3bc1d6f36fd1751902e1976feceb427e6aba3 (patch) | |
| tree | 34b4328b4a5e05ce69612da0c7fd2008e8a711cd | |
| parent | 7daca85bcf4f3c0567697afb3603472394a85273 (diff) | |
Fix libdrm includes
This removes any assumptions about how the libdrm headers are installed,
and uses the pkg-config include directories as we're "supposed to".
This only adds a partial dependency, since we don't actually need to
link against libdrm.
| -rw-r--r-- | examples/dmabuf-capture.c | 2 | ||||
| -rw-r--r-- | examples/meson.build | 1 | ||||
| -rw-r--r-- | render/egl.c | 2 | ||||
| -rw-r--r-- | render/meson.build | 8 |
4 files changed, 10 insertions, 3 deletions
diff --git a/examples/dmabuf-capture.c b/examples/dmabuf-capture.c index 2c510b5a..abdb146a 100644 --- a/examples/dmabuf-capture.c +++ b/examples/dmabuf-capture.c @@ -12,7 +12,7 @@ #include <unistd.h> #include <pthread.h> #include <stdbool.h> -#include <libdrm/drm_fourcc.h> +#include <drm_fourcc.h> #include "wlr-export-dmabuf-unstable-v1-client-protocol.h" struct wayland_output { diff --git a/examples/meson.build b/examples/meson.build index da7a5275..e507ab42 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -80,6 +80,7 @@ examples = { libavcodec, libavformat, libavutil, + drm.partial_dependency(includes: true), # <drm_fourcc.h> threads, wayland_client, wlr_protos, diff --git a/render/egl.c b/render/egl.c index 5c0f2c4a..cfa37f20 100644 --- a/render/egl.c +++ b/render/egl.c @@ -3,7 +3,7 @@ #include <EGL/egl.h> #include <EGL/eglext.h> #include <stdlib.h> -#include <libdrm/drm_fourcc.h> +#include <drm_fourcc.h> #include <wlr/render/egl.h> #include <wlr/util/log.h> #include "glapi.h" diff --git a/render/meson.build b/render/meson.build index ab66eab0..8c126299 100644 --- a/render/meson.build +++ b/render/meson.build @@ -22,7 +22,13 @@ lib_wlr_render = static_library( ), glapi, include_directories: wlr_inc, - dependencies: [egl, glesv2, pixman, wayland_server], + dependencies: [ + egl, + drm.partial_dependency(includes: true), # <drm_fourcc.h> + glesv2, + pixman, + wayland_server + ], ) wlr_render = declare_dependency( |