blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1317 from sghctoma/freebsd-fixes 

FreeBSD fixes
This commit is contained in:
Drew DeVault 2018-10-17 16:15:54 +02:00 committed by GitHub
parent 8beeb88309 1d7cc1b38b
commit affc83ff82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/drm.c
View File

@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 200112L
#include <assert.h> #include <assert.h>
#include <drm_mode.h> #include <drm_mode.h>
#include <EGL/egl.h> #include <EGL/egl.h>

2
backend/multi/backend.c
View File

@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 200112L
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>

9
examples/meson.build
View File

@ -6,6 +6,13 @@ libavutil = dependency('libavutil', version: '>=56.14.100', required: false)
libavcodec = dependency('libavcodec', version: '>=58.18.100', required: false) libavcodec = dependency('libavcodec', version: '>=58.18.100', required: false)
libavformat = dependency('libavformat', version: '>=58.12.100', required: false) libavformat = dependency('libavformat', version: '>=58.12.100', required: false)
# epoll is a separate library in FreeBSD
if host_machine.system() == 'freebsd'
libepoll = [dependency('epoll-shim')]
else
libepoll = []
endif
# Small hack until https://github.com/mesonbuild/meson/pull/3386/ is merged # Small hack until https://github.com/mesonbuild/meson/pull/3386/ is merged
foreach dep : ['libpng', 'libavutil', 'libavcodec', 'libavformat'] foreach dep : ['libpng', 'libavutil', 'libavcodec', 'libavformat']
if not get_variable(dep).found() if not get_variable(dep).found()
@ -97,7 +104,7 @@ examples = {
}, },
'input-method': { 'input-method': {
'src': 'input-method.c', 'src': 'input-method.c',
'dep': [wayland_client, wlr_protos, wlroots], 'dep': [wayland_client, wlr_protos, wlroots] + libepoll,
}, },
'text-input': { 'text-input': {
'src': 'text-input.c', 'src': 'text-input.c',