Skip to content
Open
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
8 changes: 4 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dbusmenu_gtk = dependency('dbusmenu-glib-0.4')
xkbregistry = dependency('xkbregistry')
json = subproject('wf-json').get_variable('wfjson')
openssl = dependency('openssl')
gbm = dependency('gbm', required: get_option('live-previews-dmabuf'))
drm = dependency('libdrm', required: get_option('live-previews-dmabuf'))
gbm = dependency('gbm', required: false)
drm = dependency('libdrm', required: false)

if get_option('wayland-logout') == true
wayland_logout = subproject('wayland-logout')
Expand All @@ -45,8 +45,8 @@ if get_option('weather') == true
add_project_arguments('-DHAVE_WEATHER=1', language: 'cpp')
endif

if gbm.found() and drm.found() and not get_option('live-previews-dmabuf').disabled()
add_project_arguments('-DHAVE_DMABUF=1', language: 'cpp')
if not gbm.found() or not drm.found()
message('Live window previews require gbm and libdrm dependencies')
endif

if libpulse.found()
Expand Down
6 changes: 0 additions & 6 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,3 @@ option(
value: false,
description: 'Install weather widgets and open-weather-fetch systemd service',
)
option(
'live-previews-dmabuf',
type: 'feature',
value: 'auto',
description: 'Enable live window preview tooltips when hovering over window-list buttons in wf-panel'
)
1 change: 0 additions & 1 deletion proto/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ client_protocols = [
[wl_protocol_dir, 'staging/ext-image-capture-source/ext-image-capture-source-v1.xml'],
[wl_protocol_dir, 'staging/ext-image-copy-capture/ext-image-copy-capture-v1.xml'],
'wlr-foreign-toplevel-management-unstable-v1.xml',
'wlr-screencopy.xml',
wayfire.get_pkgconfig_variable('pkgdatadir') / 'unstable' / 'wayfire-shell-unstable-v2.xml',
]

Expand Down
231 changes: 0 additions & 231 deletions proto/wlr-screencopy.xml

This file was deleted.

4 changes: 2 additions & 2 deletions src/panel/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ else
message('Weather disabled, weather widgets and owf service not included.')
endif

if gbm.found() and drm.found() and not get_option('live-previews-dmabuf').disabled()
if gbm.found() and drm.found()
deps += [gbm, drm]
else
message('Development packages for gbm and drm are required to enable live window preview tooltips in wf-panel.')
message('Development packages for gbm and libdrm are required to enable live window preview tooltips in wf-panel.')
endif

executable(
Expand Down
Loading
Loading