Revert "meson: move all tizen specific dependancy to 'tizen' option"

This reverts commit f8fe674efbf578262fdd7f3befa4f396531cbb77.

Change-Id: I5d2492b722f203b3f08120ca85275e90550cb9d2

diff --git a/meson_options.txt b/meson_options.txt
index f7c2504..a42d292 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -368,20 +368,20 @@ option('elementary-base-dir',
   description : 'The name of the directory for user supplied elementary data files like themes, config files'
 )
 
-option('install-eo-files',
+option('tbm',
   type: 'boolean',
-  value: false,
-  description : 'Install any eo file'
+  value: true,
+  description: 'enable tbm'
 )
 
-option('tizen',
+option('tizen_audio',
   type: 'boolean',
-  value: false,
-  description: 'enable tizen specific dependancy'
+  value: true,
+  description: 'enable tizen audio'
 )
 
-option('tbm',
+option('install-eo-files',
   type: 'boolean',
   value: false,
-  description: 'tbm engine'
-)
\ No newline at end of file
+  description : 'Install any eo file'
+)

diff --git a/packaging/efl.spec b/packaging/efl.spec
index b7f264b..72aec7a 100644 (file)
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -1221,7 +1221,6 @@ export XDG_RUNTIME_DIR="/tmp/"
 
 export DESTDIR=%{buildroot}
 meson setup \
-    -Dtizen=true -Dtbm=true \
     -Davahi=false -Dx11=false -Dfb=true -Dwl=true -Dbuffer=true -Dphysics=false -Dopengl=es-egl \
     -Dbuild-examples=false -Dbuild-tests=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \
     -Dtslib=false -Dhyphen=true -Delua=false -Dwl-deprecated=true -Dbindings=[] -Dinstall-eo-files=true \

diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index 6631ac2..eec6ccb 100644 (file)
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -74,7 +74,7 @@ if get_option('pulseaudio')
   config_h.set('HAVE_PULSE', '1')
 endif
 
-if get_option('tizen')
+if get_option('tizen_audio')
   ecore_audio_header_src += [
     'ecore_audio_obj_out_tizen.h'
   ]

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index ab76232..2e5375e 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1035,11 +1035,10 @@ elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_i
 elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con,
                        edje, eldbus, efreet, efreet_mime, efreet_trash, ethumb_client, efl, elocation]
 
-
-#FIXME this dependancy looks weired
-if get_option('tizen')
-  elementary_pub_deps += [dl, thread_dep, ecore_wayland, ecore_wl2]
-endif
+#<--TIZEN_ONLY
+#elementary_deps += ecore_wl2
+elementary_pub_deps += [dl, thread_dep, ecore_wayland, ecore_wl2]
+#TIZEN_ONLY-->
 
 elm_options = configuration_data()
 

diff --git a/src/modules/ecore_evas/engines/extn/meson.build b/src/modules/ecore_evas/engines/extn/meson.build
index 94fa97c..55deb07 100644 (file)
--- a/src/modules/ecore_evas/engines/extn/meson.build
+++ b/src/modules/ecore_evas/engines/extn/meson.build
@@ -1,9 +1,9 @@
 engine_src = files(['ecore_evas_extn.c', 'ecore_evas_extn_buf.c', 'ecore_evas_extn_engine.h'])
 engine_deps = [ecore_input, ecore_ipc]
 
-if get_option('tizen')
-    engine_deps += [ecore_wl2, dependency('tizen-extension-client')]
-endif
+# TIZEN_ONLY
+engine_deps += [ecore_wl2, dependency('tizen-extension-client')]
+# END
 
 shared_module(mod_full_name, engine_src,
   include_directories : config_dir + [engine_include_dir],

diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build
index 8c28fe4..c147873 100644 (file)
--- a/src/modules/ecore_evas/meson.build
+++ b/src/modules/ecore_evas/meson.build
@@ -5,7 +5,10 @@ engines = [
 ['sdl', ['sdl']],
 ['wayland', ['wl']],
 ['x', ['x11']],
-['tbm', ['tbm']],
+]
+
+engines += [
+  ['tbm', ['tbm']],
 ]
 
 if sys_windows == false

diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index 4a65e62..1524d14 100644 (file)
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -30,13 +30,14 @@ if get_option('opengl') == 'es-egl'
   engines += [['wayland_egl', ['wl']]]
 endif
 
-if get_option('tizen') == true
+#<----TIZEN_ONLY
+if get_option('tbm') == true
   engines += [
    ['gl_tbm', []],
    ['software_tbm', []],
   ]
 endif
-
+#TIZEN_ONLY---->
 
 foreach engine_conf : engines
   engine = engine_conf[0]