From 6fe15ce0d41bd55331cac006134b61c1704775c3 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 24 Dec 2024 15:01:55 -0500 Subject: Dependency name change Signed-off-by: Andrew Opalach --- .gitignore | 4 +++- meson.build | 4 ++-- src/poll_common.c | 18 +++++++++--------- src/poll_common.h | 8 ++++---- src/window_wayland.h | 6 +++--- src/window_x11.h | 6 +++--- subprojects/glfw3.wrap | 2 +- subprojects/libakiyo.wrap | 4 ---- subprojects/libnaunet.wrap | 4 ++++ 9 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 subprojects/libakiyo.wrap create mode 100644 subprojects/libnaunet.wrap diff --git a/.gitignore b/.gitignore index c4323e8..38fa51e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,10 @@ compile_commands.json subprojects/c89atomic.wrap subprojects/glad/ subprojects/glfm/ -subprojects/libakiyo subprojects/libalabaster +subprojects/libalabaster/ subprojects/libev.wrap +subprojects/libnaunet +subprojects/libnaunet/ subprojects/wayland-protocols/ subprojects/wlr-protocols/ diff --git a/meson.build b/meson.build index 995f35c..fcef359 100644 --- a/meson.build +++ b/meson.build @@ -23,11 +23,11 @@ if get_option('window') == 'glfm' and not is_android endif alabaster = subproject('libalabaster').get_variable('alabaster') -akiyo = subproject('libakiyo', default_options: ['event-loop=disabled']).get_variable('akiyo') +naunet = subproject('libnaunet', default_options: ['event-loop=disabled']).get_variable('naunet') stela_src = ['src/window.c'] stela_inc = [include_directories('include')] -stela_deps = [alabaster, akiyo] +stela_deps = [alabaster, naunet] stela_args = [] if get_option('window') in ['x11', 'wayland'] diff --git a/src/poll_common.c b/src/poll_common.c index 945288c..ebe234d 100644 --- a/src/poll_common.c +++ b/src/poll_common.c @@ -1,10 +1,10 @@ #include -#include +#include #include "poll_common.h" #ifdef STELA_POLL_INLINE -bool stl_poll_common(struct aki_pollfd *fds, bool block) +bool stl_poll_common(struct nn_pollfd *fds, bool block) { fds[0].revents = 0; #ifdef STELA_PAUSE @@ -12,11 +12,11 @@ bool stl_poll_common(struct aki_pollfd *fds, bool block) #endif #ifdef STELA_PAUSE - if (aki_poll_fds(fds, 2, (block) ? -1 : 0) < 0 && errno != EINTR) { + if (nn_poll_fds(fds, 2, (block) ? -1 : 0) < 0 && errno != EINTR) { #else - if (aki_poll_fds(fds, 1, (block) ? -1 : 0) < 0 && errno != EINTR) { + if (nn_poll_fds(fds, 1, (block) ? -1 : 0) < 0 && errno != EINTR) { #endif - al_log_error("poll_common", "poll() failed (%s).", errno, aki_strerror(errno)); + al_log_error("poll_common", "poll() failed (%s).", errno, nn_strerror(errno)); return false; } @@ -31,26 +31,26 @@ bool stl_poll_common(struct aki_pollfd *fds, bool block) return true; } #ifdef STELA_PAUSE -void stl_wake_common(struct stl_window *window, struct aki_pollfd *fds) +void stl_wake_common(struct stl_window *window, struct nn_pollfd *fds) { window->pending_refresh = true; // If we are already in poll, don't try to wake again instead // just ensure we refresh. if (!(fds[0].revents & POLLIN || fds[1].revents & POLLIN)) { s64 val = 1; - ssize_t ret = aki_write(fds[1].fd, &val, sizeof(s64)); + ssize_t ret = nn_write(fds[1].fd, &val, sizeof(s64)); al_assert(ret == sizeof(s64)); } } #endif #endif -bool stl_process_events_common(struct aki_pollfd *fds) +bool stl_process_events_common(struct nn_pollfd *fds) { #ifdef STELA_POLL_INLINE #ifdef STELA_PAUSE if (fds[1].revents & POLLIN) { - s64 val = aki_read(fds[1].fd, &val, sizeof(s64)); + s64 val = nn_read(fds[1].fd, &val, sizeof(s64)); al_assert(val == sizeof(s64)); } #endif diff --git a/src/poll_common.h b/src/poll_common.h index aebf9a3..0efa500 100644 --- a/src/poll_common.h +++ b/src/poll_common.h @@ -1,13 +1,13 @@ #pragma once -#include +#include #include "window.h" #ifdef STELA_POLL_INLINE -bool stl_poll_common(struct aki_pollfd *fds, bool block); +bool stl_poll_common(struct nn_pollfd *fds, bool block); #ifdef STELA_PAUSE -void stl_wake_common(struct stl_window *window, struct aki_pollfd *fds); +void stl_wake_common(struct stl_window *window, struct nn_pollfd *fds); #endif #endif -bool stl_process_events_common(struct aki_pollfd *fds); +bool stl_process_events_common(struct nn_pollfd *fds); diff --git a/src/window_wayland.h b/src/window_wayland.h index b7dadf3..9895463 100644 --- a/src/window_wayland.h +++ b/src/window_wayland.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include @@ -56,9 +56,9 @@ struct stl_window_wayland { struct stl_egl egl; struct wl_egl_window *egl_window; #if defined STELA_POLL_INLINE && defined STELA_PAUSE - struct aki_pollfd fds[2]; + struct nn_pollfd fds[2]; #else - struct aki_pollfd fds[1]; + struct nn_pollfd fds[1]; #endif f64 pointer_x; f64 pointer_y; diff --git a/src/window_x11.h b/src/window_x11.h index fc1172f..d198115 100644 --- a/src/window_x11.h +++ b/src/window_x11.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include @@ -23,8 +23,8 @@ struct stl_window_x11 { Window window; struct stl_egl egl; #ifdef STELA_PAUSE - struct aki_pollfd fds[2]; + struct nn_pollfd fds[2]; #else - struct aki_pollfd fds[1]; + struct nn_pollfd fds[1]; #endif }; diff --git a/subprojects/glfw3.wrap b/subprojects/glfw3.wrap index 684a293..81794a3 100644 --- a/subprojects/glfw3.wrap +++ b/subprojects/glfw3.wrap @@ -1,5 +1,5 @@ [wrap-git] url = https://github.com/glfw/glfw.git -revision = b35641f4a3c62aa86a0b3c983d163bc0fe36026d +revision = 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50 depth = 1 method = cmake diff --git a/subprojects/libakiyo.wrap b/subprojects/libakiyo.wrap deleted file mode 100644 index 2cd2caa..0000000 --- a/subprojects/libakiyo.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -url = https://git.akon.city/libakiyo -revision = master -depth = 1 diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap new file mode 100644 index 0000000..6db8ca9 --- /dev/null +++ b/subprojects/libnaunet.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://git.akon.city/libnaunet +revision = 822e754cafdc5a32c80c97ca015cd6f9008329c3 +depth = 1 -- cgit v1.2.3-101-g0448