update to latest master

20 files changed, 174 insertions, 86 deletions

diff --git a/meson.build b/meson.build
index ee0fc2eb22..fe727c528e 100644
--- a/meson.build
+++ b/meson.build
@@ -89,6 +89,7 @@ if get_option('ecore_wl2') == true or get_option('ecore_buffer') == true
   subdir(join_paths('src', 'wayland_protocol'))
 endif
 
+ecore_evas_wayland_engine_include_dir = []
 
 subprojects = [
 # name              | mod  | lib  | bin  | bench | tests | examples | name of static libs
@@ -98,7 +99,7 @@ subprojects = [
 ['efl'              , false,  true, false, false,  true, false, []],
 ['emile'            , false,  true, false, false,  true,  true, ['lz4', 'rg_etc']],
 ['eet'              , false,  true,  true, false,  true,  true, []],
-['ecore'            , false,  true, false, false, false, false, []],
+['ecore'            , false,  true, false, false, false, false, ['buildsystem']],
 ['eldbus'           , false,  true,  true, false,  true,  true, []],
 ['ecore'            ,  true, false, false, false,  true,  true, []], #ecores modules depend on eldbus
 ['ecore_audio'      , false,  true, false, false, false, false, []],
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index 3d9b06a13c..95a4ca9d73 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -21,12 +21,18 @@ foreach eo_file : pub_legacy_eo_files
 endforeach
 
 pub_eo_files = [
+  'efl_app.eo',
   'efl_loop.eo',
   'efl_loop_consumer.eo',
   'efl_loop_fd.eo',
   'efl_loop_handler.eo',
   'efl_loop_message.eo',
   'efl_loop_message_handler.eo',
+  'efl_exe.eo',
+  'efl_thread.eo',
+  'efl_threadio.eo',
+  'efl_appthread.eo',
+  'efl_task.eo',
   'efl_io_closer_fd.eo',
   'efl_io_positioner_fd.eo',
   'efl_io_reader_fd.eo',
@@ -50,6 +56,8 @@ pub_eo_files = [
 ]
 #split for later multilang eolian files stuff
 pub_eo_files += [
+  'efl_loop_message_future_handler.eo',
+  'efl_loop_message_future.eo',
   'efl_promise.eo',
   'efl_model_item.eo',
   'efl_model_container.eo',
@@ -85,6 +93,7 @@ ecore_header_src = [
 ]
 
 ecore_src = [
+  'efl_app.c',
   'ecore.c',
   'ecore_alloc.c',
   'ecore_anim.c',
@@ -104,7 +113,10 @@ ecore_src = [
   'efl_loop_fd.c',
   'efl_loop_handler.c',
   'efl_loop_message.c',
+  'efl_loop_message_future.c',
   'efl_loop_message_handler.c',
+  'efl_loop_message_future_handler.c',
+  'efl_task.c',
   'efl_io_closer_fd.c',
   'efl_io_positioner_fd.c',
   'efl_io_reader_fd.c',
@@ -178,7 +190,7 @@ endif
 
 ecore_lib = library('ecore',
     ecore_src, pub_eo_file_target,
-    dependencies: [eina, eo, efl, m, ecore_deps],
+    dependencies: [eina, eo, efl, m, buildsystem, ecore_deps],
     include_directories : config_dir + [include_directories(join_paths('..','..'))],
     install: true,
     c_args : package_c_args,
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index fc22885311..0c5f71e0df 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -184,7 +184,7 @@ endif
 
 ecore_con_lib = library('ecore_con',
     ecore_con_src, pub_eo_file_target,
-    dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, systemd, dl],
+    dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, systemd, buildsystem, dl],
     include_directories : config_dir,
     install: true,
     c_args : package_c_args,
diff --git a/src/lib/ecore_evas/meson.build b/src/lib/ecore_evas/meson.build
index 461da9b79c..37bbe8ad14 100644
--- a/src/lib/ecore_evas/meson.build
+++ b/src/lib/ecore_evas/meson.build
@@ -28,7 +28,7 @@ ecore_evas_src = [
 
 ecore_evas_lib = library('ecore_evas',
     ecore_evas_src, pub_eo_file_target,
-    dependencies: [ ecore_evas_deps],
+    dependencies: [ecore_evas_deps, buildsystem],
     include_directories : config_dir,
     install: true,
 )
diff --git a/src/lib/ecore_imf/meson.build b/src/lib/ecore_imf/meson.build
index 65060edd6a..042dc205cd 100644
--- a/src/lib/ecore_imf/meson.build
+++ b/src/lib/ecore_imf/meson.build
@@ -14,7 +14,7 @@ ecore_imf_src = [
 
 ecore_imf_lib = library('ecore_imf',
     ecore_imf_src, pub_eo_file_target,
-    dependencies: [ecore, ecore_imf_deps],
+    dependencies: [ecore, buildsystem, ecore_imf_deps],
     include_directories : config_dir,
     c_args : package_c_args,
     install: true,
diff --git a/src/lib/ecore_x/meson.build b/src/lib/ecore_x/meson.build
index 49fe3110a6..a52060aec0 100644
--- a/src/lib/ecore_x/meson.build
+++ b/src/lib/ecore_x/meson.build
@@ -77,9 +77,19 @@ if x11.found() == false
   x11 = cc.find_library('x11', required: true)
 endif
 
+xcb = dependency('xcb', required: false)
+if xcb.found() == false
+  xcb = cc.find_library('xcb', required: true)
+endif
+
+x11_xcb = dependency('x11-xcb', required: false)
+if x11_xcb.found() == false
+  x11_xcb = cc.find_library('x11-xcb', required: true)
+endif
+
 foreach ecore_x_check : ecore_x_checks
   x_lib = cc.find_library(ecore_x_check[2], 
-    dependencies : [x11],
+    dependencies : [x11, xcb],
     required: false
   )
 
@@ -102,9 +112,11 @@ int main () {
 endforeach
 
 ecore_x_deps += x11
+ecore_x_deps += xcb
+ecore_x_deps += x11_xcb
 # there are a few special cases
 cc.has_header_symbol('X11/XKBlib.h', 'XkbSetDetectableAutoRepeat',
-  dependencies : x11
+  dependencies : [x11, xcb]
 )
 config_h.set('ECORE_XKB', '1')
 
diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build
index de715f2596..9da3f41c61 100644
--- a/src/lib/eeze/meson.build
+++ b/src/lib/eeze/meson.build
@@ -74,7 +74,7 @@ config_h.set_quoted('EEZE_UNMOUNT_BIN', unmount_bin)
 
 eeze_lib = library('eeze',
     eeze_src, pub_eo_file_target,
-    dependencies: [ecore, ecore_file, eeze_deps],
+    dependencies: [ecore, ecore_file, buildsystem, eeze_deps],
     include_directories : config_dir,
     install: true,
     c_args : package_c_args,
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index dd593fefdb..6dd7d9f1f9 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -30,6 +30,7 @@ foreach eo_file : pub_legacy_eo_files
 endforeach
 
 pub_eo_files = [
+  'efl_playable.eo',
   'efl_canvas.eo',
   'efl_canvas_pointer.eo',
   'efl_config.eo',
@@ -47,7 +48,6 @@ pub_eo_files = [
   'efl_text_annotate.eo',
   'efl_text_markup.eo',
   'efl_text_markup_util.eo',
-  'efl_text_properties.eo',
   'efl_gfx_stack.eo',
   'efl_gfx_view.eo',
   'efl_gfx_buffer.eo',
@@ -62,18 +62,12 @@ pub_eo_files = [
   'efl_model.eo',
   'efl_animator.eo',
   'efl_orientation.eo',
-  'efl_flipable.eo',
   'efl_container.eo',
   'efl_content.eo',
   'efl_pack.eo',
   'efl_pack_layout.eo',
   'efl_pack_linear.eo',
   'efl_pack_table.eo',
-  'efl_vpath.eo',
-  'efl_vpath_manager.eo',
-  'efl_vpath_file.eo',
-  'efl_vpath_core.eo',
-  'efl_vpath_file_core.eo',
   'efl_ui_base.eo',
   'efl_ui_direction.eo',
   'efl_ui_drag.eo',
@@ -81,7 +75,6 @@ pub_eo_files = [
   'efl_ui_view.eo',
   'efl_ui_model_connect.eo',
   'efl_ui_factory.eo',
-  'efl_ui_model_factory_connect.eo',
   'efl_screen.eo',
   'efl_io_closer.eo',
   'efl_io_positioner.eo',
@@ -143,10 +136,6 @@ efl_src += files([
   'efl_gfx_path.c',
   'efl_gfx_shape.c',
   'efl_gfx_color.c',
-  'efl_vpath_file.c',
-  'efl_vpath_manager.c',
-  'efl_vpath_core.c',
-  'efl_vpath_file_core.c',
   'efl_input_device.c',
   'efl_io_closer.c',
   'efl_io_positioner.c',
diff --git a/src/lib/eina/eina_internal.h b/src/lib/eina/eina_internal.h
index 83e6f5da61..d479802efb 100644
--- a/src/lib/eina/eina_internal.h
+++ b/src/lib/eina/eina_internal.h
@@ -27,7 +27,7 @@
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
 #   define EAPI __attribute__ ((visibility("default")))
-#   define EAPI_WEAK __attribute__ ((weak))
+#   define EAPI_WEAK 
 #  else
 #   define EAPI
 #   define EAPI_WEAK
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index 84979022c9..f870e3ae24 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -50,7 +50,7 @@
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
 #   define EAPI __attribute__ ((visibility("default")))
-#   define EAPI_WEAK __attribute__ ((weak))
+#   define EAPI_WEAK
 #  else
 #   define EAPI
 #   define EAPI_WEAK
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 92cdd42a93..5d5c6a4c74 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -98,7 +98,9 @@ public_sub_headers = [
 'eina_inline_slice.x',
 'eina_inline_modinfo.x',
 'eina_freeq.h',
-'eina_slstr.h']
+'eina_slstr.h',
+'eina_vpath.h',
+]
 
 public_headers = [
   'Eina.h'
@@ -177,7 +179,9 @@ sources = [
 'eina_bezier.c',
 'eina_safepointer.c',
 'eina_freeq.c',
-'eina_slstr.c']
+'eina_slstr.c',
+'eina_vpath.c'
+]
 
 if target_machine.system() == 'cygwin'
   sources += 'eina_file_win32.c'
diff --git a/src/lib/eldbus/eldbus_core.c b/src/lib/eldbus/eldbus_core.c
index ba4a3ba684..480682afbe 100644
--- a/src/lib/eldbus/eldbus_core.c
+++ b/src/lib/eldbus/eldbus_core.c
@@ -135,7 +135,8 @@ eldbus_init(void)
         fputs("Eldbus: Unable to initialize eina\n", stderr);
         return 0;
      }
-
+   efl_object_init();
+   
    _eldbus_log_dom = eina_log_domain_register("eldbus", EINA_COLOR_BLUE);
    if (_eldbus_log_dom < 0)
      {
diff --git a/src/lib/eldbus/eldbus_private.h b/src/lib/eldbus/eldbus_private.h
index 0839d74f54..94d2cee736 100644
--- a/src/lib/eldbus/eldbus_private.h
+++ b/src/lib/eldbus/eldbus_private.h
@@ -3,6 +3,7 @@
 
 #include <dbus/dbus.h>
 #include <Eina.h>
+#include <Eo.h>
 #include "eina_safety_checks.h"
 #include <Ecore.h>
 #include "Eldbus.h"
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 7d52a77b3d..15e90c42ed 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -11,12 +11,12 @@ pub_legacy_eo_files = [
   'evas_text.eo',
   'evas_textgrid.eo',
   'evas_image.eo',
-  'efl_vg.eo',
-  'efl_vg_container.eo',
-  'efl_vg_shape.eo',
-  'efl_vg_gradient.eo',
-  'efl_vg_gradient_radial.eo',
-  'efl_vg_gradient_linear.eo',
+  'efl_canvas_vg_node.eo',
+  'efl_canvas_vg_container.eo',
+  'efl_canvas_vg_shape.eo',
+  'efl_canvas_vg_gradient.eo',
+  'efl_canvas_vg_gradient_radial.eo',
+  'efl_canvas_vg_gradient_linear.eo',
   'efl_canvas_group.eo',
   'efl_gfx_map.eo',
   'efl_canvas_object_event_grabber.eo',
@@ -65,22 +65,16 @@ pub_eo_files = [
   'efl_input_pointer.eo',
   'efl_input_hold.eo',
   'efl_input_focus.eo',
-  'efl_animation.eo',
-  'efl_animation_alpha.eo',
-  'efl_animation_rotate.eo',
-  'efl_animation_scale.eo',
-  'efl_animation_translate.eo',
-  'efl_animation_group.eo',
-  'efl_animation_group_parallel.eo',
-  'efl_animation_group_sequential.eo',
-  'efl_animation_object.eo',
-  'efl_animation_object_alpha.eo',
-  'efl_animation_object_rotate.eo',
-  'efl_animation_object_scale.eo',
-  'efl_animation_object_translate.eo',
-  'efl_animation_object_group.eo',
-  'efl_animation_object_group_parallel.eo',
-  'efl_animation_object_group_sequential.eo',
+  'efl_canvas_animation.eo',
+  'efl_canvas_animation_alpha.eo',
+  'efl_canvas_animation_rotate.eo',
+  'efl_canvas_animation_scale.eo',
+  'efl_canvas_animation_translate.eo',
+  'efl_canvas_animation_group.eo',
+  'efl_canvas_animation_group_parallel.eo',
+  'efl_canvas_animation_group_sequential.eo',
+  'efl_canvas_animation_player.eo',
+  'efl_canvas_text_factory.eo'
 ]
 
 foreach eo_file : pub_eo_files
@@ -99,7 +93,7 @@ endforeach
 
 pub_eo_types_files = [
     'evas_canvas3d_types.eot',
-    'efl_animation_types.eot'
+    'efl_canvas_animation_types.eot'
 ]
 
 foreach eo_file : pub_eo_types_files
@@ -148,7 +142,6 @@ evas_src += files([
   'render2/evas_render2.c',
   'render2/evas_render2.h',
   'evas_smart.c',
-  'evas_stack.c',
   'evas_async_events.c',
   'evas_stats.c',
   'evas_touch_point.c',
@@ -171,22 +164,15 @@ evas_src += files([
   'efl_input_pointer.c',
   'efl_input_hold.c',
   'efl_input_focus.c',
-  'efl_animation.c',
-  'efl_animation_alpha.c',
-  'efl_animation_rotate.c',
-  'efl_animation_scale.c',
-  'efl_animation_translate.c',
-  'efl_animation_group.c',
-  'efl_animation_group_parallel.c',
-  'efl_animation_group_sequential.c',
-  'efl_animation_object.c',
-  'efl_animation_object_alpha.c',
-  'efl_animation_object_rotate.c',
-  'efl_animation_object_scale.c',
-  'efl_animation_object_translate.c',
-  'efl_animation_object_group.c',
-  'efl_animation_object_group_parallel.c',
-  'efl_animation_object_group_sequential.c',
+  'efl_canvas_animation.c',
+  'efl_canvas_animation_alpha.c',
+  'efl_canvas_animation_rotate.c',
+  'efl_canvas_animation_scale.c',
+  'efl_canvas_animation_translate.c',
+  'efl_canvas_animation_group.c',
+  'efl_canvas_animation_group_parallel.c',
+  'efl_canvas_animation_group_sequential.c',
+  'efl_canvas_animation_player.c',
   'efl_canvas_vg.c',
   'evas_vg_node.c',
   'evas_vg_container.c',
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index d7728a7b04..b3e78ca1dc 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -1,10 +1,10 @@
 pub_eo_files = [
-  'efl_gesture_touch.eo',
-  'efl_gesture.eo',
-  'efl_gesture_tap.eo',
-  'efl_gesture_long_tap.eo',
-  'efl_gesture_recognizer.eo',
-  'efl_gesture_manager.eo'
+  'efl_canvas_gesture_touch.eo',
+  'efl_canvas_gesture.eo',
+  'efl_canvas_gesture_tap.eo',
+  'efl_canvas_gesture_long_tap.eo',
+  'efl_canvas_gesture_recognizer.eo',
+  'efl_canvas_gesture_manager.eo'
 ]
 
 foreach eo_file : pub_eo_files
@@ -21,8 +21,8 @@ foreach eo_file : pub_eo_files
 endforeach
 
 pub_eo_files = [
-  'efl_gesture_recognizer_tap.eo',
-  'efl_gesture_recognizer_long_tap.eo'
+  'efl_canvas_gesture_recognizer_tap.eo',
+  'efl_canvas_gesture_recognizer_long_tap.eo'
 ]
 
 foreach eo_file : pub_eo_files
@@ -39,7 +39,7 @@ foreach eo_file : pub_eo_files
 endforeach
 
 pub_eo_types_files = [
-  'efl_gesture_types.eot',
+  'efl_canvas_gesture_types.eot',
 ]
 
 foreach eo_file : pub_eo_types_files
@@ -54,12 +54,12 @@ foreach eo_file : pub_eo_types_files
 endforeach
 
 evas_src += files([
-  'efl_gesture_touch.c',
-  'efl_gesture.c',
-  'efl_gesture_tap.c',
-  'efl_gesture_long_tap.c',
-  'efl_gesture_recognizer.c',
-  'efl_gesture_recognizer_tap.c',
-  'efl_gesture_recognizer_long_tap.c',
-  'efl_gesture_manager.c',
+  'efl_canvas_gesture_touch.c',
+  'efl_canvas_gesture.c',
+  'efl_canvas_gesture_tap.c',
+  'efl_canvas_gesture_long_tap.c',
+  'efl_canvas_gesture_recognizer.c',
+  'efl_canvas_gesture_recognizer_tap.c',
+  'efl_canvas_gesture_recognizer_long_tap.c',
+  'efl_canvas_gesture_manager.c',
 ])
\ No newline at end of file
diff --git a/src/static_libs/buildsystem/buildsystem_meson.c b/src/static_libs/buildsystem/buildsystem_meson.c
new file mode 100644
index 0000000000..1e36e9a2fe
--- /dev/null
+++ b/src/static_libs/buildsystem/buildsystem_meson.c
@@ -0,0 +1,50 @@
+#ifdef _WIN32
+# define BIN_EXT ".exe"
+#else
+# define BIN_EXT ""
+#endif
+
+#include "config.h"
+
+#include <stdio.h>
+#include <Eina.h>
+
+Eina_Bool
+bs_mod_get(char *path, size_t maxlen, const char *subsystem, const char *mod_name)
+{
+   if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE;
+
+   snprintf(path, maxlen, PACKAGE_BUILD_DIR"/src/modules/%s/lib%s"SHARED_LIB_SUFFIX, subsystem, mod_name);
+
+   return EINA_TRUE;
+}
+
+Eina_Bool
+bs_mod_dir_get(char *path, size_t maxlen, const char *subsystem, const char *mod_name)
+{
+   if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE;
+
+   snprintf(path, maxlen, PACKAGE_BUILD_DIR"/src/modules/%s/%s/.libs", subsystem, mod_name);
+
+   return EINA_TRUE;
+}
+
+Eina_Bool
+bs_binary_get(char *path, size_t maxlen, const char *subsystem, const char *bin_name)
+{
+   if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE;
+
+   snprintf(path, maxlen, PACKAGE_BUILD_DIR"/src/bin/%s/%s"BIN_EXT, subsystem, bin_name);
+
+   return EINA_TRUE;
+}
+
+Eina_Bool
+bs_data_path_get(char *path, size_t maxlen, const char *subsystem, const char *file)
+{
+   if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE;
+
+   snprintf(path, maxlen, PACKAGE_SRC_DIR"/data/%s/%s", subsystem, file);
+
+   return EINA_TRUE;
+}
diff --git a/src/static_libs/buildsystem/meson.build b/src/static_libs/buildsystem/meson.build
new file mode 100644
index 0000000000..4531f457c7
--- /dev/null
+++ b/src/static_libs/buildsystem/meson.build
@@ -0,0 +1,20 @@
+
+buildsystem_src = [
+  'buildsystem.h',
+  'buildsystem_autotools.c',
+]
+
+
+buildsystem_lib = static_library('buildsystem',
+    buildsystem_src,
+    dependencies : [eina, efl],
+    include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
+    install: false,
+    c_args : ['-DPACKAGE_SRC_DIR="'+ meson.source_root() +'"'],
+)
+
+buildsystem = declare_dependency(
+  include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
+  link_with: buildsystem_lib,
+  dependencies: [eina],
+)
diff --git a/src/tests/eina/meson.build b/src/tests/eina/meson.build
index cbad7e9580..4013790669 100644
--- a/src/tests/eina/meson.build
+++ b/src/tests/eina/meson.build
@@ -51,7 +51,9 @@ eina_test_src = files(
 'eina_test_safepointer.c',
 'eina_test_slice.c',
 'eina_test_freeq.c',
-'eina_test_slstr.c')
+'eina_test_slstr.c',
+'eina_test_vpath.c'
+)
 
 
 eina_test_exe = executable('eina_suite',
diff --git a/src/tests/eo/suite/meson.build b/src/tests/eo/suite/meson.build
index 7bed58aebc..7cd9a621b6 100644
--- a/src/tests/eo/suite/meson.build
+++ b/src/tests/eo/suite/meson.build
@@ -21,7 +21,7 @@ eo_suite_src = [
 
 eo_suite = executable('eo_suite',
   eo_suite_src,
-  dependencies: [eo, check],
+  dependencies: [eo, check, valgrind],
   c_args : [
   '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
   '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index 29e670f0e0..5f3680ee93 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -12,18 +12,28 @@ wl_protocol_local = [
   'www.xml'
 ]
 
-wl_protocol_sys = [
+wl_unstable_protocol_sys = [
   join_paths('xdg-shell', 'xdg-shell-unstable-v6.xml'),
   join_paths('linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'),
   join_paths('text-input', 'text-input-unstable-v1.xml'),
 ]
 
-foreach sys_protocol : wl_protocol_sys
+wl_stable_protocol_sys = [
+  join_paths('xdg-shell', 'xdg-shell.xml'),
+]
+
+foreach sys_protocol : wl_unstable_protocol_sys
 	wl_protocol_local += [ 
 		join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
 			sys_protocol)]
 endforeach
 
+foreach sys_protocol : wl_stable_protocol_sys
+  wl_protocol_local += [ 
+    join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'stable',
+      sys_protocol)]
+endforeach
+
 gen_obj = []
 
 foreach item : wl_protocol_local