diff options
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 51 | ||||
| -rw-r--r-- | render/fx_renderer/meson.build | 1 |
3 files changed, 9 insertions, 44 deletions
diff --git a/include/meson.build b/include/meson.build deleted file mode 100644 index 4c388f0..0000000 --- a/include/meson.build +++ /dev/null @@ -1 +0,0 @@ -exclude_files = ['meson.build', 'config.h.in', 'version.h.in'] diff --git a/meson.build b/meson.build index a69a9c6..070a07a 100644 --- a/meson.build +++ b/meson.build @@ -80,28 +80,14 @@ if cc.has_argument('-fmacro-prefix-map=/prefix/to/hide=') ) else add_project_arguments( - '-DWLR_REL_SRC_DIR="@0@"'.format(relative_dir), + '-D_WLR_REL_SRC_DIR="@0@"'.format(relative_dir), language: 'c', ) endif -features = { - 'drm-backend': false, - 'x11-backend': false, - 'libinput-backend': false, - 'xwayland': false, - 'gles2-renderer': false, - 'vulkan-renderer': false, - 'gbm-allocator': false, -} -internal_features = { - 'xcb-errors': false, - 'egl': false, -} - wayland_project_options = ['tests=false', 'documentation=false'] wayland_server = dependency('wayland-server', - version: '>=1.21', + version: '>=1.22', fallback: 'wayland', default_options: wayland_project_options, ) @@ -120,7 +106,7 @@ wlroots = dependency('wlroots', ) drm = dependency('libdrm', - version: '>=2.4.113', + version: '>=2.4.114', fallback: 'libdrm', default_options: [ 'intel=disabled', @@ -140,9 +126,11 @@ drm = dependency('libdrm', 'tests=false', ], ) -xkbcommon = dependency('xkbcommon') -udev = dependency('libudev') -pixman = dependency('pixman-1') +pixman = dependency('pixman-1', + version: '>=0.42.0', + fallback: 'pixman', + default_options: ['werror=false'], +) math = cc.find_library('m') rt = cc.find_library('rt') @@ -151,8 +139,6 @@ wlr_deps = [ wlroots, wayland_server, drm, - xkbcommon, - udev, pixman, math, rt, @@ -164,43 +150,25 @@ subdir('render') subdir('types') subdir('util') -subdir('include') - -foreach name, have : internal_features - add_project_arguments( - '-DHAS_@0@=@1@'.format(name.underscorify().to_upper(), have.to_int()), - language: 'c', - ) -endforeach - scenefx_inc = include_directories('include') -proto_inc = include_directories('protocol') lib_scenefx = library( meson.project_name(), wlr_files, soversion: soversion.to_string(), dependencies: wlr_deps, - include_directories: [ scenefx_inc, proto_inc ], + include_directories: [ scenefx_inc ], install: true, ) -wlr_vars = {} -foreach name, have : features - wlr_vars += { 'have_' + name.underscorify(): have.to_string() } -endforeach - scenefx = declare_dependency( link_with: lib_scenefx, dependencies: wlr_deps, include_directories: scenefx_inc, - variables: wlr_vars, ) meson.override_dependency('scenefx', scenefx) -summary(features + internal_features, bool_yn: true) - if get_option('examples') # TODO: subdir('examples') subdir('tinywl') @@ -212,5 +180,4 @@ pkgconfig.generate(lib_scenefx, filebase: meson.project_name(), name: meson.project_name(), description: 'Wlroots effects library', - variables: wlr_vars, ) diff --git a/render/fx_renderer/meson.build b/render/fx_renderer/meson.build index 6f16dea..d7160a8 100644 --- a/render/fx_renderer/meson.build +++ b/render/fx_renderer/meson.build @@ -23,7 +23,6 @@ if 'gles2' in renderers or 'auto' in renderers if egl.found() and gbm.found() and glesv2.found() wlr_deps += [egl, gbm, glesv2] - internal_features += { 'egl': true , 'gles2-renderer': true } endif subdir('gles2') endif |