Revert "Revert "meson: move tizen configuration from meson_options to efl.spec""

This reverts commit f1efd064e0e00444b1c523bf979c1866f89cd10a.

Change-Id: Iada00ffe121a943dcecb3ac4ae1bee398d93db5d

diff --git a/meson_options.txt b/meson_options.txt
index b1b5469..a42d292 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,21 +4,21 @@ option('audio',
   description : 'Audio support in efl'
 )
 
-option('avahi', # TIZEN_CONFIG
+option('avahi',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Avahi (zeroconf) support in efl'
 )
 
-option('x11', # TIZEN_CONFIG
+option('x11',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'X11 support in efl'
 )
 
-option('fb', # TIZEN_CONFIG
+option('fb',
   type : 'boolean',
-  value : true,
+  value : false,
   description : 'Framebuffer (/dev/fb / fbocon) support in efl'
 )
 
@@ -28,15 +28,15 @@ option('sdl',
   description : 'SDL support in efl'
 )
 
-option('wl', # TIZEN_CONFIG
+option('wl',
   type : 'boolean',
-  value : true,
+  value : false,
   description : 'Wayland client support in efl'
 )
 
-option('buffer', # TIZEN_CONFIG
+option('buffer',
   type : 'boolean',
-  value : true,
+  value : false,
   description : 'Generic graphics buffer API support in efl'
 )
 
@@ -52,9 +52,9 @@ option('cocoa',
   description : 'Apple MacOS cocoa support in efl'
 )
 
-option('physics', # TIZEN_CONFIG
+option('physics',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Physics engine (bullet) in efl'
 )
 
@@ -64,10 +64,10 @@ option('eeze',
   description : 'Device abstraction (udev wrapper) in efl'
 )
 
-option('opengl', # TIZEN_CONFIG
+option('opengl',
   type : 'combo',
   choices : ['full', 'es-egl', 'none'],
-  value : 'es-egl',
+  value : 'full',
   description : 'Type of OpenGL support in efl'
 )
 
@@ -88,15 +88,15 @@ option('debug-threads',
   description : 'Thread debugging in efl'
 )
 
-option('build-examples', # TIZEN_CONFIG
+option('build-examples',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Compile examples'
 )
 
-option('build-tests', # TIZEN_CONFIG
+option('build-tests',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Compile tests'
 )
 
@@ -119,21 +119,21 @@ option('g-mainloop',
   description : 'Use glib to run the main loop in efl'
 )
 
-option('gstreamer', # TIZEN_CONFIG
+option('gstreamer',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'GStreamer 1.0+ support in efl'
 )
 
-option('systemd', # TIZEN_CONFIG
+option('systemd',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Systemd support in efl'
 )
 
-option('pulseaudio', #TIZEN_CONFIG
+option('pulseaudio',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Pulseaudio support for audio API'
 )
 
@@ -170,7 +170,7 @@ option('xinput22',
 
 option('tslib',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Framebuffer (/dev/fb / fbcon) touchscreen tslib support in efl'
 )
 
@@ -202,22 +202,22 @@ option('evas-modules',
 option('evas-loaders-disabler',
   type : 'array',
   description : 'List of modular image loaders to disable in efl',
-  choices : ['gst', 'pdf', 'ps', 'raw', 'rsvg', 'svg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json'],
-  value : ['gst', 'pdf', 'ps', 'rsvg', 'raw', 'webp'],
+  choices : ['gst', 'pdf', 'ps', 'raw', 'svg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json'],
+  value : ['webp', 'json']
 )
 
-option('ecore-imf-loaders-disabler', # TIZEN_CONFIG
+option('ecore-imf-loaders-disabler',
   type : 'array',
   description : 'List of input methods to disable in efl',
   choices : ['xim', 'ibus', 'scim'],
-  value : ['xim', 'ibus', 'scim']
+  value : ['scim']
 )
 
 option('emotion-loaders-disabler',
   type : 'array',
   description : 'List of video back-ends to disable in efl',
   choices : ['gstreamer', 'gstreamer1', 'libvlc', 'xine'],
-  value : ['gstreamer','gstreamer1', 'libvlc', 'xine']
+  value : ['gstreamer', 'libvlc', 'xine']
 )
 
 option('emotion-generic-loaders-disabler',
@@ -227,7 +227,7 @@ option('emotion-generic-loaders-disabler',
   value : ['vlc']
 )
 
-option('harfbuzz', # TIZEN_CONFIG
+option('harfbuzz',
   type : 'boolean',
   value : true,
   description : 'Harfbuzz (complex text layout library) support in efl'
@@ -257,9 +257,9 @@ option('pixman',
   description : 'Pixman software renderer support in efl'
 )
 
-option('hyphen', # TIZEN_CONFIG
+option('hyphen',
   type : 'boolean',
-  value : true,
+  value : false,
   description : 'Hyphen text layout support in efl'
 )
 
@@ -287,15 +287,15 @@ option('v4l2',
   description : 'Video v4l2 support'
 )
 
-option('elua', # TIZEN_CONFIG
+option('elua',
   type : 'boolean',
-  value : false,
+  value : true,
   description : 'Lua launcher binary support in efl'
 )
 
 option('wl-deprecated',
   type : 'boolean',
-  value : true,
+  value : false,
   description : 'Deprecated wayland support in efl'
 )
 
@@ -314,7 +314,7 @@ option('nls',
 option('bindings',
   type : 'array',
   choices : ['luajit', 'cxx', 'mono'],
-  value : [],
+  value : ['luajit', 'cxx'],
   description : 'Which auto-generated language bindings for efl to enable',
 )
 
@@ -330,10 +330,10 @@ option('mono-examples-dir',
   description: 'Where eolian_mono will search for examples to embed into the documentation'
 )
 
-option('lua-interpreter', # TIZEN_CONFIG
+option('lua-interpreter',
   type: 'combo',
   choices: ['luajit', 'lua'],
-  value: 'lua',
+  value: 'luajit',
   description: 'Which Lua back-end library to use in efl'
 )
 
@@ -362,18 +362,12 @@ option('dictionaries-hyphen-dir',
   description : 'The path to the hyphen dictionaries directory'
 )
 
-option('elementary-base-dir', # TIZEN_CONFIG
+option('elementary-base-dir',
   type : 'string',
-  value : 'share/.elementary',
+  value : '.elementary',
   description : 'The name of the directory for user supplied elementary data files like themes, config files'
 )
 
-option('eolian-bootstrap',
-  type : 'boolean',
-  value : false,
-  description : 'Only build efl up to eolian_gen and install eina libeolian and eolian_gen, usefull for cross compiles'
-)
-
 option('tbm',
   type: 'boolean',
   value: true,
@@ -386,8 +380,8 @@ option('tizen_audio',
   description: 'enable tizen audio'
 )
 
-option('install-eo-files', # TIZEN_CONFIG
+option('install-eo-files',
   type: 'boolean',
-  value: true,
+  value: false,
   description : 'Install any eo file'
 )

diff --git a/packaging/efl.spec b/packaging/efl.spec
index f5192b2..72aec7a 100644 (file)
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -1221,18 +1221,24 @@ export XDG_RUNTIME_DIR="/tmp/"
 
 export DESTDIR=%{buildroot}
 meson setup \
-                --buildtype plain \
-                --prefix /usr \
-                --libdir %{_libdir} \
-                -Dcpp_std=gnu++11 \
-                builddir 2>&1
+    -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 \
+    -Decore-imf-loaders-disabler="xim, ibus, scim" -Dlua-interpreter=lua \
+    -Demotion-loaders-disabler="gstreamer, gstreamer1, libvlc, xine" \
+    -Devas-loaders-disabler="gst, pdf, ps, svg, raw, webp" \
+    -Delementary-base-dir='share/.elementary' \
+    --buildtype plain \
+    --prefix /usr \
+    --libdir %{_libdir} \
+    -Dcpp_std=gnu++11 \
+    builddir 2>&1
 
 sed -i.bak -e "s/soname,libelementary_t/soname,libelementary/g" builddir/build.ninja
 
 ninja \
                 -C builddir \
                 -j %(echo "`/usr/bin/getconf _NPROCESSORS_ONLN`") \
-                -v \
                 all
 
 %if 0%{?gcov:1}

diff --git a/src/generic/evas/meson.build b/src/generic/evas/meson.build
index 2e5b58a..a6c924f 100644 (file)
--- a/src/generic/evas/meson.build
+++ b/src/generic/evas/meson.build
@@ -1,7 +1,7 @@
 generic_loaders = ['gst', 'pdf',
 'ps',
 'raw',
-'rsvg',
+'svg',
 'xcf']
 
 generic_src = []