diff --git a/app/src/main/jni/prebuilt/Android.mk b/app/src/main/jni/prebuilt/Android.mk index e68a244..f3ddf8f 100644 --- a/app/src/main/jni/prebuilt/Android.mk +++ b/app/src/main/jni/prebuilt/Android.mk @@ -10,6 +10,11 @@ LOCAL_MODULE := ffi LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/libffi.so include $(PREBUILT_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := expat +LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/libexpat.so +include $(PREBUILT_SHARED_LIBRARY) + include $(CLEAR_VARS) LOCAL_MODULE := wayland-server LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/libwayland-server.so diff --git a/app/src/main/jni/prebuilt/Android.mk2 b/app/src/main/jni/prebuilt/Android.mk2 index b7ddc2d..09c3448 100644 --- a/app/src/main/jni/prebuilt/Android.mk2 +++ b/app/src/main/jni/prebuilt/Android.mk2 @@ -13,7 +13,9 @@ prebuilt = $(eval $(call ev-prebuilt, $1)) # libs are prebuilt with termux $(info $(call ev-prebuilt, android-support)) $(info $(call ev-prebuilt, ffi)) +$(info $(call ev-prebuilt, expat)) $(info $(call ev-prebuilt, wayland-server)) $(call prebuilt, android-support) $(call prebuilt, ffi) +$(call prebuilt, expat) $(call prebuilt, wayland-server) diff --git a/app/src/main/jni/prebuilt/arm64-v8a/libandroid-support.so b/app/src/main/jni/prebuilt/arm64-v8a/libandroid-support.so index 76eb0d0..aee30ce 100755 Binary files a/app/src/main/jni/prebuilt/arm64-v8a/libandroid-support.so and b/app/src/main/jni/prebuilt/arm64-v8a/libandroid-support.so differ diff --git a/app/src/main/jni/prebuilt/arm64-v8a/libexpat.so b/app/src/main/jni/prebuilt/arm64-v8a/libexpat.so new file mode 100755 index 0000000..6098231 Binary files /dev/null and b/app/src/main/jni/prebuilt/arm64-v8a/libexpat.so differ diff --git a/app/src/main/jni/prebuilt/arm64-v8a/libffi.so b/app/src/main/jni/prebuilt/arm64-v8a/libffi.so index 666c38b..30772ed 100755 Binary files a/app/src/main/jni/prebuilt/arm64-v8a/libffi.so and b/app/src/main/jni/prebuilt/arm64-v8a/libffi.so differ diff --git a/app/src/main/jni/prebuilt/arm64-v8a/libwayland-server.so b/app/src/main/jni/prebuilt/arm64-v8a/libwayland-server.so index 491b0c4..688a7e7 100755 Binary files a/app/src/main/jni/prebuilt/arm64-v8a/libwayland-server.so and b/app/src/main/jni/prebuilt/arm64-v8a/libwayland-server.so differ diff --git a/app/src/main/jni/prebuilt/armeabi-v7a/libandroid-support.so b/app/src/main/jni/prebuilt/armeabi-v7a/libandroid-support.so index cb61272..c30d654 100755 Binary files a/app/src/main/jni/prebuilt/armeabi-v7a/libandroid-support.so and b/app/src/main/jni/prebuilt/armeabi-v7a/libandroid-support.so differ diff --git a/app/src/main/jni/prebuilt/armeabi-v7a/libexpat.so b/app/src/main/jni/prebuilt/armeabi-v7a/libexpat.so new file mode 100755 index 0000000..988d549 Binary files /dev/null and b/app/src/main/jni/prebuilt/armeabi-v7a/libexpat.so differ diff --git a/app/src/main/jni/prebuilt/armeabi-v7a/libffi.so b/app/src/main/jni/prebuilt/armeabi-v7a/libffi.so index 4de1dab..2230a9b 100755 Binary files a/app/src/main/jni/prebuilt/armeabi-v7a/libffi.so and b/app/src/main/jni/prebuilt/armeabi-v7a/libffi.so differ diff --git a/app/src/main/jni/prebuilt/armeabi-v7a/libwayland-server.so b/app/src/main/jni/prebuilt/armeabi-v7a/libwayland-server.so index d0cd22d..336767d 100755 Binary files a/app/src/main/jni/prebuilt/armeabi-v7a/libwayland-server.so and b/app/src/main/jni/prebuilt/armeabi-v7a/libwayland-server.so differ diff --git a/app/src/main/jni/prebuilt/include/wayland-server-core.h b/app/src/main/jni/prebuilt/include/wayland-server-core.h index 2e725d9..64d7169 100644 --- a/app/src/main/jni/prebuilt/include/wayland-server-core.h +++ b/app/src/main/jni/prebuilt/include/wayland-server-core.h @@ -246,6 +246,9 @@ wl_global_create(struct wl_display *display, int version, void *data, wl_global_bind_func_t bind); +void +wl_global_remove(struct wl_global *global); + void wl_global_destroy(struct wl_global *global); @@ -258,8 +261,8 @@ wl_global_destroy(struct wl_global *global); * A filter function enables the server to decide which globals to * advertise to each client. * - * When a wl_global filter is set, the given callback funtion will be - * called during wl_global advertisment and binding. + * When a wl_global filter is set, the given callback function will be + * called during wl_global advertisement and binding. * * This function should return true if the global object should be made * visible to the client or false otherwise. @@ -279,6 +282,9 @@ wl_global_get_interface(const struct wl_global *global); void * wl_global_get_user_data(const struct wl_global *global); +void +wl_global_set_user_data(struct wl_global *global, void *data); + struct wl_client * wl_client_create(struct wl_display *display, int fd); @@ -324,6 +330,10 @@ wl_client_get_object(struct wl_client *client, uint32_t id); void wl_client_post_no_memory(struct wl_client *client); +void +wl_client_post_implementation_error(struct wl_client *client, + const char* msg, ...) WL_PRINTF(2,3); + void wl_client_add_resource_created_listener(struct wl_client *client, struct wl_listener *listener); diff --git a/app/src/main/jni/prebuilt/include/wayland-util.h b/app/src/main/jni/prebuilt/include/wayland-util.h index b6cbe0e..7997778 100644 --- a/app/src/main/jni/prebuilt/include/wayland-util.h +++ b/app/src/main/jni/prebuilt/include/wayland-util.h @@ -68,6 +68,20 @@ extern "C" { #define WL_PRINTF(x, y) #endif +/** \class wl_object + * + * \brief A protocol object. + * + * A `wl_object` is an opaque struct identifying the protocol object + * underlying a `wl_proxy` or `wl_resource`. + * + * \note Functions accessing a `wl_object` are not normally used by client code. + * Clients should normally use the higher level interface generated by the + * scanner to interact with compositor objects. + * + */ +struct wl_object; + /** * Protocol message signature * @@ -626,7 +640,7 @@ wl_fixed_from_double(double d) u.d = d + (3LL << (51 - 8)); - return u.i; + return (wl_fixed_t)u.i; } /** diff --git a/app/src/main/jni/prebuilt/include/wayland-version.h b/app/src/main/jni/prebuilt/include/wayland-version.h index 72b3e21..eb33462 100644 --- a/app/src/main/jni/prebuilt/include/wayland-version.h +++ b/app/src/main/jni/prebuilt/include/wayland-version.h @@ -27,8 +27,8 @@ #define WAYLAND_VERSION_H #define WAYLAND_VERSION_MAJOR 1 -#define WAYLAND_VERSION_MINOR 16 +#define WAYLAND_VERSION_MINOR 19 #define WAYLAND_VERSION_MICRO 0 -#define WAYLAND_VERSION "1.16.0" +#define WAYLAND_VERSION "1.19.0" #endif diff --git a/app/src/main/jni/prebuilt/x86/libandroid-support.so b/app/src/main/jni/prebuilt/x86/libandroid-support.so index 8fbe6f6..6ee572c 100755 Binary files a/app/src/main/jni/prebuilt/x86/libandroid-support.so and b/app/src/main/jni/prebuilt/x86/libandroid-support.so differ diff --git a/app/src/main/jni/prebuilt/x86/libexpat.so b/app/src/main/jni/prebuilt/x86/libexpat.so new file mode 100755 index 0000000..3b6c269 Binary files /dev/null and b/app/src/main/jni/prebuilt/x86/libexpat.so differ diff --git a/app/src/main/jni/prebuilt/x86/libffi.so b/app/src/main/jni/prebuilt/x86/libffi.so index c170194..9342a9f 100755 Binary files a/app/src/main/jni/prebuilt/x86/libffi.so and b/app/src/main/jni/prebuilt/x86/libffi.so differ diff --git a/app/src/main/jni/prebuilt/x86/libwayland-server.so b/app/src/main/jni/prebuilt/x86/libwayland-server.so index d6c8aa5..6937b25 100755 Binary files a/app/src/main/jni/prebuilt/x86/libwayland-server.so and b/app/src/main/jni/prebuilt/x86/libwayland-server.so differ diff --git a/app/src/main/jni/prebuilt/x86_64/libandroid-support.so b/app/src/main/jni/prebuilt/x86_64/libandroid-support.so index 602765a..d8f24c5 100755 Binary files a/app/src/main/jni/prebuilt/x86_64/libandroid-support.so and b/app/src/main/jni/prebuilt/x86_64/libandroid-support.so differ diff --git a/app/src/main/jni/prebuilt/x86_64/libexpat.so b/app/src/main/jni/prebuilt/x86_64/libexpat.so new file mode 100755 index 0000000..798995e Binary files /dev/null and b/app/src/main/jni/prebuilt/x86_64/libexpat.so differ diff --git a/app/src/main/jni/prebuilt/x86_64/libffi.so b/app/src/main/jni/prebuilt/x86_64/libffi.so index 03c2453..0b5b9b5 100755 Binary files a/app/src/main/jni/prebuilt/x86_64/libffi.so and b/app/src/main/jni/prebuilt/x86_64/libffi.so differ diff --git a/app/src/main/jni/prebuilt/x86_64/libwayland-server.so b/app/src/main/jni/prebuilt/x86_64/libwayland-server.so index 29a1660..3137930 100755 Binary files a/app/src/main/jni/prebuilt/x86_64/libwayland-server.so and b/app/src/main/jni/prebuilt/x86_64/libwayland-server.so differ