meson: migrate upstream patches to tizen

regarding patches(93983e0, 6114570, 7273fbb, 3418659),
they have too many diff to cherry-pick on tizen
this patch migrate them

Change-Id: Id72ecf0e9acf5b1913967afff20ac008d7920c8e

diff --git a/src/modules/evas/engines/gl_tbm/meson.build b/src/modules/evas/engines/gl_tbm/meson.build
index 9f31fa0..d0d6fe6 100644 (file)
--- a/src/modules/evas/engines/gl_tbm/meson.build
+++ b/src/modules/evas/engines/gl_tbm/meson.build
@@ -8,14 +8,13 @@ engine_header = [
     'Evas_Engine_GL_Tbm.h'
 ]
 
-engine_deps = [gl_deps, gl_common, libtbm]
+engine_deps = [gl_deps, libtbm]
 engine_include_dir = include_directories(join_paths('..','software_generic'))
-message('WKWK2 gl_tbm build')
-if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine)
-   message('WKWK3 gl_tbm build')
+
+if get_option('evas-modules') == 'shared'
   shared_module(mod_full_name, engine_src + engine_header,
         include_directories : config_dir + [engine_include_dir],
-        dependencies : [eina, evas_pre] + engine_deps,
+        dependencies : [eina, evas] + engine_deps,
         install : true,
         install_dir : mod_install_dir,
         name_suffix : sys_mod_extension

diff --git a/src/modules/evas/engines/gl_x11/meson.build b/src/modules/evas/engines/gl_x11/meson.build
index d820cde..7aec198 100644 (file)
--- a/src/modules/evas/engines/gl_x11/meson.build
+++ b/src/modules/evas/engines/gl_x11/meson.build
@@ -5,8 +5,6 @@ engine_src = files([
   'evas_x_main.c',
 ])
 
-engine_src += engine_src_gl_thread
-
 engine_deps = [ecore_x_deps, gl_deps]
 
 if get_option('evas-modules') == 'shared'

diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index 051a648..1891af0 100644 (file)
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -1,3 +1,7 @@
+dir_package_modules = join_paths(dir_lib, 'evas', 'modules')
+package_version_name = 'evas-' + version_major
+dir_package_include = join_paths(dir_include, package_version_name)
+
 engines = [
  ['buffer', []],
  ['fb', ['fb']],

diff --git a/src/modules/evas/engines/software_tbm/meson.build b/src/modules/evas/engines/software_tbm/meson.build
index 35bfed1..706452d 100644 (file)
--- a/src/modules/evas/engines/software_tbm/meson.build
+++ b/src/modules/evas/engines/software_tbm/meson.build
@@ -11,10 +11,10 @@ engine_header = [
 engine_deps = []#ecore_drm2, libdrm, gl_deps, dependency('gbm')]
 engine_include_dir = include_directories(join_paths('..','software_generic'))
 
-if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine)
+if get_option('evas-modules') == 'shared'
   shared_module(mod_full_name, engine_src + engine_header,
         include_directories : config_dir + [engine_include_dir],
-        dependencies : [eina, evas_pre] + engine_deps,
+        dependencies : [eina, evas] + engine_deps,
         install : true,
         install_dir : mod_install_dir,
         name_suffix : sys_mod_extension

diff --git a/src/modules/evas/engines/wayland_egl/meson.build b/src/modules/evas/engines/wayland_egl/meson.build
index 6d5c7c2..2f3a950 100644 (file)
--- a/src/modules/evas/engines/wayland_egl/meson.build
+++ b/src/modules/evas/engines/wayland_egl/meson.build
@@ -3,9 +3,17 @@ engine_src = files([
   'evas_engine.h',
   'evas_wl_main.c'
 ])
-engine_src += engine_src_gl_thread
 
-engine_deps = [ecore_wl2, dependency('wayland-egl'), dependency('wayland-client'), dependency('wayland-egl-tizen'), gl_deps, gl_common]
+foreach src : gl_thread_engine_src
+  engine_src += files(join_paths('..','gl_common', src))
+endforeach
+
+engine_deps = [
+   ecore_wl2, gl_deps,
+   dependency('wayland-egl'),
+   dependency('wayland-client'),
+   dependency('wayland-egl-tizen'),
+]
 
 engine_include_dir = include_directories(join_paths('..','wayland_common'))