Skip to content

Commit

Permalink
Update wlroots to v0.18
Browse files Browse the repository at this point in the history
  • Loading branch information
emersion committed Nov 24, 2023
1 parent 3a3f6f8 commit a62c014
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stb_dep = dependency('stb')

wlroots_dep = dependency(
'wlroots',
version: ['>= 0.17.0', '< 0.18.0'],
version: ['>= 0.18.0', '< 0.19.0'],
fallback: ['wlroots', 'wlroots'],
default_options: ['default_library=static', 'examples=false', 'xwayland=enabled', 'backends=libinput', 'renderers=[]', 'allocators=[]', 'session=enabled'],
)
Expand Down
5 changes: 3 additions & 2 deletions src/wlserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,8 @@ bool wlsession_init( void ) {
if ( BIsNested() )
return true;

wlserver.wlr.session = wlr_session_create( wlserver.display );
auto loop = wl_display_get_event_loop( wlserver.display );
wlserver.wlr.session = wlr_session_create( loop );
if ( wlserver.wlr.session == nullptr )
{
wl_log.errorf( "Failed to create session" );
Expand Down Expand Up @@ -1265,7 +1266,7 @@ gamescope_xwayland_server_t::gamescope_xwayland_server_t(wl_display *display)

update_output_info();

wlr_output_create_global(output);
wlr_output_create_global(output, wlserver.display);
}

gamescope_xwayland_server_t::~gamescope_xwayland_server_t()
Expand Down

0 comments on commit a62c014

Please sign in to comment.