Hook up EGL where we can, build update

Signed-off-by: Andrew Opalach <andrew@akon.city>

9 files changed, 50 insertions, 4 deletions

diff --git a/subprojects/glfm.wrap b/subprojects/glfm.wrap
index fdb6598..ae8e1ab 100644
--- a/subprojects/glfm.wrap
+++ b/subprojects/glfm.wrap
@@ -1,5 +1,8 @@
 [wrap-git]
+directory = glfm-38cc2c1
 url = https://github.com/brackeen/glfm.git
 revision = 38cc2c12ac1b0d59a269e72cc2d965f3f896ef52
 depth = 1
+patch_directory = glfm
+diff_files = glfm/get_egl_internal.diff
 method = cmake
diff --git a/subprojects/glfw3.wrap b/subprojects/glfw3.wrap
index 9754a3f..625b4a3 100644
--- a/subprojects/glfw3.wrap
+++ b/subprojects/glfw3.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
+directory = glfw3-e7ea71b
 url = https://github.com/glfw/glfw.git
 revision = e7ea71be039836da3a98cea55ae5569cb5eb885c
 depth = 1
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 1fec842..cceb244 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libalabaster
-revision = 209310c561d89c9ed2040aa7053b320d32cc393c
+revision = 562c730ac38749fb43ae5b7b53ae5f3043166bd1
 depth = 1
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index 0466a46..7cce0e2 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libnaunet
-revision = cef6cabce7ae97e9edfb6821ce4393d714579866
+revision = e48874a91a86ef561aa4b3298d6170ec9777954e
 depth = 1
diff --git a/subprojects/packagefiles/glfm/get_egl_internal.diff b/subprojects/packagefiles/glfm/get_egl_internal.diff
new file mode 100644
index 0000000..3c9098c
--- /dev/null
+++ b/subprojects/packagefiles/glfm/get_egl_internal.diff
@@ -0,0 +1,39 @@
+diff --git a/include/glfm.h b/include/glfm.h
+index ceace39..d18711c 100644
+--- a/include/glfm.h
++++ b/include/glfm.h
+@@ -892,6 +892,9 @@ ANativeActivity *glfmAndroidGetActivity(void) GLFM_DEPRECATED("Use glfmGetAndroi
+ /// ``GLFMAppFocusFunc``.
+ void *glfmGetAndroidActivity(const GLFMDisplay *display);
+ 
++void *glfmGetEglDisplay(const GLFMDisplay *display);
++void *glfmGetEglContext(const GLFMDisplay *display);
++
+ #endif // GLFM_EXPOSE_NATIVE_ANDROID
+ 
+ #ifdef __cplusplus
+diff --git a/src/glfm_android.c b/src/glfm_android.c
+index 67d1927..7942ddf 100644
+--- a/src/glfm_android.c
++++ b/src/glfm_android.c
+@@ -2800,4 +2800,20 @@ void *glfmGetAndroidActivity(const GLFMDisplay *display) {
+     return platformData->activity;
+ }
+ 
++void *glfmGetEglDisplay(const GLFMDisplay *display) {
++    if (!display || !display->platformData) {
++        return NULL;
++    }
++    GLFMPlatformData *platformData = display->platformData;
++    return platformData->eglDisplay;
++}
++
++void *glfmGetEglContext(const GLFMDisplay *display) {
++    if (!display || !display->platformData) {
++        return NULL;
++    }
++    GLFMPlatformData *platformData = display->platformData;
++    return platformData->eglContext;
++}
++
+ #endif // __ANDROID__
diff --git a/subprojects/packagefiles/vulkan/meson.build b/subprojects/packagefiles/vulkan-headers/meson.build
index f83e5e8..f83e5e8 100644
--- a/subprojects/packagefiles/vulkan/meson.build
+++ b/subprojects/packagefiles/vulkan-headers/meson.build
diff --git a/subprojects/vulkan.wrap b/subprojects/vulkan.wrap
index 838dbb8..03f157a 100644
--- a/subprojects/vulkan.wrap
+++ b/subprojects/vulkan.wrap
@@ -1,8 +1,9 @@
 [wrap-git]
+directory = vulkan-headers-1.4.305
 url = https://github.com/KhronosGroup/Vulkan-Headers.git
-revision = v1.4.304
+revision = v1.4.305
 depth = 1
-patch_directory = vulkan
+patch_directory = vulkan-headers
 
 [provide]
 dependency_names = vulkan
diff --git a/subprojects/wayland-protocols.wrap b/subprojects/wayland-protocols.wrap
index 7bab008..c4df786 100644
--- a/subprojects/wayland-protocols.wrap
+++ b/subprojects/wayland-protocols.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
+directory = wayland-protocols-1.39
 url = https://gitlab.freedesktop.org/wayland/wayland-protocols.git
 revision = 1.39
 depth = 1
diff --git a/subprojects/wlr-protocols.wrap b/subprojects/wlr-protocols.wrap
index 46541be..4dcf5ad 100644
--- a/subprojects/wlr-protocols.wrap
+++ b/subprojects/wlr-protocols.wrap
@@ -1,4 +1,5 @@
 [wrap-git]
+directory = wlr-protocols-ffb89ac
 url = https://gitlab.freedesktop.org/wlroots/wlr-protocols.git
 revision = ffb89ac790096f6e6272822c8d5df7d0cc6fcdfa
 depth = 1