hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-30 00:15:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1312 from ascent12/drm_include

Browse source 
Fix libdrm includes
This commit is contained in:
Drew DeVault 2018-10-15 02:31:49 +02:00 committed by GitHub
commit 814fc1364c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/dmabuf-capture.c
View file

@ -12,7 +12,7 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include <stdbool.h> #include <stdbool.h>
#include <libdrm/drm_fourcc.h> #include <drm_fourcc.h>
#include "wlr-export-dmabuf-unstable-v1-client-protocol.h" #include "wlr-export-dmabuf-unstable-v1-client-protocol.h"
struct wayland_output { struct wayland_output {

1
examples/meson.build
View file

@ -80,6 +80,7 @@ examples = {
libavcodec, libavcodec,
libavformat, libavformat,
libavutil, libavutil,
drm.partial_dependency(includes: true), # <drm_fourcc.h>
threads, threads,
wayland_client, wayland_client,
wlr_protos, wlr_protos,

2
render/egl.c
View file

@ -3,7 +3,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <stdlib.h> #include <stdlib.h>
#include <libdrm/drm_fourcc.h> #include <drm_fourcc.h>
#include <wlr/render/egl.h> #include <wlr/render/egl.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "glapi.h" #include "glapi.h"

8
render/meson.build
View file

@ -22,7 +22,13 @@ lib_wlr_render = static_library(
), ),
glapi, glapi,
include_directories: wlr_inc, 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( wlr_render = declare_dependency(