diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-08-27 14:21:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-27 14:32:21 +0000 |
| commit | 81582189677e36f0f3dc27bd00d5245829f39005 (patch) | |
| tree | 84e532da14c6ba14013b699e2e44aeb8b6e10561 | |
| parent | 989a03132b2bc84fcc87dbd0dfab9f70998010e1 (diff) | |
| download | nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.tar nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.tar.gz nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.tar.bz2 nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.tar.lz nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.tar.xz nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.tar.zst nixpkgs-81582189677e36f0f3dc27bd00d5245829f39005.zip | |
wlroots: fix build
| -rw-r--r-- | pkgs/development/libraries/wlroots/0001-backend-wayland-downgrade-to-wl_compositor-v3.patch | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/wlroots/0002-util-support-virtio_wl-shm-allocation.patch | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/libraries/wlroots/0001-backend-wayland-downgrade-to-wl_compositor-v3.patch b/pkgs/development/libraries/wlroots/0001-backend-wayland-downgrade-to-wl_compositor-v3.patch index dfa3f618793..400bcea368b 100644 --- a/pkgs/development/libraries/wlroots/0001-backend-wayland-downgrade-to-wl_compositor-v3.patch +++ b/pkgs/development/libraries/wlroots/0001-backend-wayland-downgrade-to-wl_compositor-v3.patch @@ -1,6 +1,6 @@ -From 191119447c9326fa117114c4d5e15ff8bc1f1038 Mon Sep 17 00:00:00 2001 +From 32c2af6d7091a5964056f2d3006e333d3602bd82 Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> -Date: Thu, 23 Jan 2020 14:35:41 +0000 +Date: Tue, 25 Aug 2020 17:34:48 +0000 Subject: [PATCH 1/2] backend/wayland: downgrade to wl_compositor v3 Sommelier does not support v4. @@ -15,7 +15,7 @@ It'll do for now. 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c -index e5858158..5d9548e5 100644 +index 8de63acf..b1fddfc7 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -101,7 +101,7 @@ static void registry_global(void *data, struct wl_registry *registry, @@ -39,12 +39,12 @@ index e5858158..5d9548e5 100644 struct wlr_wl_backend *wl = wl_container_of(listener, wl, local_display_destroy); diff --git a/backend/wayland/output.c b/backend/wayland/output.c -index 7a3a08d0..17fa44a7 100644 +index bd17fa20..d91c5cc0 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c -@@ -248,7 +248,9 @@ static bool output_commit(struct wlr_output *wlr_output) { - wl_surface_attach(output->surface, - output->pending_buffer->wl_buffer, 0, 0); +@@ -262,7 +262,9 @@ static bool output_commit(struct wlr_output *wlr_output) { + + wl_surface_attach(output->surface, buffer->wl_buffer, 0, 0); - if (damage == NULL) { + if (wl_compositor_version() < 4) { @@ -54,10 +54,10 @@ index 7a3a08d0..17fa44a7 100644 0, 0, INT32_MAX, INT32_MAX); } else { diff --git a/include/backend/wayland.h b/include/backend/wayland.h -index 4e666c3a..5124f8c0 100644 +index 9a8a404b..9d7b5eb4 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h -@@ -115,6 +115,7 @@ void create_wl_pointer(struct wl_pointer *wl_pointer, struct wlr_wl_output *outp +@@ -114,6 +114,7 @@ void create_wl_pointer(struct wl_pointer *wl_pointer, struct wlr_wl_output *outp void create_wl_keyboard(struct wl_keyboard *wl_keyboard, struct wlr_wl_backend *wl); struct wlr_wl_input_device *create_wl_input_device( struct wlr_wl_backend *backend, enum wlr_input_device_type type); @@ -66,5 +66,5 @@ index 4e666c3a..5124f8c0 100644 extern const struct wl_seat_listener seat_listener; -- -2.26.2 +2.27.0 diff --git a/pkgs/development/libraries/wlroots/0002-util-support-virtio_wl-shm-allocation.patch b/pkgs/development/libraries/wlroots/0002-util-support-virtio_wl-shm-allocation.patch index 2956f822292..90e81596ab4 100644 --- a/pkgs/development/libraries/wlroots/0002-util-support-virtio_wl-shm-allocation.patch +++ b/pkgs/development/libraries/wlroots/0002-util-support-virtio_wl-shm-allocation.patch @@ -1,4 +1,4 @@ -From 3e287337ef82eeb632bd7d67106785591351a3a8 Mon Sep 17 00:00:00 2001 +From 7a85901b79c8a3c82167b446ee20fc46f50b0e1c Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Sat, 23 May 2020 03:42:33 +0000 Subject: [PATCH 2/2] util: support virtio_wl shm allocation @@ -51,13 +51,13 @@ index 00000000..d9f9f045 + +#endif diff --git a/util/meson.build b/util/meson.build -index c6614275..6ec6182b 100644 +index 14cd59c5..87311b98 100644 --- a/util/meson.build +++ b/util/meson.build -@@ -4,4 +4,6 @@ wlr_files += files( - 'region.c', +@@ -6,4 +6,6 @@ wlr_files += files( 'shm.c', 'signal.c', + 'time.c', + 'virtio_wl.c', + 'virtio_wl_shm.c', ) @@ -277,5 +277,5 @@ index 00000000..b2109310 + return r; +} -- -2.26.2 +2.27.0 |