0
0
mirror of https://github.com/termux/termux-packages.git synced 2024-11-13 14:09:19 +00:00
termux-packages/x11-packages/weston/0002-drop-deps-libinput.patch
Kevin Williams fbe6167f45
upgpkg(x11/weston): 14.0.0 (#21384)
Signed-off-by: Kevin Williams <admin@utermux.dev>
2024-09-10 22:47:40 +08:00

127 lines
3.6 KiB
Diff

diff -uNr weston-14.0.0/frontend/meson.build weston-14.0.0.mod/frontend/meson.build
--- weston-14.0.0/frontend/meson.build 2024-09-04 16:53:50.000000000 +0800
+++ weston-14.0.0.mod/frontend/meson.build 2024-09-07 14:51:52.322883177 +0800
@@ -12,7 +12,6 @@
deps_weston = [
dep_libshared,
dep_libweston_public,
- dep_libinput,
dep_libevdev,
dep_libdl,
dep_threads,
diff -uNr weston-14.0.0/frontend/main.c weston-14.0.0.mod/frontend/main.c
--- weston-14.0.0/frontend/main.c 2024-09-04 16:53:50.000000000 +0800
+++ weston-14.0.0.mod/frontend/main.c 2024-09-07 15:02:56.886882924 +0800
@@ -41,7 +41,9 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/socket.h>
+#ifndef __ANDROID__
#include <libinput.h>
+#endif
#include <libevdev/libevdev.h>
#include <linux/input.h>
#include <sys/time.h>
@@ -1070,7 +1072,7 @@
load_pipewire(wet.compositor, wet.config);
}
}
-
+#ifndef __ANDROID__
static int
save_touch_device_calibration(struct weston_compositor *compositor,
struct weston_touch_device *device,
@@ -1128,7 +1130,7 @@
return ret;
}
-
+#endif
static const struct {
const char *name;
enum require_outputs mode;
@@ -1208,14 +1210,14 @@
else
compositor->use_color_manager = true;
}
-
+#ifndef __ANDROID__
/* weston.ini [libinput] */
s = weston_config_get_section(config, "libinput", NULL, NULL);
weston_config_section_get_bool(s, "touchscreen_calibrator", &cal, 0);
if (cal)
weston_compositor_enable_touch_calibrator(ec,
save_touch_device_calibration);
-
+#endif
return 0;
}
@@ -2127,6 +2129,7 @@
}
}
+#ifndef __ANDROID__
static void
configure_input_device_accel(struct weston_config_section *s,
struct libinput_device *device)
@@ -2328,7 +2331,7 @@
configure_input_device_scroll(s, device);
}
-
+#endif
static int
drm_backend_output_configure(struct weston_output *output,
struct weston_config_section *section)
@@ -3377,6 +3380,7 @@
load_drm_backend(struct weston_compositor *c, int *argc, char **argv,
struct weston_config *wc, enum weston_renderer_type renderer)
{
+#ifndef __ANDROID__
struct weston_drm_backend_config config = {{ 0, }};
struct weston_config_section *section;
struct wet_compositor *wet = to_wet_compositor(c);
@@ -3440,7 +3444,10 @@
free(config.gbm_format);
free(config.seat_id);
free(config.specific_device);
-
+#else
+ weston_log("error: drm_backend is not avaiable on Android.\n");
+ abort();
+#endif
return 0;
}
diff -uNr weston-14.0.0/libweston/meson.build weston-14.0.0.mod/libweston/meson.build
--- weston-14.0.0/libweston/meson.build 2024-09-04 16:53:50.000000000 +0800
+++ weston-14.0.0.mod/libweston/meson.build 2024-09-07 14:51:52.322883177 +0800
@@ -180,7 +180,6 @@
install: false
)
dep_session_helper = declare_dependency(link_with: lib_session_helper)
-endif
lib_libinput_backend = static_library(
'libinput-backend',
@@ -201,6 +200,7 @@
link_with: lib_libinput_backend,
include_directories: include_directories('.')
)
+endif
dep_vertex_clipping = declare_dependency(
sources: 'vertex-clipping.c',
diff -uNr weston-14.0.0/meson.build weston-14.0.0.mod/meson.build
--- weston-14.0.0/meson.build 2024-09-04 16:53:50.000000000 +0800
+++ weston-14.0.0.mod/meson.build 2024-09-07 14:51:52.326883177 +0800
@@ -147,7 +147,6 @@
dep_wayland_server = dependency('wayland-server', version: '>= 1.22.0')
dep_wayland_client = dependency('wayland-client', version: '>= 1.22.0')
dep_pixman = dependency('pixman-1', version: '>= 0.25.2')
-dep_libinput = dependency('libinput', version: '>= 1.2.0')
dep_libevdev = dependency('libevdev')
dep_libm = cc.find_library('m')
dep_libdl = cc.find_library('dl')