diff options
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/glfm.wrap | 2 | ||||
| -rw-r--r-- | subprojects/libalabaster.wrap | 4 | ||||
| -rw-r--r-- | subprojects/libnaunet.wrap | 4 | ||||
| -rw-r--r-- | subprojects/packagefiles/glfm/android_additions.diff | 59 | ||||
| -rw-r--r-- | subprojects/packagefiles/glfm/android_get_egl_internal.diff (renamed from subprojects/packagefiles/glfm/get_egl_internal.diff) | 0 |
5 files changed, 64 insertions, 5 deletions
diff --git a/subprojects/glfm.wrap b/subprojects/glfm.wrap index e5e5d84..e2ce200 100644 --- a/subprojects/glfm.wrap +++ b/subprojects/glfm.wrap @@ -4,5 +4,5 @@ url = https://github.com/brackeen/glfm.git revision = 4130516b06a625266d1f71a174bfe80656920907 depth = 1 patch_directory = glfm -diff_files = glfm/get_egl_internal.diff +diff_files = glfm/android_get_egl_internal.diff, glfm/android_additions.diff method = cmake diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap index 5323646..7b8a7bf 100644 --- a/subprojects/libalabaster.wrap +++ b/subprojects/libalabaster.wrap @@ -1,5 +1,5 @@ [wrap-git] -directory = libalabaster-b617e3c +directory = libalabaster-81a7b4b url = https://git.akon.city/libalabaster.git -revision = b617e3ccb25a0ac3c22f8c02722c8108b2f78d6e +revision = 81a7b4ba322aeddf52207fdcd2213e5f5a493471 depth = 1 diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap index 2c321b0..7217ef4 100644 --- a/subprojects/libnaunet.wrap +++ b/subprojects/libnaunet.wrap @@ -1,5 +1,5 @@ [wrap-git] -directory = libnaunet-3a51988 +directory = libnaunet-36f09a0 url = https://git.akon.city/libnaunet.git -revision = 3a51988d764d54723288dc31a1779ece44cac1e9 +revision = 36f09a0c35657f5c7379624c8a2463aafb953bd4 depth = 1 diff --git a/subprojects/packagefiles/glfm/android_additions.diff b/subprojects/packagefiles/glfm/android_additions.diff new file mode 100644 index 0000000..81b1059 --- /dev/null +++ b/subprojects/packagefiles/glfm/android_additions.diff @@ -0,0 +1,59 @@ +diff --git a/include/glfm.h b/include/glfm.h +index ceace39..cf7ee70 100644 +--- a/include/glfm.h ++++ b/include/glfm.h +@@ -272,6 +272,8 @@ typedef enum { + GLFMKeyCodePrintScreen = 0x9B, ///< Print Screen or System Request key. + GLFMKeyCodeScrollLock = 0x9C, + GLFMKeyCodePause = 0x9D, ///< Pause/Break key. ++ GLFMKeyCodeVolumeUp = 0x9E, ++ GLFMKeyCodeVolumeDown = 0x9F, + + GLFMKeyCodeNumLock = 0xA0, ///< NumLock key ("clear" on Apple platforms). + GLFMKeyCodeNumpadDecimal = 0xA1, +@@ -890,7 +892,7 @@ ANativeActivity *glfmAndroidGetActivity(void) GLFM_DEPRECATED("Use glfmGetAndroi + /// The returned `ANativeActivity` may be invalidated when the surface is destroyed. If a reference to the + /// `ANativeActivity` is kept, call this function again to get an updated reference in ``GLFMSurfaceCreatedFunc`` or + /// ``GLFMAppFocusFunc``. +-void *glfmGetAndroidActivity(const GLFMDisplay *display); ++void *glfmGetAndroidActivity(const GLFMDisplay *display, void **jni); + + #endif // GLFM_EXPOSE_NATIVE_ANDROID + +diff --git a/src/glfm_android.c b/src/glfm_android.c +index 12f3c63..6f77d0a 100644 +--- a/src/glfm_android.c ++++ b/src/glfm_android.c +@@ -1117,6 +1117,8 @@ static bool glfm__onKeyEvent(GLFMPlatformData *platformData, AInputEvent *event) + [AKEYCODE_DPAD_RIGHT] = GLFMKeyCodeArrowRight, + + [AKEYCODE_POWER] = GLFMKeyCodePower, ++ [AKEYCODE_VOLUME_UP] = GLFMKeyCodeVolumeUp, ++ [AKEYCODE_VOLUME_DOWN] = GLFMKeyCodeVolumeDown, + + [AKEYCODE_A] = GLFMKeyCodeA, + [AKEYCODE_B] = GLFMKeyCodeB, +@@ -1215,6 +1217,9 @@ static bool glfm__onKeyEvent(GLFMPlatformData *platformData, AInputEvent *event) + [AKEYCODE_NUMPAD_DOT] = GLFMKeyCodeNumpadDecimal, + [AKEYCODE_NUMPAD_ENTER] = GLFMKeyCodeNumpadEnter, + [AKEYCODE_NUMPAD_EQUALS] = GLFMKeyCodeNumpadEqual, ++ ++ [AKEYCODE_DPAD_CENTER] = GLFMKeyCodeMediaSelect, ++ [AKEYCODE_MEDIA_PLAY_PAUSE] = GLFMKeyCodeMediaPlayPause + }; + + GLFMKeyCode keyCode = GLFMKeyCodeUnknown; +@@ -2794,11 +2799,12 @@ ANativeActivity *glfmAndroidGetActivity(void) { + return platformDataGlobal->activity; + } + +-void *glfmGetAndroidActivity(const GLFMDisplay *display) { ++void *glfmGetAndroidActivity(const GLFMDisplay *display, void **jni) { + if (!display || !display->platformData) { + return NULL; + } + GLFMPlatformData *platformData = display->platformData; ++ *jni = platformData->jniEnv; + return platformData->activity; + } + diff --git a/subprojects/packagefiles/glfm/get_egl_internal.diff b/subprojects/packagefiles/glfm/android_get_egl_internal.diff index 3c9098c..3c9098c 100644 --- a/subprojects/packagefiles/glfm/get_egl_internal.diff +++ b/subprojects/packagefiles/glfm/android_get_egl_internal.diff |