From ddc51ce1e53842421ba2871a947338173b6d54a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Bernau?= Date: Mon, 8 Sep 2025 15:41:47 +0200 Subject: [PATCH 1/2] Added feature for rotation for wlroots-18 again --- CHANGELOG | 5 +++ README.md | 7 ++++ cage.1.scd | 4 ++ cage.c | 46 +++++++++++++++------ meson.build | 4 +- output.c | 94 ++++++++++++++++++------------------------ output.h | 1 - seat.c | 2 +- server.h | 1 + x86_64-amd64-cross.txt | 6 +++ x86_64-arm64-cross.txt | 18 ++++++++ xdg_shell.c | 41 +++++++----------- xdg_shell.h | 1 - xwayland.c | 2 +- 14 files changed, 131 insertions(+), 101 deletions(-) create mode 100644 CHANGELOG create mode 100644 x86_64-amd64-cross.txt create mode 100644 x86_64-arm64-cross.txt diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..82a8948 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,5 @@ +cage-kiosk (0.2.1-1) unstable; urgency=low + + * Enabled rotation again with wlroots >= 0.18.0 + + -- Joerg Bernau Mon, 26 May 2025 12:00:00 +0000 diff --git a/README.md b/README.md index d285219..bad1298 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,13 @@ All releases are published on [GitHub](https://github.com/cage-kiosk/cage/releas ## Building and running Cage + +### Installing dependencies + +``` bash +sudo apt install -y libexpat-dev libdisplay-info-dev libliftoff-dev libxcb-errors-dev mesa-common-dev libegl1-mesa-dev libgl1-mesa-dev libgbm-dev libglvnd-core-dev libglw1-mesa-dev libwxgtk3.2-dev libxcb-dri3-dev libxcb-composite0-dev libxcb-present-dev libxcb-render-util0-dev libxcb-ewmh-dev libxcb-xinput-dev libxcb-res0-dev libxcb-icccm4-dev libinput-dev libcairo2-dev libvulkan-dev glslang-dev libseat-dev libsystemd-dev libmng-dev libicu-dev scdoc xwayland hwdata valgrind librust-xkb-dev +``` + You can build Cage with the [meson](https://mesonbuild.com/) build system. It requires wayland, wlroots, and xkbcommon to be installed. Optionally, install scdoc for manual pages. Cage is currently based on branch 0.18 of wlroots. diff --git a/cage.1.scd b/cage.1.scd index ed1f518..850531c 100644 --- a/cage.1.scd +++ b/cage.1.scd @@ -22,6 +22,10 @@ activities outside the scope of the running application are prevented. *-D* Enable debug logging. +*-r* + Transform display orienation + 90 | 180 | 270 | flipped | flipped-90 | flipped-180 | flipped-170 + *-h* Show the help message. diff --git a/cage.c b/cage.c index 9b7c510..ae4f295 100644 --- a/cage.c +++ b/cage.c @@ -226,13 +226,15 @@ usage(FILE *file, const char *cage) fprintf(file, "Usage: %s [OPTIONS] [--] [APPLICATION...]\n" "\n" - " -d\t Don't draw client side decorations, when possible\n" - " -D\t Enable debug logging\n" - " -h\t Display this help message\n" + " -d Don't draw client side decorations, when possible\n" + " -D Enable debug logging\n" + " -h Display this help message\n" + " -r Transform display\n" + " [90, 180, 270, flipped, flipped-90, flipped-180, flipped-170]\n" " -m extend Extend the display across all connected outputs (default)\n" - " -m last Use only the last connected output\n" - " -s\t Allow VT switching\n" - " -v\t Show the version number and exit\n" + " -m last Use only the last connected output\n" + " -s Allow VT switching\n" + " -v Show the version number and exit\n" "\n" " Use -- when you want to pass arguments to APPLICATION\n", cage); @@ -242,7 +244,7 @@ static bool parse_args(struct cg_server *server, int argc, char *argv[]) { int c; - while ((c = getopt(argc, argv, "dDhm:sv")) != -1) { + while ((c = getopt(argc, argv, "dDhm:r:sv")) != -1) { switch (c) { case 'd': server->xdg_decoration = true; @@ -260,6 +262,25 @@ parse_args(struct cg_server *server, int argc, char *argv[]) server->output_mode = CAGE_MULTI_OUTPUT_MODE_EXTEND; } break; + case 'r': + if (strcmp(optarg, "90") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_90; + } else if (strcmp(optarg, "180") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_180; + } else if (strcmp(optarg, "270") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_270; + } else if (strcmp(optarg, "flipped") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_FLIPPED; + } else if (strcmp(optarg, "flipped-90") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_FLIPPED_90; + } else if (strcmp(optarg, "flipped-180") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_FLIPPED_180; + } else if (strcmp(optarg, "flipped-270") == 0) { + server->transform = WL_OUTPUT_TRANSFORM_FLIPPED_270; + } else { + wlr_log(WLR_ERROR, "got unknown transform value: %s", optarg); + } + break; case 's': server->allow_vt_switch = true; break; @@ -280,6 +301,8 @@ main(int argc, char *argv[]) { struct cg_server server = {.log_level = WLR_INFO}; struct wl_event_source *sigchld_source = NULL; + server.transform = WL_OUTPUT_TRANSFORM_NORMAL; + pid_t pid = 0; int ret = 0, app_ret = 0; @@ -304,7 +327,7 @@ main(int argc, char *argv[]) wlr_log(WLR_ERROR, "Cannot allocate a Wayland display"); return 1; } - + server.display_destroy.notify = handle_display_destroy; wl_display_add_destroy_listener(server.wl_display, &server.display_destroy); @@ -416,7 +439,7 @@ main(int argc, char *argv[]) wl_signal_add(&server.idle_inhibit_v1->events.new_inhibitor, &server.new_idle_inhibitor_v1); wl_list_init(&server.inhibitors); - struct wlr_xdg_shell *xdg_shell = wlr_xdg_shell_create(server.wl_display, 5); + struct wlr_xdg_shell *xdg_shell = wlr_xdg_shell_create(server.wl_display, 4); if (!xdg_shell) { wlr_log(WLR_ERROR, "Unable to create the XDG shell interface"); ret = 1; @@ -454,7 +477,7 @@ main(int argc, char *argv[]) goto end; } - struct wlr_presentation *presentation = wlr_presentation_create(server.wl_display, server.backend, 2); + struct wlr_presentation *presentation = wlr_presentation_create(server.wl_display, server.backend); if (!presentation) { wlr_log(WLR_ERROR, "Unable to create the presentation interface"); ret = 1; @@ -630,8 +653,5 @@ end: /* This function is not null-safe, but we only ever get here with a proper wl_display. */ wl_display_destroy(server.wl_display); - wlr_scene_node_destroy(&server.scene->tree.node); - wlr_allocator_destroy(server.allocator); - wlr_renderer_destroy(server.renderer); return ret; } diff --git a/meson.build b/meson.build index 07ca800..f42307b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cage', 'c', - version: '0.2.0', + version: '0.2.1', license: 'MIT', meson_version: '>=0.58.1', default_options: [ @@ -35,7 +35,7 @@ if is_freebsd ) endif -wlroots = dependency('wlroots-0.19', fallback: ['wlroots', 'wlroots']) +wlroots = dependency('wlroots-0.18', fallback: ['wlroots', 'wlroots'], version: '>=0.17.0',) wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') xkbcommon = dependency('xkbcommon') diff --git a/output.c b/output.c index 093836b..9fbb60f 100644 --- a/output.c +++ b/output.c @@ -15,24 +15,24 @@ #include #include #include +#include #include #include #include #if WLR_HAS_X11_BACKEND #include #endif -#include #include #include #include #include #include #include -#include #include #include #include #include +#include #include "output.h" #include "seat.h" @@ -62,6 +62,7 @@ update_output_manager_config(struct cg_server *server) if (!wlr_box_empty(&output_box)) { config_head->state.x = output_box.x; config_head->state.y = output_box.y; + config_head->state.transform = server->transform; } } @@ -132,6 +133,31 @@ output_disable(struct cg_output *output) output_layout_remove(output); } +static bool +output_apply_config(struct cg_output *output, struct wlr_output_configuration_head_v1 *head, bool test_only) +{ + struct wlr_output_state state = {0}; + wlr_output_head_v1_state_apply(&head->state, &state); + + if (test_only) { + bool ret = wlr_output_test_state(output->wlr_output, &state); + return ret; + } + + /* Apply output configuration */ + if (!wlr_output_commit_state(output->wlr_output, &state)) { + return false; + } + + if (head->state.enabled) { + output_layout_add(output, head->state.x, head->state.y); + } else { + output_layout_remove(output); + } + + return true; +} + static void handle_output_frame(struct wl_listener *listener, void *data) { @@ -178,7 +204,6 @@ void handle_output_layout_change(struct wl_listener *listener, void *data) { struct cg_server *server = wl_container_of(listener, server, output_layout_change); - view_position_all(server); update_output_manager_config(server); } @@ -291,7 +316,8 @@ handle_new_output(struct wl_listener *listener, void *data) } } - if (server->output_mode == CAGE_MULTI_OUTPUT_MODE_LAST && wl_list_length(&server->outputs) > 1) { + if (server->output_mode == CAGE_MULTI_OUTPUT_MODE_LAST + && wl_list_length(&server->outputs) > 1) { struct cg_output *next = wl_container_of(output->link.next, next, link); output_disable(next); } @@ -300,8 +326,12 @@ handle_new_output(struct wl_listener *listener, void *data) wlr_log(WLR_ERROR, "Cannot load XCursor theme for output '%s' with scale %f", wlr_output->name, wlr_output->scale); } + + if (server->transform != WL_OUTPUT_TRANSFORM_NORMAL) { + wlr_output_state_set_transform(&state, server->transform); + } - wlr_log(WLR_DEBUG, "Enabling new output %s", wlr_output->name); + wlr_log(WLR_INFO, "Enabling new output %s", wlr_output->name); if (wlr_output_commit_state(wlr_output, &state)) { output_layout_add_auto(output); } @@ -332,63 +362,17 @@ output_set_window_title(struct cg_output *output, const char *title) static bool output_config_apply(struct cg_server *server, struct wlr_output_configuration_v1 *config, bool test_only) { - bool ok = false; - - size_t states_len; - struct wlr_backend_output_state *states = wlr_output_configuration_v1_build_state(config, &states_len); - if (states == NULL) { - return false; - } - - struct wlr_output_swapchain_manager swapchain_manager; - wlr_output_swapchain_manager_init(&swapchain_manager, server->backend); - - ok = wlr_output_swapchain_manager_prepare(&swapchain_manager, states, states_len); - if (!ok || test_only) { - goto out; - } - - for (size_t i = 0; i < states_len; i++) { - struct wlr_backend_output_state *backend_state = &states[i]; - struct cg_output *output = backend_state->output->data; - - struct wlr_swapchain *swapchain = - wlr_output_swapchain_manager_get_swapchain(&swapchain_manager, backend_state->output); - struct wlr_scene_output_state_options options = { - .swapchain = swapchain, - }; - struct wlr_output_state *state = &backend_state->base; - if (!wlr_scene_output_build_state(output->scene_output, state, &options)) { - ok = false; - goto out; - } - } - - ok = wlr_backend_commit(server->backend, states, states_len); - if (!ok) { - goto out; - } - - wlr_output_swapchain_manager_apply(&swapchain_manager); - struct wlr_output_configuration_head_v1 *head; + wl_list_for_each (head, &config->heads, link) { struct cg_output *output = head->state.output->data; - if (head->state.enabled) { - output_layout_add(output, head->state.x, head->state.y); - } else { - output_layout_remove(output); + if (!output_apply_config(output, head, test_only)) { + return false; } } -out: - wlr_output_swapchain_manager_finish(&swapchain_manager); - for (size_t i = 0; i < states_len; i++) { - wlr_output_state_finish(&states[i].base); - } - free(states); - return ok; + return true; } void diff --git a/output.h b/output.h index fa72545..ea773e7 100644 --- a/output.h +++ b/output.h @@ -25,5 +25,4 @@ void handle_output_manager_test(struct wl_listener *listener, void *data); void handle_output_layout_change(struct wl_listener *listener, void *data); void handle_new_output(struct wl_listener *listener, void *data); void output_set_window_title(struct cg_output *output, const char *title); - #endif diff --git a/seat.c b/seat.c index 5f659a4..9acbdd3 100644 --- a/seat.c +++ b/seat.c @@ -937,7 +937,7 @@ seat_set_focus(struct cg_seat *seat, struct cg_view *view) #if CAGE_HAS_XWAYLAND if (view->type == CAGE_XWAYLAND_VIEW) { struct cg_xwayland_view *xwayland_view = xwayland_view_from_view(view); - if (!wlr_xwayland_surface_override_redirect_wants_focus(xwayland_view->xwayland_surface)) { + if (!wlr_xwayland_or_surface_wants_focus(xwayland_view->xwayland_surface)) { return; } } diff --git a/server.h b/server.h index 00c2a61..d1af6b1 100644 --- a/server.h +++ b/server.h @@ -66,6 +66,7 @@ struct cg_server { bool return_app_code; bool terminated; enum wlr_log_importance log_level; + enum wl_output_transform transform; }; void server_terminate(struct cg_server *server); diff --git a/x86_64-amd64-cross.txt b/x86_64-amd64-cross.txt new file mode 100644 index 0000000..f204467 --- /dev/null +++ b/x86_64-amd64-cross.txt @@ -0,0 +1,6 @@ +[binaries] +c = 'clang' +cpp = 'clang' + +[properties] +pkg_config_libdir = '/lib/aarch64-linux-gnu/pkgconfig/' \ No newline at end of file diff --git a/x86_64-arm64-cross.txt b/x86_64-arm64-cross.txt new file mode 100644 index 0000000..9389605 --- /dev/null +++ b/x86_64-arm64-cross.txt @@ -0,0 +1,18 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-g++' +ar = 'aarch64-linux-gnu-ar' +windres = 'aarch64-linux-gnu-windres' +strip = 'aarch64-linux-gnu-strip' +pkgconfig = 'pkg-config' + + + +[host_machine] +system = 'linux' +cpu_family = 'x86_64' +cpu = 'x86_64' +endian = 'little' + +[properties] +pkg_config_libdir = '/lib/aarch64-linux-gnu/pkgconfig/' \ No newline at end of file diff --git a/xdg_shell.c b/xdg_shell.c index 5493918..cae6c90 100644 --- a/xdg_shell.c +++ b/xdg_shell.c @@ -128,10 +128,11 @@ static void get_geometry(struct cg_view *view, int *width_out, int *height_out) { struct cg_xdg_shell_view *xdg_shell_view = xdg_shell_view_from_view(view); - struct wlr_xdg_surface *xdg_surface = xdg_shell_view->xdg_toplevel->base; + struct wlr_box geom; - *width_out = xdg_surface->geometry.width; - *height_out = xdg_surface->geometry.height; + wlr_xdg_surface_get_geometry(xdg_shell_view->xdg_toplevel->base, &geom); + *width_out = geom.width; + *height_out = geom.height; } static bool @@ -184,7 +185,7 @@ destroy(struct cg_view *view) } static void -handle_xdg_toplevel_request_fullscreen(struct wl_listener *listener, void *data) +handle_xdg_shell_surface_request_fullscreen(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, request_fullscreen); @@ -201,7 +202,7 @@ handle_xdg_toplevel_request_fullscreen(struct wl_listener *listener, void *data) } static void -handle_xdg_toplevel_unmap(struct wl_listener *listener, void *data) +handle_xdg_shell_surface_unmap(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, unmap); struct cg_view *view = &xdg_shell_view->view; @@ -210,7 +211,7 @@ handle_xdg_toplevel_unmap(struct wl_listener *listener, void *data) } static void -handle_xdg_toplevel_map(struct wl_listener *listener, void *data) +handle_xdg_shell_surface_map(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, map); struct cg_view *view = &xdg_shell_view->view; @@ -219,7 +220,7 @@ handle_xdg_toplevel_map(struct wl_listener *listener, void *data) } static void -handle_xdg_toplevel_commit(struct wl_listener *listener, void *data) +handle_xdg_shell_surface_commit(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, commit); @@ -227,15 +228,13 @@ handle_xdg_toplevel_commit(struct wl_listener *listener, void *data) return; } - wlr_xdg_toplevel_set_wm_capabilities(xdg_shell_view->xdg_toplevel, XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN); - /* When an xdg_surface performs an initial commit, the compositor must * reply with a configure so the client can map the surface. */ view_position(&xdg_shell_view->view); } static void -handle_xdg_toplevel_destroy(struct wl_listener *listener, void *data) +handle_xdg_shell_surface_destroy(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, destroy); struct cg_view *view = &xdg_shell_view->view; @@ -275,15 +274,15 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data) view_init(&xdg_shell_view->view, server, CAGE_XDG_SHELL_VIEW, &xdg_shell_view_impl); xdg_shell_view->xdg_toplevel = toplevel; - xdg_shell_view->commit.notify = handle_xdg_toplevel_commit; + xdg_shell_view->commit.notify = handle_xdg_shell_surface_commit; wl_signal_add(&toplevel->base->surface->events.commit, &xdg_shell_view->commit); - xdg_shell_view->map.notify = handle_xdg_toplevel_map; + xdg_shell_view->map.notify = handle_xdg_shell_surface_map; wl_signal_add(&toplevel->base->surface->events.map, &xdg_shell_view->map); - xdg_shell_view->unmap.notify = handle_xdg_toplevel_unmap; + xdg_shell_view->unmap.notify = handle_xdg_shell_surface_unmap; wl_signal_add(&toplevel->base->surface->events.unmap, &xdg_shell_view->unmap); - xdg_shell_view->destroy.notify = handle_xdg_toplevel_destroy; + xdg_shell_view->destroy.notify = handle_xdg_shell_surface_destroy; wl_signal_add(&toplevel->events.destroy, &xdg_shell_view->destroy); - xdg_shell_view->request_fullscreen.notify = handle_xdg_toplevel_request_fullscreen; + xdg_shell_view->request_fullscreen.notify = handle_xdg_shell_surface_request_fullscreen; wl_signal_add(&toplevel->events.request_fullscreen, &xdg_shell_view->request_fullscreen); toplevel->base->data = xdg_shell_view; @@ -295,7 +294,6 @@ popup_handle_destroy(struct wl_listener *listener, void *data) struct cg_xdg_popup *popup = wl_container_of(listener, popup, destroy); wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->commit.link); - wl_list_remove(&popup->reposition.link); free(popup); } @@ -309,14 +307,6 @@ popup_handle_commit(struct wl_listener *listener, void *data) } } -static void -popup_handle_reposition(struct wl_listener *listener, void *data) -{ - struct cg_xdg_popup *popup = wl_container_of(listener, popup, reposition); - - popup_unconstrain(popup->xdg_popup); -} - void handle_new_xdg_popup(struct wl_listener *listener, void *data) { @@ -361,9 +351,6 @@ handle_new_xdg_popup(struct wl_listener *listener, void *data) popup->commit.notify = popup_handle_commit; wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit); - popup->reposition.notify = popup_handle_reposition; - wl_signal_add(&wlr_popup->events.reposition, &popup->reposition); - struct wlr_scene_tree *popup_scene_tree = wlr_scene_xdg_surface_create(parent_scene_tree, wlr_popup->base); if (popup_scene_tree == NULL) { wlr_log(WLR_ERROR, "Failed to allocate scene-graph node for XDG popup"); diff --git a/xdg_shell.h b/xdg_shell.h index f819549..1fc000a 100644 --- a/xdg_shell.h +++ b/xdg_shell.h @@ -31,7 +31,6 @@ struct cg_xdg_popup { struct wl_listener destroy; struct wl_listener commit; - struct wl_listener reposition; }; void handle_new_xdg_toplevel(struct wl_listener *listener, void *data); diff --git a/xwayland.c b/xwayland.c index 3df7a08..de81408 100644 --- a/xwayland.c +++ b/xwayland.c @@ -92,7 +92,7 @@ maximize(struct cg_view *view, int output_width, int output_height) struct cg_xwayland_view *xwayland_view = xwayland_view_from_view(view); wlr_xwayland_surface_configure(xwayland_view->xwayland_surface, view->lx, view->ly, output_width, output_height); - wlr_xwayland_surface_set_maximized(xwayland_view->xwayland_surface, true, true); + wlr_xwayland_surface_set_maximized(xwayland_view->xwayland_surface, true); } static void From 9bdbc83d71c36734401770b4255e1a417bbbcbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Bernau?= Date: Mon, 8 Sep 2025 15:51:23 +0200 Subject: [PATCH 2/2] Added feature for rotation for wlroots-18 again --- debian/changelog | 87 +++++++++++++++++++ debian/control | 35 ++++++++ debian/md5sums | 4 + debian/rules | 13 +++ subprojects/edid-decode.wrap | 2 + subprojects/libdisplay-info.wrap | 7 ++ .../subprojects/edid-decode.wrap | 4 + subprojects/libdrm.wrap | 7 ++ subprojects/libliftoff.wrap | 7 ++ subprojects/libxkbcommon.wrap | 8 ++ subprojects/pixman.wrap | 9 ++ subprojects/seatd.wrap | 8 ++ subprojects/wayland-protocols.wrap | 8 ++ subprojects/wayland.wrap | 7 ++ subprojects/wlroots.wrap | 7 ++ 15 files changed, 213 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/md5sums create mode 100644 debian/rules create mode 100644 subprojects/edid-decode.wrap create mode 100644 subprojects/libdisplay-info.wrap create mode 100644 subprojects/libdisplay-info/subprojects/edid-decode.wrap create mode 100644 subprojects/libdrm.wrap create mode 100644 subprojects/libliftoff.wrap create mode 100644 subprojects/libxkbcommon.wrap create mode 100644 subprojects/pixman.wrap create mode 100644 subprojects/seatd.wrap create mode 100644 subprojects/wayland-protocols.wrap create mode 100644 subprojects/wayland.wrap create mode 100644 subprojects/wlroots.wrap diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a29f4ed --- /dev/null +++ b/debian/changelog @@ -0,0 +1,87 @@ +cage (0.2.1-1) experimental; urgency=low + + * Added rotation again under wlroots-18 + + -- Joerg.Bernau Mon, 26 May 2025 12:00:00 +0000 + +cage (0.2.0-2) unstable; urgency=medium + + * Reupload to unstable + + -- Birger Schacht Thu, 26 Dec 2024 15:07:29 +0100 + +cage (0.2.0-1) experimental; urgency=medium + + * New upstream release (Closes: #1081391) + * d/control: bump wlroots build dependency + * d/rules: drop dh_auto_configure override (it was only used for the + xwayland compile time option, which does not exist anymore) + + -- Birger Schacht Mon, 07 Oct 2024 16:06:52 +0200 + +cage (0.1.5+20240127-2) unstable; urgency=medium + + * Add xwayland to Dependencies (Closes: #1063495) + + -- Birger Schacht Fri, 09 Feb 2024 08:32:52 +0100 + +cage (0.1.5+20240127-1) unstable; urgency=medium + + * Upload updated unrelease upstream sources for wlroots 0.17 + compatibility (Closes: #1058495) + * d/rules: change meson option from `true` to `enabled` + * d/copyright: bump years + * d/control: set and update build-dep version constraints + + -- Birger Schacht Sat, 27 Jan 2024 10:44:53 +0100 + +cage (0.1.5-1) unstable; urgency=medium + + * New upstream release + + -- Birger Schacht Fri, 28 Jul 2023 18:56:42 +0200 + +cage (0.1.4+20230724-1) unstable; urgency=medium + + * Package latest upstream sources (Closes: #1041851) + * Drop backported patches + * Update all references to new git repository + * d/control: + + Bump standards-version to 4.6.2 (no changes required) + * d/changelog: + + Bump years + + -- Birger Schacht Mon, 24 Jul 2023 14:26:42 +0200 + +cage (0.1.4-4) unstable; urgency=medium + + [ Debian Janitor ] + * Remove constraints unnecessary since buster: + + Build-Depends: Drop versioned constraint on wayland-protocols. + + [ Birger Schacht ] + * Adapt d/watch to use gitmode + * Bump Standards-Version to 4.6.1.0 (no changes required) + + -- Birger Schacht Wed, 12 Oct 2022 15:54:08 +0200 + +cage (0.1.4-3) unstable; urgency=medium + + * Add patches to build with wlroots 0.15 (thanks to jbicha, Closes: #1008350) + * Drop filenamemangle option from d/watch + * Update year range in d/copyright stanza for debian/* + + -- Birger Schacht Sun, 03 Apr 2022 19:27:37 +0200 + +cage (0.1.4-2) unstable; urgency=medium + + * Fix d/watch + * Add upstream signing key + + -- Birger Schacht Tue, 28 Dec 2021 10:05:58 +0100 + +cage (0.1.4-1) unstable; urgency=medium + + * Initial packaging (Closes: #927899) + + -- Birger Schacht Thu, 16 Dec 2021 12:19:06 +0100 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..eb42e4e --- /dev/null +++ b/debian/control @@ -0,0 +1,35 @@ +Source: cage +Section: x11 +Priority: optional +Maintainer: Sway and related packages team +Uploaders: Birger Schacht +Build-Depends: + debhelper-compat (= 13), + libwlroots-0.18-dev (>= 0.18.0), + wayland-protocols (>= 1.14.0), + libwayland-server0, + libpixman-1-dev, + libxkbcommon-dev, + scdoc, + meson, + pkgconf, +Standards-Version: 4.6.2 +Homepage: https://github.com/cage-kiosk/cage +Vcs-Browser: https://salsa.debian.org/swaywm-team/cage +Vcs-Git: https://salsa.debian.org/swaywm-team/cage.git +Rules-Requires-Root: no + +Package: cage +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + xwayland +Description: Kiosk compositor for Wayland + Cage is a kiosk compositor for Wayland. A kiosk is a window manager (in the + X11 world) or compositor (in the Wayland world) that is designed for a user + experience wherein user interaction and activities outside the scope of the + running application are prevented. That is, a kiosk compositor displays a + single maximized application at a time and prevents the user from interacting + with anything but this application. + diff --git a/debian/md5sums b/debian/md5sums new file mode 100644 index 0000000..95f58da --- /dev/null +++ b/debian/md5sums @@ -0,0 +1,4 @@ +93749c0770fc645faa23fe1295805ed1 usr/bin/cage +32e025aab0ec2a216980bda8845051e2 usr/share/doc/cage/changelog.Debian.gz +a77e584bb3560e2eff09e4493db141da usr/share/doc/cage/copyright +2a320cfa4b6a2cf7eb1839efdebbd2e0 usr/share/man/man1/cage.1.gz diff --git a/debian/rules b/debian/rules new file mode 100644 index 0000000..70def98 --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +export DH_VERBOSE=1 +export DH_OPTIONS=-v + +include /usr/share/dpkg/pkg-info.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --buildsystem=meson + + diff --git a/subprojects/edid-decode.wrap b/subprojects/edid-decode.wrap new file mode 100644 index 0000000..576d579 --- /dev/null +++ b/subprojects/edid-decode.wrap @@ -0,0 +1,2 @@ +[wrap-redirect] +filename = libdisplay-info/subprojects/edid-decode.wrap diff --git a/subprojects/libdisplay-info.wrap b/subprojects/libdisplay-info.wrap new file mode 100644 index 0000000..3f087c0 --- /dev/null +++ b/subprojects/libdisplay-info.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = libdisplay-info +url = https://gitlab.freedesktop.org/emersion/libdisplay-info.git +revision = 5ea36938334f3af016c273ba88679f018ea0b1c6 +depth = 1 + +[patch] diff --git a/subprojects/libdisplay-info/subprojects/edid-decode.wrap b/subprojects/libdisplay-info/subprojects/edid-decode.wrap new file mode 100644 index 0000000..000301a --- /dev/null +++ b/subprojects/libdisplay-info/subprojects/edid-decode.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://git.linuxtv.org/edid-decode.git +revision = c6b859d7f0251e2433fb81bd3f67bd2011c2036c + diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap new file mode 100644 index 0000000..497e990 --- /dev/null +++ b/subprojects/libdrm.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = libdrm +url = https://gitlab.freedesktop.org/mesa/drm.git +revision = 38ec7dbd4df3141441afafe5ac62dfc9df36a77e +depth = 1 + +[patch] diff --git a/subprojects/libliftoff.wrap b/subprojects/libliftoff.wrap new file mode 100644 index 0000000..43f6d08 --- /dev/null +++ b/subprojects/libliftoff.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = libliftoff +url = https://gitlab.freedesktop.org/emersion/libliftoff.git +revision = 8b08dc1c14fd019cc90ddabe34ad16596b0691f4 +depth = 1 + +[patch] diff --git a/subprojects/libxkbcommon.wrap b/subprojects/libxkbcommon.wrap new file mode 100644 index 0000000..ef9a80b --- /dev/null +++ b/subprojects/libxkbcommon.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory = xkbcommon +url = https://github.com/xkbcommon/libxkbcommon.git +revision = master +tag = xkbcommon-1.9.2 +depth = 1 + +[patch] diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap new file mode 100644 index 0000000..a9b5a6f --- /dev/null +++ b/subprojects/pixman.wrap @@ -0,0 +1,9 @@ +[wrap-file] +directory = pixman-0.43.4 +source_url = https://www.x.org/releases/individual/lib/pixman-0.43.4.tar.xz +source_filename = pixman-0.43.4.tar.xz +source_hash = 48d8539f35488d694a2fef3ce17394d1153ed4e71c05d1e621904d574be5df19 + +[provide] +pixman-1 = idep_pixman + diff --git a/subprojects/seatd.wrap b/subprojects/seatd.wrap new file mode 100644 index 0000000..2756718 --- /dev/null +++ b/subprojects/seatd.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory = seatd +url = https://github.com/kennylevinsen/seatd.git +revision = master +tag = v0.9.1 +depth = 1 + +[patch] diff --git a/subprojects/wayland-protocols.wrap b/subprojects/wayland-protocols.wrap new file mode 100644 index 0000000..d5fda9e --- /dev/null +++ b/subprojects/wayland-protocols.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory = wayland-protocols +url = https://gitlab.freedesktop.org/wayland/wayland-protocols.git +revision = 810f1adaf33521cc55fc510566efba2a1418174f +depth = 1 + +[patch] + diff --git a/subprojects/wayland.wrap b/subprojects/wayland.wrap new file mode 100644 index 0000000..fe8ed6a --- /dev/null +++ b/subprojects/wayland.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = wayland +url = https://gitlab.freedesktop.org/wayland/wayland.git +revision = a9fec8dd65977c57f4039ced34327204d9b9d779 +depth = 1 + +[patch] diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap new file mode 100644 index 0000000..5d70e66 --- /dev/null +++ b/subprojects/wlroots.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = wlroots +url = https://gitlab.freedesktop.org/wlroots/wlroots.git +revision = 766a228da4eaea221470c2b939ce3db20a9d1600 +depth = 1 + +[patch]