Merge pull request #192 from WayfireWM/fix-background-view

Update background view to use the new view system

meson.build

@@ -15,6 +15,8 @@ project(
 
 wayfire = dependency('wayfire')
 giomm = dependency('giomm-2.4', required: false)
+wayland_protos = dependency('wayland-protocols', version: '>=1.12')
+wayland_server = dependency('wayland-server')
 
 if get_option('enable_windecor') == true
     windecor = subproject('windecor')

meson_options.txt

@@ -1,4 +1,3 @@
-option('enable_nk', type: 'boolean', value: false, description: 'Enable network-keyboard demo')
 option('enable_windecor', type: 'boolean', value: 'false', description: 'Install windecor plugin')
 option('enable_wayfire_shadows', type: 'boolean', value: 'false', description: 'Install wayfire shadows plugin')
 option('enable_focus_request', type: 'boolean', value: 'false', description: 'Install wayfire focus-request plugin')

proto/meson.build

@@ -1,9 +1,6 @@
-wayland_protos = dependency('wayland-protocols')
-wayland_client = dependency('wayland-client')
+wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir')
 
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
-
-wayland_scanner = find_program('wayland-scanner')
+wayland_scanner = find_program('wayland-scanner', native: true)
 
 wayland_scanner_server = generator(
 	wayland_scanner,
@@ -17,28 +14,21 @@ wayland_scanner_code = generator(
 	arguments: ['private-code', '@INPUT@', '@OUTPUT@'],
 )
 
-wayland_scanner_client = generator(
-	wayland_scanner,
-	output: '@[email protected]',
-	arguments: ['client-header', '@INPUT@', '@OUTPUT@'],
-)
-
-client_protocols = [
-    './virtual-keyboard-unstable-v1.xml',
-    './wlr-input-inhibitor-unstable-v1.xml'
+server_protocols = [
+	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 ]
 
-wl_protos_client_src = []
+wl_protos_src = []
 wl_protos_headers = []
 
-foreach p : client_protocols
+foreach p : server_protocols
 	xml = join_paths(p)
-	wl_protos_headers += wayland_scanner_client.process(xml)
-	wl_protos_client_src += wayland_scanner_code.process(xml)
+	wl_protos_src += wayland_scanner_code.process(xml)
+	wl_protos_headers += wayland_scanner_server.process(xml)
 endforeach
 
-lib_wl_protos = static_library('wl_protos', wl_protos_client_src + wl_protos_headers,
-	dependencies: [wayland_client]) # for the include directory
+lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers,
+	dependencies: [wayland_server]) # for the include directory
 
 wf_protos = declare_dependency(
 	link_with: lib_wl_protos,