build: Remove `wayland` option

The `wayland` option is now considered an essential feature and is no
longer necessary in the build configuration.

Change-Id: Ia77345ada26fbaf5a6a0548ad36a693d6406d115

diff --git a/meson.build b/meson.build
index 8b43d08c869bbc506d1ff7a04f37ad4a423e5892..311e9844c8c92d13e69dbdcaf2a0b8c5996a3e21 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -152,46 +152,41 @@ if dep_cynara_client.found() == true and dep_cynara_creds_socket.found() == true
   config_h.set('HAVE_CYNARA', '1')
 endif
 
-deps_wayland = []
-if get_option('wayland')
-  deps_wayland = [
-    dependency('wayland-server', version: '>= 1.17.0', required: true),
-    dependency('xkbcommon', required: true),
-    dependency('uuid', required: true),
-    dependency('xdg-shell-unstable-v5-server', required: true),
-    dependency('xdg-shell-unstable-v6-server', required: true),
-    dependency('tizen-remote-surface-server', required: true),
-    dependency('scaler-server', required: true),
-    dependency('screenshooter-server', required: true),
-    dependency('tizen-extension-server', required: true),
-    dependency('tizen-launch-server', required: true),
-    dependency('tizen-surface-server', required: true),
-    dependency('tizen-dpms-server', required: true),
-    dependency('presentation-time-server', required: true),
-    dependency('tizen-hwc-server', required: true),
-    dependency('linux-explicit-synchronization-unstable-v1-server', required: true),
-    dependency('wtz-foreign-server', required: true),
-    dependency('wtz-screen-server', required: true),
-    dependency('wtz-shell-server', required: true),
-    dependency('relative-pointer-unstable-v1-server', required: true),
-    dependency('pointer-constraints-unstable-v1-server', required: true),
-    dependency('single-pixel-buffer-v1-server', required: true),
-    dependency('wtz-blender-server', required: true),
-    dependency('libdrm', required: true),
-    dependency('wtz-video-shell-server', required: true),
-  ]
-
-  if get_option('wayland-tbm')
-    deps_wayland += dependency('wayland-tbm-server', required: true)
-    config_h.set('HAVE_WAYLAND_TBM', '1')
-  endif
+deps_wayland = [
+  dependency('wayland-server', version: '>= 1.17.0', required: true),
+  dependency('xkbcommon', required: true),
+  dependency('uuid', required: true),
+  dependency('xdg-shell-unstable-v5-server', required: true),
+  dependency('xdg-shell-unstable-v6-server', required: true),
+  dependency('tizen-remote-surface-server', required: true),
+  dependency('scaler-server', required: true),
+  dependency('screenshooter-server', required: true),
+  dependency('tizen-extension-server', required: true),
+  dependency('tizen-launch-server', required: true),
+  dependency('tizen-surface-server', required: true),
+  dependency('tizen-dpms-server', required: true),
+  dependency('presentation-time-server', required: true),
+  dependency('tizen-hwc-server', required: true),
+  dependency('linux-explicit-synchronization-unstable-v1-server', required: true),
+  dependency('wtz-foreign-server', required: true),
+  dependency('wtz-screen-server', required: true),
+  dependency('wtz-shell-server', required: true),
+  dependency('relative-pointer-unstable-v1-server', required: true),
+  dependency('pointer-constraints-unstable-v1-server', required: true),
+  dependency('single-pixel-buffer-v1-server', required: true),
+  dependency('wtz-blender-server', required: true),
+  dependency('libdrm', required: true),
+  dependency('wtz-video-shell-server', required: true),
+]
 
-  if get_option('hwc')
-    deps_wayland += dependency('gbm', required: true)
-    config_h.set('HAVE_HWC', '1')
-  endif
+if get_option('wayland-tbm')
+  deps_wayland += dependency('wayland-tbm-server', required: true)
+  config_h.set('HAVE_WAYLAND_TBM', '1')
+endif
 
-  config_h.set('HAVE_WAYLAND', '1')
+if get_option('hwc')
+  deps_wayland += dependency('gbm', required: true)
+  config_h.set('HAVE_HWC', '1')
 endif
 
 dep_omp = dependency('openmp', required: false)

diff --git a/meson_options.txt b/meson_options.txt
index bbf02e8297bd6cdbbd7e9e2648c4c65d10068af6..cbf7d7e38fc0128946c492932e2a320e4fa60b8b 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('wayland', type: 'boolean', value: false, description: 'enable wayland support: (default=false)')
 option('wayland-tbm', type: 'boolean', value: true, description: 'enable wayland TBM support: (default=true)')
 option('hwc', type: 'boolean', value: true, description: 'enable HWC support: (default=true)')
 option('systemd', type: 'boolean', value: true, description: 'enable systemd support: (default=true)')

diff --git a/packaging/enlightenment.spec b/packaging/enlightenment.spec
index b37cc635f7244eed734c574d8a3c28196fb71a75..bcfbdc91633f0295c7065891ba72598533c94754 100644 (file)
--- a/packaging/enlightenment.spec
+++ b/packaging/enlightenment.spec
@@ -132,7 +132,6 @@ meson setup \
     --prefix /usr \
     --libdir %{_libdir} \
     --bindir %{_bindir} \
-    -Dwayland=true \
     -Dfunction-trace=true \
     builddir --reconfigure