commit d3b7adae999c75fe5ea1582debad8f91f17bc2fe
Author: Jan Palus <[email protected]>
Date: Sun Dec 25 19:47:25 2022 +0100
update to latest git snap compatible with wlroots 0.16; rel 4
cage.spec | 19 ++--
wlroots-0.15.patch | 306 -----------------------------------------------------
2 files changed, 10 insertions(+), 315 deletions(-)
---
diff --git a/cage.spec b/cage.spec
index 5a52afd..8a1e293 100644
--- a/cage.spec
+++ b/cage.spec
@@ -1,23 +1,25 @@
+%define gitref 5f4c43db04093edf8452efb3b04c3a3c720c78de
+
Summary: A Wayland kiosk
Name: cage
Version: 0.1.4
-Release: 3
+Release: 4
License: MIT
Group: Applications
-Source0:
https://github.com/Hjdskes/cage/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b5874157dbded445cfe674a54805bca9
-Patch0: wlroots-0.15.patch
+Source0:
https://github.com/Hjdskes/cage/archive/%{gitref}/%{name}-%{gitref}.tar.gz
+# Source0-md5: 75a49decbf2022e849b5eaa66c8bc763
URL: https://www.hjdskes.nl/projects/cage/
-BuildRequires: meson
+BuildRequires: meson >= 0.58.1
BuildRequires: ninja
BuildRequires: pixman-devel
+BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: scdoc >= 1.9.2
BuildRequires: wayland-devel
BuildRequires: wayland-protocols >= 1.14
-BuildRequires: wlroots-devel >= 0.15.0
+BuildRequires: wlroots-devel >= 0.16.0
BuildRequires: xorg-lib-libxkbcommon-devel
-Requires: wlroots >= 0.14.0
+Requires: wlroots >= 0.16.0
Requires: xorg-xserver-Xwayland
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,8 +32,7 @@ kiosk compositor displays a single maximized application at a
time and
prevents the user from interacting with anything but this application.
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{gitref}
%build
%meson build \
diff --git a/wlroots-0.15.patch b/wlroots-0.15.patch
deleted file mode 100644
index 9ed7652..0000000
--- a/wlroots-0.15.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 395189fb051ed722c7b10b6cb11caa8f6904079c Mon Sep 17 00:00:00 2001
-From: Simon Ser <[email protected]>
-Date: Wed, 11 Aug 2021 11:31:14 +0200
-Subject: [PATCH] Upgrade to wlroots 0.15
-
-- Update wlr_box includes to util/box.h: the wlroots header has
- been moved upstream.
-- Subsurface fields have been moved
-- Create renderer and allocator, stop using wlr_backend_get_renderer
-- Initalize output rendering
----
- cage.c | 21 +++++++++++++++++----
- meson.build | 2 +-
- output.c | 5 +++++
- render.c | 26 ++++++++------------------
- server.h | 2 ++
- util.c | 2 --
- util.h | 2 +-
- view.c | 5 ++---
- view.h | 2 +-
- xdg_shell.c | 1 -
- xwayland.c | 1 -
- 12 files changed, 41 insertions(+), 36 deletions(-)
-
-diff --git a/cage.c b/cage.c
-index 5392535..f9db7a9 100644
---- a/cage.c
-+++ b/cage.c
-@@ -19,6 +19,7 @@
- #include <unistd.h>
- #include <wayland-server-core.h>
- #include <wlr/backend.h>
-+#include <wlr/render/allocator.h>
- #include <wlr/render/wlr_renderer.h>
- #include <wlr/types/wlr_compositor.h>
- #include <wlr/types/wlr_data_device.h>
-@@ -261,7 +262,6 @@ main(int argc, char *argv[])
- struct wl_event_source *sigint_source = NULL;
- struct wl_event_source *sigterm_source = NULL;
- struct wl_event_source *sigchld_source = NULL;
-- struct wlr_renderer *renderer = NULL;
- struct wlr_compositor *compositor = NULL;
- struct wlr_data_device_manager *data_device_manager = NULL;
- struct wlr_server_decoration_manager *server_decoration_manager = NULL;
-@@ -316,8 +316,21 @@ main(int argc, char *argv[])
- goto end;
- }
-
-- renderer = wlr_backend_get_renderer(server.backend);
-- wlr_renderer_init_wl_display(renderer, server.wl_display);
-+ server.renderer = wlr_renderer_autocreate(server.backend);
-+ if (!server.renderer) {
-+ wlr_log(WLR_ERROR, "Unable to create the wlroots renderer");
-+ ret = 1;
-+ goto end;
-+ }
-+
-+ server.allocator = wlr_allocator_autocreate(server.backend,
server.renderer);
-+ if (!server.allocator) {
-+ wlr_log(WLR_ERROR, "Unable to create the wlroots allocator");
-+ ret = 1;
-+ goto end;
-+ }
-+
-+ wlr_renderer_init_wl_display(server.renderer, server.wl_display);
-
- wl_list_init(&server.views);
- wl_list_init(&server.outputs);
-@@ -329,7 +342,7 @@ main(int argc, char *argv[])
- goto end;
- }
-
-- compositor = wlr_compositor_create(server.wl_display, renderer);
-+ compositor = wlr_compositor_create(server.wl_display, server.renderer);
- if (!compositor) {
- wlr_log(WLR_ERROR, "Unable to create the wlroots compositor");
- ret = 1;
-diff --git a/meson.build b/meson.build
-index 80e72dc..7c57967 100644
---- a/meson.build
-+++ b/meson.build
-@@ -35,7 +35,7 @@ if is_freebsd
- )
- endif
-
--wlroots = dependency('wlroots', version: '>= 0.14.0')
-+wlroots = dependency('wlroots', version: '>= 0.15.0', fallback:
['wlroots', 'wlroots'])
- wayland_protos = dependency('wayland-protocols', version: '>=1.14')
- wayland_server = dependency('wayland-server')
- pixman = dependency('pixman-1')
-diff --git a/output.c b/output.c
-index 0f4f6b2..60266e1 100644
---- a/output.c
-+++ b/output.c
-@@ -442,6 +442,11 @@ handle_new_output(struct wl_listener *listener, void
*data)
- struct cg_server *server = wl_container_of(listener, server,
new_output);
- struct wlr_output *wlr_output = data;
-
-+ if (!wlr_output_init_render(wlr_output, server->allocator,
server->renderer)) {
-+ wlr_log(WLR_ERROR, "Failed to initialize output rendering");
-+ return;
-+ }
-+
- struct cg_output *output = calloc(1, sizeof(struct cg_output));
- if (!output) {
- wlr_log(WLR_ERROR, "Failed to allocate output");
-diff --git a/render.c b/render.c
-index 166a088..ffa960f 100644
---- a/render.c
-+++ b/render.c
-@@ -10,11 +10,11 @@
- #include <wayland-server-core.h>
- #include <wlr/backend.h>
- #include <wlr/render/wlr_renderer.h>
--#include <wlr/types/wlr_box.h>
- #include <wlr/types/wlr_matrix.h>
- #include <wlr/types/wlr_output.h>
- #include <wlr/types/wlr_output_layout.h>
- #include <wlr/types/wlr_surface.h>
-+#include <wlr/util/box.h>
- #include <wlr/util/log.h>
- #include <wlr/util/region.h>
-
-@@ -27,8 +27,6 @@
- static void
- scissor_output(struct wlr_output *output, pixman_box32_t *rect)
- {
-- struct wlr_renderer *renderer =
wlr_backend_get_renderer(output->backend);
--
- struct wlr_box box = {
- .x = rect->x1,
- .y = rect->y1,
-@@ -41,7 +39,7 @@ scissor_output(struct wlr_output *output, pixman_box32_t
*rect)
- enum wl_output_transform transform =
wlr_output_transform_invert(output->transform);
- wlr_box_transform(&box, &box, transform, output_width, output_height);
-
-- wlr_renderer_scissor(renderer, &box);
-+ wlr_renderer_scissor(output->renderer, &box);
- }
-
- struct render_data {
-@@ -52,8 +50,6 @@ static void
- render_texture(struct wlr_output *wlr_output, pixman_region32_t
*output_damage, struct wlr_texture *texture,
- const struct wlr_box *box, const float matrix[static 9])
- {
-- struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
--
- pixman_region32_t damage;
- pixman_region32_init(&damage);
- pixman_region32_union_rect(&damage, &damage, box->x, box->y,
box->width, box->height);
-@@ -66,7 +62,7 @@ render_texture(struct wlr_output *wlr_output,
pixman_region32_t *output_damage,
- pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
- for (int i = 0; i < nrects; i++) {
- scissor_output(wlr_output, &rects[i]);
-- wlr_render_texture_with_matrix(renderer, texture, matrix, 1.0f);
-+ wlr_render_texture_with_matrix(wlr_output->renderer, texture,
matrix, 1.0f);
- }
-
- damage_finish:
-@@ -134,13 +130,7 @@ output_render(struct cg_output *output, pixman_region32_t
*damage)
- struct cg_server *server = output->server;
- struct wlr_output *wlr_output = output->wlr_output;
-
-- struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
-- if (!renderer) {
-- wlr_log(WLR_DEBUG, "Expected the output backend to have a
renderer");
-- return;
-- }
--
-- wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
-+ wlr_renderer_begin(server->renderer, wlr_output->width,
wlr_output->height);
-
- if (!pixman_region32_not_empty(damage)) {
- wlr_log(WLR_DEBUG, "Output isn't damaged but needs a buffer
swap");
-@@ -149,7 +139,7 @@ output_render(struct cg_output *output, pixman_region32_t
*damage)
-
- #ifdef DEBUG
- if (server->debug_damage_tracking) {
-- wlr_renderer_clear(renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f});
-+ wlr_renderer_clear(server->renderer, (float[]){1.0f, 0.0f,
0.0f, 1.0f});
- }
- #endif
-
-@@ -158,7 +148,7 @@ output_render(struct cg_output *output, pixman_region32_t
*damage)
- pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
- for (int i = 0; i < nrects; i++) {
- scissor_output(wlr_output, &rects[i]);
-- wlr_renderer_clear(renderer, color);
-+ wlr_renderer_clear(server->renderer, color);
- }
-
- // TODO: render only top view, possibly use focused view for this, see
#35.
-@@ -178,8 +168,8 @@ output_render(struct cg_output *output, pixman_region32_t
*damage)
- /* Draw software cursor in case hardware cursors aren't
- available. This is a no-op when they are. */
- wlr_output_render_software_cursors(wlr_output, damage);
-- wlr_renderer_scissor(renderer, NULL);
-- wlr_renderer_end(renderer);
-+ wlr_renderer_scissor(server->renderer, NULL);
-+ wlr_renderer_end(server->renderer);
-
- int output_width, output_height;
- wlr_output_transformed_resolution(wlr_output, &output_width,
&output_height);
-diff --git a/server.h b/server.h
-index 817637b..74970c5 100644
---- a/server.h
-+++ b/server.h
-@@ -25,6 +25,8 @@ struct cg_server {
- struct wl_display *wl_display;
- struct wl_list views;
- struct wlr_backend *backend;
-+ struct wlr_renderer *renderer;
-+ struct wlr_allocator *allocator;
-
- struct cg_seat *seat;
- struct wlr_idle *idle;
-diff --git a/util.c b/util.c
-index 95de499..714c7e3 100644
---- a/util.c
-+++ b/util.c
-@@ -6,8 +6,6 @@
- * See the LICENSE file accompanying this file.
- */
-
--#include <wlr/types/wlr_box.h>
--
- #include "util.h"
-
- int
-diff --git a/util.h b/util.h
-index db6bc7d..b6281f3 100644
---- a/util.h
-+++ b/util.h
-@@ -1,7 +1,7 @@
- #ifndef CG_UTIL_H
- #define CG_UTIL_H
-
--#include <wlr/types/wlr_box.h>
-+#include <wlr/util/box.h>
-
- /** Apply scale to a width or height. */
- int scale_length(int length, int offset, float scale);
-diff --git a/view.c b/view.c
-index 3f3b0ed..33b59b4 100644
---- a/view.c
-+++ b/view.c
-@@ -12,7 +12,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <wayland-server-core.h>
--#include <wlr/types/wlr_box.h>
- #include <wlr/types/wlr_output.h>
- #include <wlr/types/wlr_surface.h>
-
-@@ -235,10 +234,10 @@ view_map(struct cg_view *view, struct wlr_surface
*surface)
- view->wlr_surface = surface;
-
- struct wlr_subsurface *subsurface;
-- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below,
parent_link) {
-+ wl_list_for_each (subsurface,
&view->wlr_surface->current.subsurfaces_below, current.link) {
- subsurface_create(view, subsurface);
- }
-- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above,
parent_link) {
-+ wl_list_for_each (subsurface,
&view->wlr_surface->current.subsurfaces_above, current.link) {
- subsurface_create(view, subsurface);
- }
-
-diff --git a/view.h b/view.h
-index cd16e42..87477d0 100644
---- a/view.h
-+++ b/view.h
-@@ -5,9 +5,9 @@
-
- #include <stdbool.h>
- #include <wayland-server-core.h>
--#include <wlr/types/wlr_box.h>
- #include <wlr/types/wlr_surface.h>
- #include <wlr/types/wlr_xdg_shell.h>
-+#include <wlr/util/box.h>
- #if CAGE_HAS_XWAYLAND
- #include <wlr/xwayland.h>
- #endif
-diff --git a/xdg_shell.c b/xdg_shell.c
-index 5bac6de..72ae43a 100644
---- a/xdg_shell.c
-+++ b/xdg_shell.c
-@@ -9,7 +9,6 @@
- #include <stdbool.h>
- #include <stdlib.h>
- #include <wayland-server-core.h>
--#include <wlr/types/wlr_box.h>
- #include <wlr/types/wlr_xdg_shell.h>
- #include <wlr/util/log.h>
-
-diff --git a/xwayland.c b/xwayland.c
-index 2aae0f9..ebd8e54 100644
---- a/xwayland.c
-+++ b/xwayland.c
-@@ -9,7 +9,6 @@
- #include <stdbool.h>
- #include <stdlib.h>
- #include <wayland-server-core.h>
--#include <wlr/types/wlr_box.h>
- #include <wlr/util/log.h>
- #include <wlr/xwayland.h>
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cage.git/commitdiff/d3b7adae999c75fe5ea1582debad8f91f17bc2fe
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
