bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=394143e37b256c14ead329b959f5aca6322bc019
commit 394143e37b256c14ead329b959f5aca6322bc019 Author: Marcel Hollerbach <[email protected]> Date: Thu Dec 28 09:11:40 2017 +0000 let there be ecore_buffer --- meson.build | 3 +- src/bin/ecore_buffer/meson.build | 5 ++++ src/lib/ecore_buffer/meson.build | 42 +++++++++++++++++++++++++++ src/modules/ecore_buffer/meson.build | 25 ++++++++++++++++ src/modules/ecore_buffer/shm/meson.build | 5 ++++ src/modules/ecore_buffer/x11_dri2/meson.build | 5 ++++ src/modules/ecore_buffer/x11_dri3/meson.build | 7 +++++ 7 files changed, 91 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 91b25e4dd6..f835560070 100644 --- a/meson.build +++ b/meson.build @@ -99,7 +99,8 @@ subprojects = [ ['ecore_x', false, true, false, false, []], ['ecore_fb', false, true, false, false, []], ['ecore_wl2', false, true, false, false, ['libdrm']], -['ecore_ipc', false, true, false, false, []] +['ecore_ipc', false, true, false, false, []], +['ecore_buffer', true, true, true, false, []] ] diff --git a/src/bin/ecore_buffer/meson.build b/src/bin/ecore_buffer/meson.build new file mode 100644 index 0000000000..3b19d1c34e --- /dev/null +++ b/src/bin/ecore_buffer/meson.build @@ -0,0 +1,5 @@ +executable('bq_mgr', + ['bq_mgr_protocol.c', 'bq_mgr.c'], + dependencies: [ecore, ecore_buffer, wayland], + install : true +) diff --git a/src/lib/ecore_buffer/meson.build b/src/lib/ecore_buffer/meson.build new file mode 100644 index 0000000000..f2381bc9d6 --- /dev/null +++ b/src/lib/ecore_buffer/meson.build @@ -0,0 +1,42 @@ +ecore_buffer_deps = [] + +ecore_buffer_header_src = [ + 'Ecore_Buffer.h', + 'Ecore_Buffer_Queue.h' +] + +wayland = [] +wayland += dependency('wayland-client') +wayland += dependency('wayland-server') + +ecore_buffer_deps += wayland + +ecore_buffer_src = [ + 'bq_mgr_protocol.c', + 'buffer_queue.c', + 'shared_buffer.c', + 'ecore_buffer.c', + 'ecore_buffer_queue_main.c', + 'ecore_buffer_con.c', + 'ecore_buffer_provider.c', + 'ecore_buffer_consumer.c' +] + + +ecore_buffer_lib = library('ecore_buffer', + ecore_buffer_src, pub_eo_file_target, + dependencies: [ecore, ecore_buffer_deps], + include_directories : config_dir, + install: true, +) + +ecore_buffer = declare_dependency( + include_directories: [include_directories('.')], + link_with: ecore_buffer_lib, + sources : pub_eo_file_target, + dependencies: [eina], +) + +install_headers(ecore_buffer_header_src, + install_dir : dir_package_include, +) \ No newline at end of file diff --git a/src/modules/ecore_buffer/meson.build b/src/modules/ecore_buffer/meson.build new file mode 100644 index 0000000000..00f393fdb4 --- /dev/null +++ b/src/modules/ecore_buffer/meson.build @@ -0,0 +1,25 @@ + + +subdir('shm') + +#common dri packages +libtbm = dependency('libtbm', required: false) +libdrm = dependency('libdrm', required: false) + +if libtbm.found() == true and libdrm.found() == true + libdri2 = dependency('libdri2', required: false) + if libdri2.found() + subdir('x11_dri2') + endif +endif + +if libtbm.found() == true and libdrm.found() == true + xshmfence = dependency('xshmfence', required: false) + xcb = dependency('xcb', required: false) + x11_xcb = dependency('x11_xcb', required: false) + xcb_sync = dependency('xcb_sync', required: false) + xcb_dri3 = dependency('xkb_dri3', required: false) + if xshmfence.found() == true and xcb.found() == true and x11_xcb.found() and xcb_sync.found() and xkb_dri3.found() + subdir('x11_dri3') + endif +endif diff --git a/src/modules/ecore_buffer/shm/meson.build b/src/modules/ecore_buffer/shm/meson.build new file mode 100644 index 0000000000..30da825227 --- /dev/null +++ b/src/modules/ecore_buffer/shm/meson.build @@ -0,0 +1,5 @@ +ecore_buffer_shm_mod = shared_module('ecore_buffer_shm_mod', + 'ecore_buffer_shm.c', + dependencies: [ecore, ecore_buffer], + install: true +) \ No newline at end of file diff --git a/src/modules/ecore_buffer/x11_dri2/meson.build b/src/modules/ecore_buffer/x11_dri2/meson.build new file mode 100644 index 0000000000..37ed534bd3 --- /dev/null +++ b/src/modules/ecore_buffer/x11_dri2/meson.build @@ -0,0 +1,5 @@ +ecore_buffer_x11_dri2_mod = shared_module('ecore_buffer_x11_dri2_mod', + 'ecore_buffer_x11_dri2.c', + dependencies: [ecore, ecore_buffer, ecore_x], + install: true +) \ No newline at end of file diff --git a/src/modules/ecore_buffer/x11_dri3/meson.build b/src/modules/ecore_buffer/x11_dri3/meson.build new file mode 100644 index 0000000000..5126fff6ca --- /dev/null +++ b/src/modules/ecore_buffer/x11_dri3/meson.build @@ -0,0 +1,7 @@ +if dependency('libtbm', required: false).found() == true and dependency('libdrm', required: false).found() + ecore_buffer_x11_dri3_mod = shared_module('ecore_buffer_x11_dri3_mod', + 'ecore_buffer_x11_dri3.c', + dependencies: [ecore, ecore_buffer, ecore_x], + install: true + ) +endif \ No newline at end of file --
