diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-17 16:15:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 16:15:54 +0200 |
| commit | affc83ff82d03ef0804936f637291a2575efcce1 (patch) | |
| tree | af3c66c35f8cc77a657d71df5ce810da60455e83 | |
| parent | 8beeb88309d87474e1b4e8eadcf245a24f04b2d0 (diff) | |
| parent | 1d7cc1b38b0ebff87082f0fbb6b1354a68285295 (diff) | |
Merge pull request #1317 from sghctoma/freebsd-fixes
FreeBSD fixes
| -rw-r--r-- | backend/drm/drm.c | 2 | ||||
| -rw-r--r-- | backend/multi/backend.c | 2 | ||||
| -rw-r--r-- | examples/meson.build | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 1313e7fe..0b624717 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1,4 +1,4 @@ -#define _POSIX_C_SOURCE 199309L +#define _POSIX_C_SOURCE 200112L #include <assert.h> #include <drm_mode.h> #include <EGL/egl.h> diff --git a/backend/multi/backend.c b/backend/multi/backend.c index cefaa361..50851109 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -1,4 +1,4 @@ -#define _POSIX_C_SOURCE 199309L +#define _POSIX_C_SOURCE 200112L #include <assert.h> #include <stdbool.h> #include <stdlib.h> diff --git a/examples/meson.build b/examples/meson.build index 13985e27..369c7049 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -6,6 +6,13 @@ libavutil = dependency('libavutil', version: '>=56.14.100', required: false) libavcodec = dependency('libavcodec', version: '>=58.18.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 foreach dep : ['libpng', 'libavutil', 'libavcodec', 'libavformat'] if not get_variable(dep).found() @@ -97,7 +104,7 @@ examples = { }, 'input-method': { 'src': 'input-method.c', - 'dep': [wayland_client, wlr_protos, wlroots], + 'dep': [wayland_client, wlr_protos, wlroots] + libepoll, }, 'text-input': { 'src': 'text-input.c', |