svn commit: r522233 - in branches/2020Q1/x11-wm/cage: . files

[Jan Beich]

Author: jbeich
Date: Mon Jan  6 14:01:22 2020
New Revision: 522233
URL: https://svnweb.freebsd.org/changeset/ports/522233

Log:
  MFH: r522232
  
  x11-wm/cage: fix DRM session after r521656
  
  After VT switch nothing was rendered. From debug log before/after:
  
   [backend/drm/drm.c:1485] Requesting modeset for 'DP-1'
  +[backend/drm/drm.c:697] Modesetting 'DP-1' with '3840x2160 at 60000 mHz'
  +[backend/drm/drm.c:592] Initializing renderer on connector 'DP-1'
  +[GLES2] FS SIMD8 shader: 5 inst, 0 loops, 24 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
  +[GLES2] FS SIMD16 shader: 5 inst, 0 loops, 34 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
  +[GLES2] VS SIMD8 shader: 28 inst, 0 loops, 116 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 448 to 336 bytes.
  +[GLES2] FS SIMD16 shader: 2 inst, 0 loops, 0 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 32 to 32 bytes.
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2020Q1/x11-wm/cage/Makefile
  branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/x11-wm/cage/Makefile
==============================================================================
--- branches/2020Q1/x11-wm/cage/Makefile	Mon Jan  6 14:00:48 2020	(r522232)
+++ branches/2020Q1/x11-wm/cage/Makefile	Mon Jan  6 14:01:22 2020	(r522233)
@@ -3,7 +3,7 @@
 PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9
==============================================================================
--- branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9	Mon Jan  6 14:00:48 2020	(r522232)
+++ branches/2020Q1/x11-wm/cage/files/patch-wlroots-0.9	Mon Jan  6 14:01:22 2020	(r522233)
@@ -1,4 +1,5 @@
 https://github.com/Hjdskes/cage/commit/33bb3c818c59
+https://github.com/Hjdskes/cage/commit/51e6c760da51
 
 --- cage.c.orig	2019-06-03 17:55:52 UTC
 +++ cage.c
@@ -18,3 +19,15 @@ https://github.com/Hjdskes/cage/commit/33bb3c818c59
  	wlr_output_layout_destroy(server.output_layout);
  	/* This function is not null-safe, but we only ever get here
  	   with a proper wl_display. */
+--- output.c.orig	2019-06-03 17:55:52 UTC
++++ output.c
+@@ -386,6 +386,9 @@ handle_new_output(struct wl_listener *listener, void *
+ 	/* Place the cursor in the center of the screen. */
+ 	wlr_cursor_warp(server->seat->cursor, NULL, wlr_output->width / 2, wlr_output->height / 2);
+ 	wlr_output_damage_add_whole(server->output->damage);
++
++	wlr_output_enable(wlr_output, true);
++	wlr_output_commit(wlr_output);
+ }
+ 
+ void