commit cage for openSUSE:Factory
Hello community,
here is the log from the commit of package cage for openSUSE:Factory checked in
at 2020-07-17 20:48:20
Comparing /work/SRC/openSUSE:Factory/cage (Old)
and /work/SRC/openSUSE:Factory/.cage.new.3592 (New)
Package is "cage"
Fri Jul 17 20:48:20 2020 rev:4 rq:821323 version:0.1.2.1
Changes:
--- /work/SRC/openSUSE:Factory/cage/cage.changes2020-04-02
17:45:12.537518735 +0200
+++ /work/SRC/openSUSE:Factory/.cage.new.3592/cage.changes 2020-07-17
20:49:05.248809971 +0200
@@ -1,0 +2,27 @@
+Thu Jul 16 14:29:01 UTC 2020 - Michael Vetter
+
+- Update to 0.1.2.1:
+ * man: indent with tabs (#156)
+
+---
+Thu Jul 16 14:10:04 UTC 2020 - Michael Vetter
+
+- Update to 0.1.2:
+ * Cage now implements the
+wlr-screencopy-unstable-v1,
+xdg-output-unstable-v1.xml,
+wlr-gamma-control-unstable-v1,
+and wlr_export_dmabuf_unstable_v1 protocols.
+ * Support for direct scan-out has been added to Cage.
+ * Cage now allows switching VTs
+ * Extended multi monitor behaviour
+One to extend the application across the monitors' bounding
+box and another to use only the last plugged in monitor.
+ * Add support for keyboard groups.
+ * Cage now comes with a manpage
+ * For details see https://github.com/Hjdskes/cage/releases/tag/v0.1.2
+- Remove because in new release:
+ * cage-0.1.1-new-wlroots.patch
+ * cage-0.1.1-dont-terminate-display.patch
+
+---
Old:
cage-0.1.1-dont-terminate-display.patch
cage-0.1.1-new-wlroots.patch
v0.1.1.tar.gz
New:
v0.1.2.1.tar.gz
Other differences:
--
++ cage.spec ++
--- /var/tmp/diff_new_pack.gy7pPB/_old 2020-07-17 20:49:07.264812074 +0200
+++ /var/tmp/diff_new_pack.gy7pPB/_new 2020-07-17 20:49:07.268812078 +0200
@@ -17,19 +17,18 @@
Name: cage
-Version:0.1.1
+Version:0.1.2.1
Release:0
Summary:Wayland Kiosk
License:MIT
Group: System/GUI/Other
URL:https://www.hjdskes.nl/projects/cage/
Source: https://github.com/Hjdskes/cage/archive/v%{version}.tar.gz
-Patch0: cage-0.1.1-new-wlroots.patch
-Patch1: cage-0.1.1-dont-terminate-display.patch
-BuildRequires: libpixman-1-0-devel
BuildRequires: meson >= 0.43.0
BuildRequires: pkgconfig
-BuildRequires: wlroots-devel >= 0.9.1
+BuildRequires: scdoc
+BuildRequires: wlroots-devel >= 0.11.0
+BuildRequires: pkgconfig(pixman-1)
BuildRequires: pkgconfig(wayland-protocols) >= 1.14
BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(xkbcommon)
@@ -39,8 +38,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%meson
@@ -53,5 +50,6 @@
%license LICENSE
%doc README.md
%{_bindir}/cage
+%{_mandir}/man1/cage.1%{?ext_man}
%changelog
++ v0.1.1.tar.gz -> v0.1.2.1.tar.gz ++
3165 lines of diff (skipped)
commit cage for openSUSE:Factory
Hello community,
here is the log from the commit of package cage for openSUSE:Factory checked in
at 2020-04-02 17:44:50
Comparing /work/SRC/openSUSE:Factory/cage (Old)
and /work/SRC/openSUSE:Factory/.cage.new.3248 (New)
Package is "cage"
Thu Apr 2 17:44:50 2020 rev:3 rq:790836 version:0.1.1
Changes:
--- /work/SRC/openSUSE:Factory/cage/cage.changes2020-01-24
13:12:31.937466062 +0100
+++ /work/SRC/openSUSE:Factory/.cage.new.3248/cage.changes 2020-04-02
17:45:12.537518735 +0200
@@ -1,0 +2,6 @@
+Thu Apr 2 10:03:21 UTC 2020 - Michael Vetter
+
+- Add cage-0.1.1-dont-terminate-display.patch: dont terminate display
+ Some applications wont work correctly otherwise.
+
+---
New:
cage-0.1.1-dont-terminate-display.patch
Other differences:
--
++ cage.spec ++
--- /var/tmp/diff_new_pack.bszTbS/_old 2020-04-02 17:45:15.113521847 +0200
+++ /var/tmp/diff_new_pack.bszTbS/_new 2020-04-02 17:45:15.117521852 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cage
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,7 @@
URL:https://www.hjdskes.nl/projects/cage/
Source: https://github.com/Hjdskes/cage/archive/v%{version}.tar.gz
Patch0: cage-0.1.1-new-wlroots.patch
+Patch1: cage-0.1.1-dont-terminate-display.patch
BuildRequires: libpixman-1-0-devel
BuildRequires: meson >= 0.43.0
BuildRequires: pkgconfig
@@ -39,6 +40,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%meson
++ cage-0.1.1-dont-terminate-display.patch ++
>From 5d7ff9e64dc71cdcfd66097571b1c995e1556e47 Mon Sep 17 00:00:00 2001
From: Matthew Bauer
Date: Mon, 16 Mar 2020 15:32:24 -0400
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20terminate=20display=20when=20no?=
=?UTF-8?q?=20view=20is=20found=20(#132)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Don’t terminate display when no view is found
Some apps like RetroArch will quit and fork itself to switch
modes (like from the menu to a loaded core). This means that for a
very short period of time we have no view available for Wayland. Right
now, Cage doesn’t actually exit when it does this terminate, so you
get this kind of zombie child process that is running but not showing
anything on the screen because there is no compositor.
The solution I have here is to just keep Cage’s Wayland server running
to avoid this issue. I’m open to other idea, but this seems sane to
me. Perhaps an alternative is to check if the process is still alive
when this happens, if not then we can do the quitting behavior. In
addition, we could make this an option if some users don’t want this
behavior.
* Remove "ever_been_mapped" from cg_wayland_view
---
view.c | 12
xwayland.c | 1 -
xwayland.h | 15 ---
3 files changed, 28 deletions(-)
diff --git a/view.c b/view.c
index 3dc7b34..0b8d377 100644
--- a/view.c
+++ b/view.c
@@ -259,14 +259,6 @@ void
view_destroy(struct cg_view *view)
{
struct cg_server *server = view->server;
- bool ever_been_mapped = true;
-
-#if CAGE_HAS_XWAYLAND
- if (view->type == CAGE_XWAYLAND_VIEW) {
- struct cg_xwayland_view *xwayland_view =
xwayland_view_from_view(view);
- ever_been_mapped = xwayland_view->ever_been_mapped;
- }
-#endif
if (view->wlr_surface != NULL) {
view_unmap(view);
@@ -279,10 +271,6 @@ view_destroy(struct cg_view *view)
if (!empty) {
struct cg_view *prev = wl_container_of(server->views.next,
prev, link);
seat_set_focus(server->seat, prev);
- } else if (ever_been_mapped) {
- /* The list is empty and the last view has been
- mapped, so we can safely exit. */
- wl_display_terminate(server->wl_display);
}
}
diff --git a/xwayland.c b/xwayland.c
index 1aca1cc..53c9768 100644
--- a/xwayland.c
+++ b/xwayland.c
@@ -151,7 +151,6 @@ handle_xwayland_surface_map(struct wl_listener *listener,
void *data)
xwayland_view->commit.notify = handle_xwayland_surface_commit;
wl_signal_add(_view->xwayland_surface->surface->events.commit,
_view->commit);
- xwayland_view->ever_been_mapped = true;
view_map(view, xwayland_view->xwayland_surface->surface);
view_damage_whole(view);
diff --git a/xwayland.h b/xwayland.h
index 4cfd4b0..d257f57 100644
--- a/xwayland.h
+++ b/xwayland.h
@@ -9,21 +9,6 @@
struct
commit cage for openSUSE:Factory
Hello community,
here is the log from the commit of package cage for openSUSE:Factory checked in
at 2020-01-24 13:11:43
Comparing /work/SRC/openSUSE:Factory/cage (Old)
and /work/SRC/openSUSE:Factory/.cage.new.26092 (New)
Package is "cage"
Fri Jan 24 13:11:43 2020 rev:2 rq:766649 version:0.1.1
Changes:
--- /work/SRC/openSUSE:Factory/cage/cage.changes2019-06-04
12:14:45.295774327 +0200
+++ /work/SRC/openSUSE:Factory/.cage.new.26092/cage.changes 2020-01-24
13:12:31.937466062 +0100
@@ -1,0 +2,5 @@
+Thu Jan 23 15:22:35 UTC 2020 - Michael Vetter
+
+- Add cage-0.1.1-new-wlroots.patch: make it work with newer wlroots
+
+---
New:
cage-0.1.1-new-wlroots.patch
Other differences:
--
++ cage.spec ++
--- /var/tmp/diff_new_pack.CuSc9P/_old 2020-01-24 13:12:33.44147 +0100
+++ /var/tmp/diff_new_pack.CuSc9P/_new 2020-01-24 13:12:33.44548 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cage
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,10 +24,11 @@
Group: System/GUI/Other
URL:https://www.hjdskes.nl/projects/cage/
Source: https://github.com/Hjdskes/cage/archive/v%{version}.tar.gz
+Patch0: cage-0.1.1-new-wlroots.patch
BuildRequires: libpixman-1-0-devel
BuildRequires: meson >= 0.43.0
BuildRequires: pkgconfig
-BuildRequires: wlroots-devel >= 0.6
+BuildRequires: wlroots-devel >= 0.9.1
BuildRequires: pkgconfig(wayland-protocols) >= 1.14
BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(xkbcommon)
@@ -37,6 +38,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%meson
++ cage-0.1.1-new-wlroots.patch ++
diff -urEbw cage-0.1.1/cage.c cage-0.1.1.new/cage.c
--- cage-0.1.1/cage.c 2019-06-03 19:55:52.0 +0200
+++ cage-0.1.1.new/cage.c 2020-01-23 16:21:21.210364904 +0100
@@ -374,15 +374,6 @@
wl_event_source_remove(sigint_source);
wl_event_source_remove(sigterm_source);
seat_destroy(server.seat);
- wlr_server_decoration_manager_destroy(server_decoration_manager);
- wlr_xdg_decoration_manager_v1_destroy(xdg_decoration_manager);
- wlr_xdg_shell_destroy(xdg_shell);
- wlr_idle_inhibit_v1_destroy(server.idle_inhibit_v1);
- if (server.idle) {
- wlr_idle_destroy(server.idle);
- }
- wlr_data_device_manager_destroy(data_device_mgr);
- wlr_compositor_destroy(compositor);
wlr_output_layout_destroy(server.output_layout);
/* This function is not null-safe, but we only ever get here
with a proper wl_display. */
diff -urEbw cage-0.1.1/meson.build cage-0.1.1.new/meson.build
--- cage-0.1.1/meson.build 2019-06-03 19:55:52.0 +0200
+++ cage-0.1.1.new/meson.build 2020-01-23 16:11:00.559237129 +0100
@@ -35,7 +35,7 @@
)
endif
-wlroots= dependency('wlroots', version: '>= 0.6.0')
+wlroots= dependency('wlroots', version: '>= 0.9.1')
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_server = dependency('wayland-server')
pixman = dependency('pixman-1')
diff -urEbw cage-0.1.1/output.c cage-0.1.1.new/output.c
--- cage-0.1.1/output.c 2019-06-03 19:55:52.0 +0200
+++ cage-0.1.1.new/output.c 2020-01-23 16:12:47.115771758 +0100
@@ -207,6 +207,7 @@
}
if (!needs_frame) {
+ wlr_output_rollback(output->wlr_output);
wlr_log(WLR_DEBUG, "Output doesn't need frame and isn't
damaged");
goto buffer_damage_finish;
}
@@ -386,6 +387,9 @@
/* 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
