Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update background view to use the new view system #192

Merged
merged 4 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 0 additions & 1 deletion meson_options.txt
Original file line number Diff line number Diff line change
@@ -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')
30 changes: 10 additions & 20 deletions proto/meson.build
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -17,28 +14,21 @@ wayland_scanner_code = generator(
arguments: ['private-code', '@INPUT@', '@OUTPUT@'],
)

wayland_scanner_client = generator(
wayland_scanner,
output: '@BASENAME@-client-protocol.h',
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,
Expand Down
113 changes: 0 additions & 113 deletions proto/virtual-keyboard-unstable-v1.xml

This file was deleted.

67 changes: 0 additions & 67 deletions proto/wlr-input-inhibitor-unstable-v1.xml

This file was deleted.

Loading
Loading