Build gen / x11 VCL backend without skia

Change-Id: Ia2bc07cca816bbb03b636660405d375af0ac0d35

4 files changed, 27 insertions, 18 deletions

diff --git a/config_host/config_skia.h.meson b/config_host/config_skia.h.meson
new file mode 100644
index 000000000000..0d0d8bde1a5b
--- /dev/null
+++ b/config_host/config_skia.h.meson
@@ -0,0 +1,6 @@
+#ifndef CONFIG_SKIA_H
+#define CONFIG_SKIA_H
+
+#mesondefine HAVE_FEATURE_SKIA
+
+#endif
diff --git a/config_host/meson.build b/config_host/meson.build
index b34a2a0f4990..48aebf52e1a7 100644
--- a/config_host/meson.build
+++ b/config_host/meson.build
@@ -108,6 +108,8 @@ cdata.set10('HAVE_CXXABI_H_VMI_CLASS_TYPE_INFO', true)
 
 cdata.set10('HAVE_DCONF', false)
 
+cdata.set10('HAVE_FEATURE_SKIA', false)
+
 configure_file(input: 'config_typesizes.h.meson',
   output: 'config_typesizes.h',
   configuration: cdata)
@@ -244,6 +246,6 @@ configure_file(input: 'config_dconf.h.meson',
   output: 'config_dconf.h',
   configuration: cdata)
 
-configure_file(input: 'config_skia.h.in',
+configure_file(input: 'config_skia.h.meson',
   output: 'config_skia.h',
   configuration: cdata)
diff --git a/meson.build b/meson.build
index cff452fa7a4b..ebef7c09dd83 100644
--- a/meson.build
+++ b/meson.build
@@ -128,12 +128,6 @@ gtk3_dep = dependency('gtk+-3.0')
 gtkprint_dep = dependency('gtk+-unix-print-3.0')
 dbus_dep = dependency('dbus-1')
 gio_dep = dependency('gio-2.0')
-xext_dep = dependency('xext')
-x11_dep = dependency('x11')
-xrandr_dep = dependency('xrandr')
-xrender_dep = dependency('xrender')
-sm_dep = dependency('sm')
-ice_dep = dependency('ice')
 fc_dep = dependency('fontconfig')
 orcus_dep = dependency('liborcus-0.15')
 clucene_dep = dependency('libclucene-core')
@@ -164,6 +158,13 @@ mythes_dep = dependency('mythes')
 libexttextcat_dep = dependency('libexttextcat')
 numbertext_dep = dependency('libnumbertext')
 
+x11_core_dep = dependency('x11')
+x11_ice_dep = dependency('ice')
+x11_sm_dep = dependency('sm')
+x11_xext_dep = dependency('xext')
+x11_xrandr_dep = dependency('xrandr')
+x11_xrender_dep = dependency('xrender')
+
 qt5 = import('qt5')
 qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'])
 qt5_x11_dep = dependency('qt5', modules: ['X11Extras'])
diff --git a/vcl/meson.build b/vcl/meson.build
index da938ede5110..95ae18ba9ffd 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -1,6 +1,6 @@
 glxtest_lib = static_library('glxtest', 'unx/glxtest.cxx',
   include_directories: [main_inc, 'inc'],
-  dependencies: [x11_dep, dl_dep],
+  dependencies: [x11_core_dep, dl_dep],
 )
 
 vcl_lib = shared_library('vcllo',
@@ -456,9 +456,9 @@ vcl_lib = shared_library('vcllo',
     jpg_dep,
     lcms_dep,
     png_dep,
-    x11_dep,
-    xext_dep,
-  ], 
+    x11_core_dep,
+    x11_xext_dep,
+  ],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -522,7 +522,7 @@ vclplug_gtk3 = shared_library('vclplug_gtk3lo',
     epoxy_dep,
     gtk3_dep,
     gtkprint_dep,
-    x11_dep,
+    x11_core_dep,
   ],
   gnu_symbol_visibility: 'hidden',
   install: true,
@@ -592,12 +592,12 @@ vclplug_gen = shared_library('vclplug_genlo',
     epoxy_dep,
     freetype_dep,
     harfbuzz_dep,
-    ice_dep,
-    sm_dep,
-    x11_dep,
-    xext_dep,
-    xrandr_dep,
-    xrender_dep,
+    x11_core_dep,
+    x11_ice_dep,
+    x11_sm_dep,
+    x11_xext_dep,
+    x11_xrandr_dep,
+    x11_xrender_dep,
   ], 
   gnu_symbol_visibility: 'hidden',
   install: true,